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 | 33 +++++++++++++++++++++++++++++----
1 files changed, 29 insertions(+), 4 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 49298d8..adcf81d 100644
--- a/src/main/java/kr/wisestone/owl/web/controller/IssueController.java
+++ b/src/main/java/kr/wisestone/owl/web/controller/IssueController.java
@@ -6,6 +6,7 @@
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;
@@ -31,8 +32,7 @@
@Controller
public class IssueController extends BaseController {
- private static final Logger
- log = LoggerFactory.getLogger(IssueController.class);
+ private static final Logger log = LoggerFactory.getLogger(IssueController.class);
@Autowired
private IssueService issueService;
@@ -62,6 +62,7 @@
// 踰꾩쟾 �깮�꽦
this.issueService.addIssueVersion(issue.getId());
+ resJsonData.put(Constants.RES_KEY_CONTENTS, issue.getId()); //�뿰愿��씠�뒋 ID
return this.setSuccessMessage(resJsonData);
}
@@ -137,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
@@ -185,7 +210,8 @@
@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);
}
@@ -199,5 +225,4 @@
this.issueService.findApiIssue(ApiMonitorCondition.make(params.get(Constants.REQ_KEY_CONTENT)), resJsonData);
return this.setSuccessMessage(resJsonData);
}
-
}
--
Gitblit v1.8.0