From fe2856826d978b2a231ea684231459d7d3b22e1e Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 수, 15 12월 2021 17:14:49 +0900
Subject: [PATCH] 일반 사용자 로그인시 상단 프로젝트 목록과 프로젝트 메뉴의 목록 개수가 다른 문제 해결
---
src/main/java/kr/wisestone/owl/web/controller/IssueController.java | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 53 insertions(+), 2 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/web/controller/IssueController.java b/src/main/java/kr/wisestone/owl/web/controller/IssueController.java
index df56c49..adcf81d 100644
--- a/src/main/java/kr/wisestone/owl/web/controller/IssueController.java
+++ b/src/main/java/kr/wisestone/owl/web/controller/IssueController.java
@@ -3,9 +3,10 @@
import kr.wisestone.owl.constant.Constants;
import kr.wisestone.owl.domain.Issue;
import kr.wisestone.owl.service.IssueService;
-import kr.wisestone.owl.service.impl.IssueServiceImpl;
import kr.wisestone.owl.util.ConvertUtil;
+import kr.wisestone.owl.web.condition.ApiMonitorCondition;
import kr.wisestone.owl.web.condition.IssueCondition;
+import kr.wisestone.owl.web.form.EmailTemplateForm;
import kr.wisestone.owl.web.form.IssueForm;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -47,6 +48,21 @@
// 踰꾩쟾 �깮�꽦
this.issueService.addIssueVersion(issue.getId());
+ return this.setSuccessMessage(resJsonData);
+ }
+
+ // �뿰愿��씠�뒋 �깮�꽦
+ @RequestMapping(value = "/issue/relIssueAdd", method = RequestMethod.POST)
+ public
+ @ResponseBody
+ Map<String, Object> relIssueAdd(MultipartHttpServletRequest request) {
+ Map<String, Object> resJsonData = new HashMap<>();
+ // �씠�뒋 �깮�꽦
+ Issue issue = this.issueService.addRelIssue(IssueForm.make(ConvertUtil.convertJsonToMap(request.getParameter(Constants.REQ_KEY_CONTENT))), request.getFiles("file"));
+ // 踰꾩쟾 �깮�꽦
+ this.issueService.addIssueVersion(issue.getId());
+
+ resJsonData.put(Constants.RES_KEY_CONTENTS, issue.getId()); //�뿰愿��씠�뒋 ID
return this.setSuccessMessage(resJsonData);
}
@@ -122,6 +138,30 @@
return this.setSuccessMessage(resJsonData);
}
+ // �븯�쐞�씠�뒋 �궘�젣
+ @RequestMapping(value = "/issue/removeAll", produces = MediaType.APPLICATION_JSON_VALUE)
+ public
+ @ResponseBody
+ Map<String, Object> removesAll(@RequestBody Map<String, Map<String, Object>> params) {
+ Map<String, Object> resJsonData = new HashMap<>();
+
+ this.issueService.removeAllIssues(IssueForm.make(params.get(Constants.REQ_KEY_CONTENT)));
+
+ return this.setSuccessMessage(resJsonData);
+ }
+
+ // �븯�쐞�씠�뒋 �궘�젣
+ /*@RequestMapping(value = "/issue/removeDown", produces = MediaType.APPLICATION_JSON_VALUE)
+ public
+ @ResponseBody
+ Map<String, Object> removesDown(@RequestBody Map<String, Map<String, Object>> params) {
+ Map<String, Object> resJsonData = new HashMap<>();
+
+ this.issueService.removeDownIssues(IssueForm.make(params.get(Constants.REQ_KEY_CONTENT)));
+
+ return this.setSuccessMessage(resJsonData);
+ }*/
+
// �씠�뒋 �떎以� �긽�깭 蹂�寃�
@RequestMapping(value = "/issue/modifyMultiIssueStatus", produces = MediaType.APPLICATION_JSON_VALUE)
public
@@ -170,8 +210,19 @@
@ResponseBody
Map<String, Object> sendEmailPartners(@RequestBody Map<String, Map<String, Object>> params) {
Map<String, Object> resJsonData = new HashMap<>();
- this.issueService.sendIssueEmailPartners(IssueForm.make(params.get(Constants.REQ_KEY_CONTENT)));
+ this.issueService.sendIssueEmailPartners(EmailTemplateForm.make(params.get(Constants.REQ_KEY_CONTENT)));
+// this.issueService.sendIssueEmailPartners(IssueForm.make(params.get(Constants.REQ_KEY_CONTENT)));
return this.setSuccessMessage(resJsonData);
}
+
+ // api 湲곕줉 議고쉶
+ @RequestMapping(value = "/api/findHistory", produces = MediaType.APPLICATION_JSON_VALUE)
+ public
+ @ResponseBody
+ Map<String, Object> findApiHistory(@RequestBody Map<String, Map<String, Object>> params) {
+ Map<String, Object> resJsonData = new HashMap<>();
+ this.issueService.findApiIssue(ApiMonitorCondition.make(params.get(Constants.REQ_KEY_CONTENT)), resJsonData);
+ return this.setSuccessMessage(resJsonData);
+ }
}
--
Gitblit v1.8.0