From 1dad4d94cc415d2f8092aff0368744289337f504 Mon Sep 17 00:00:00 2001
From: 박지현 <jhpark@maprex.co.kr>
Date: 화, 22 2월 2022 14:29:43 +0900
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/kr/wisestone/owl/web/controller/IssueController.java | 100 +++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 94 insertions(+), 6 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 d3eead3..db9ca42 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,12 @@
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.DepartmentCondition;
import kr.wisestone.owl.web.condition.IssueCondition;
+import kr.wisestone.owl.web.form.EmailCommonForm;
+import kr.wisestone.owl.web.form.EmailTemplateForm;
import kr.wisestone.owl.web.form.IssueForm;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -50,6 +53,35 @@
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);
+ }
+
+ // �븯�쐞�씠�뒋 �깮�꽦
+ @RequestMapping(value = "/issue/downIssueAdd", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
+ public
+ @ResponseBody
+ Map<String, Object> downIssueAdd(MultipartHttpServletRequest request) {
+ Map<String, Object> resJsonData = new HashMap<>();
+ // �씠�뒋 �깮�꽦
+ Issue issue = this.issueService.addDownIssue(resJsonData, IssueForm.make(ConvertUtil.convertJsonToMap(request.getParameter(Constants.REQ_KEY_CONTENT))), request.getFiles("file"));
+ // 踰꾩쟾 �깮�꽦
+ this.issueService.addIssueVersion(issue.getId());
+
+ return this.setSuccessMessage(resJsonData);
+ }
+
// �씠�뒋 議고쉶
@RequestMapping(value = "/issue/find", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
public
@@ -75,14 +107,15 @@
return this.setSuccessMessage(resJsonData);
}
- // 硫붿씪 諛쒖넚 ���긽�옄 紐⑸줉 議고쉶
- @RequestMapping(value = "/issue/findMailTarget", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
+ // �뙆�듃�꼫 紐⑸줉 議고쉶
+ @RequestMapping(value = "/issue/findReadyDepartments", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
public
@ResponseBody
- Map<String, Object> findMailTarget(@RequestBody Map<String, Map<String, Object>> params) {
+ Map<String, Object> findReadyDepartments(@RequestBody Map<String, Map<String, Object>> params) {
Map<String, Object> resJsonData = new HashMap<>();
+ Pageable pageable = this.pageUtil.convertPageable(this.getPageVo(params));
- this.issueService.findMailTarget(resJsonData, params.get(Constants.REQ_KEY_CONTENT));
+ this.issueService.findReadyDepartments(resJsonData, DepartmentCondition.make(params.get(Constants.REQ_KEY_CONTENT)), pageable);
return this.setSuccessMessage(resJsonData);
}
@@ -93,6 +126,7 @@
@ResponseBody
Map<String, Object> detail(@RequestBody Map<String, Map<String, Object>> params) {
Map<String, Object> resJsonData = new HashMap<>();
+
this.issueService.detailIssue(resJsonData, IssueCondition.make(params.get(Constants.REQ_KEY_CONTENT)));
return this.setSuccessMessage(resJsonData);
@@ -134,6 +168,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
@@ -161,7 +219,7 @@
public @ResponseBody Map<String, Object> importExcel(MultipartHttpServletRequest request) throws Exception {
Map<String, Object> resJsonData = new HashMap<>();
- this.issueService.importExcel(request.getFile("file"));
+ this.issueService.importExcel(IssueForm.make(ConvertUtil.convertJsonToMap(request.getParameter(Constants.REQ_KEY_CONTENT))), request.getFile("file"));
return this.setSuccessMessage(resJsonData);
}
@@ -176,5 +234,35 @@
return this.setSuccessMessage(resJsonData);
}
+ // �씠�뒋 硫붿씪 �뙆�듃�꼫 �떞�떦�옄�뿉寃� 諛쒖넚 (�뀥�뵆由� 異붽�)
+ @RequestMapping(value = "/issue/sendEmailPartners", method = RequestMethod.POST)
+ public
+ @ResponseBody
+ Map<String, Object> sendEmailPartners(MultipartHttpServletRequest request) {
+ Map<String, Object> resJsonData = new HashMap<>();
+ this.issueService.sendIssueEmailPartners(EmailTemplateForm.make(ConvertUtil.convertJsonToMap(request.getParameter(Constants.REQ_KEY_CONTENT))), request.getFiles("file"));
+// this.issueService.sendIssueEmailPartners(IssueForm.make(params.get(Constants.REQ_KEY_CONTENT)));
+ return this.setSuccessMessage(resJsonData);
+ }
+
+ // �씪諛� 硫붿씪 諛쒖넚 (�궗�슜�옄 吏곸젒 �옉�꽦)
+ @RequestMapping(value = "/issue/sendCommonEmail", method = RequestMethod.POST)
+ public
+ @ResponseBody
+ Map<String, Object> sendCommonEmail(MultipartHttpServletRequest request) {
+ Map<String, Object> resJsonData = new HashMap<>();
+ this.issueService.sendCommonEmail(EmailCommonForm.make(ConvertUtil.convertJsonToMap(request.getParameter(Constants.REQ_KEY_CONTENT))), request.getFiles("file"));
+ 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