From 6adb341db180240e0af34ace40100912d4ed5257 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 06 1월 2022 11:02:57 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/java/kr/wisestone/owl/web/controller/IssueController.java | 76 ++++++++++++++++++++++++++++++++++++-
1 files changed, 73 insertions(+), 3 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 f752960..ff92657 100644
--- a/src/main/java/kr/wisestone/owl/web/controller/IssueController.java
+++ b/src/main/java/kr/wisestone/owl/web/controller/IssueController.java
@@ -5,7 +5,10 @@
import kr.wisestone.owl.service.IssueService;
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;
@@ -65,6 +68,21 @@
return this.setSuccessMessage(resJsonData);
}
+ // �븯�쐞�씠�뒋 �깮�꽦
+ @RequestMapping(value = "/issue/downIssueAdd", method = RequestMethod.POST)
+ public
+ @ResponseBody
+ Map<String, Object> downIssueAdd(MultipartHttpServletRequest request) {
+ Map<String, Object> resJsonData = new HashMap<>();
+ // �씠�뒋 �깮�꽦
+ Issue issue = this.issueService.addDownIssue(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/find", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
public
@@ -90,13 +108,29 @@
return this.setSuccessMessage(resJsonData);
}
+ // �뙆�듃�꼫 紐⑸줉 議고쉶
+ @RequestMapping(value = "/issue/findReadyDepartments", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
+ public
+ @ResponseBody
+ 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.findReadyDepartments(resJsonData, DepartmentCondition.make(params.get(Constants.REQ_KEY_CONTENT)), pageable);
+
+ return this.setSuccessMessage(resJsonData);
+ }
+
// �씠�뒋 �긽�꽭 議고쉶
@RequestMapping(value = "/issue/detail", produces = MediaType.APPLICATION_JSON_VALUE)
public
@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)));
+ Pageable relPageable = this.pageUtil.convertRelPageable(this.getPageVo(params));
+ Pageable downPageable = this.pageUtil.convertDownPageable(this.getPageVo(params));
+
+ this.issueService.detailIssue(resJsonData, IssueCondition.make(params.get(Constants.REQ_KEY_CONTENT)), relPageable, downPageable);
return this.setSuccessMessage(resJsonData);
}
@@ -137,6 +171,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
@@ -164,7 +222,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);
}
@@ -185,7 +243,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);
+ }
+
+
+ // �씪諛� 硫붿씪 諛쒖넚 (�궗�슜�옄 吏곸젒 �옉�꽦)
+ @RequestMapping(value = "/issue/sendCommonEmail", produces = MediaType.APPLICATION_JSON_VALUE)
+ public
+ @ResponseBody
+ Map<String, Object> sendCommonEmail(@RequestBody Map<String, Map<String, Object>> params) {
+ Map<String, Object> resJsonData = new HashMap<>();
+ this.issueService.sendCommonEmail(EmailCommonForm.make(params.get(Constants.REQ_KEY_CONTENT)));
return this.setSuccessMessage(resJsonData);
}
--
Gitblit v1.8.0