From 76819906d6fc67d59f67658df46f20b4c5526890 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 수, 01 12월 2021 19:04:41 +0900
Subject: [PATCH] 이슈 이메일 전송 완료
---
src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java | 43 +++++++++++++++++++++
src/main/java/kr/wisestone/owl/service/IssueService.java | 2 +
src/main/webapp/scripts/components/issue/issue.service.js | 6 ---
src/main/java/kr/wisestone/owl/web/controller/IssueController.java | 10 +++++
src/main/webapp/scripts/app/issue/issueSendMailPartners.controller.js | 2
src/main/resources/system_dev.properties | 6 +-
6 files changed, 58 insertions(+), 11 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/IssueService.java b/src/main/java/kr/wisestone/owl/service/IssueService.java
index a8e1809..5a6f802 100644
--- a/src/main/java/kr/wisestone/owl/service/IssueService.java
+++ b/src/main/java/kr/wisestone/owl/service/IssueService.java
@@ -72,6 +72,8 @@
void sendIssueEmail(IssueForm issueForm);
+ void sendIssueEmailPartners(IssueForm issueForm);
+
void reservationIssue();
Map<String, Object> findTask(IssueCondition taskCondition);
diff --git a/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
index 91a2575..685d5d7 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
@@ -2615,7 +2615,48 @@
// �궗�슜�옄 �떆�뒪�뀥 湲곕뒫 �궗�슜 �젙蹂� �닔吏�
log.info(ElasticSearchUtil.makeUserActiveHistoryMessage(this.webAppUtil.getLoginUser(), ElasticSearchConstants.ISSUE_ANOTHER_USER_SEND_EMAIL));
- //this.systemEmailService.directEmail(issueForm.getSendEmails().toArray(new String[issueForm.getSendEmails().size()]), EmailType.ISSUE_SEND, issueMap, null);
+ this.systemEmailService.directEmail(issueForm.getSendEmails().toArray(new String[issueForm.getSendEmails().size()]), EmailType.ISSUE_SEND, issueMap, null);
+
+ if(issueForm.getTemplate().equals(EmailType.ISSUE_SEND_1.toString())){
+ this.systemEmailService.directEmail(ConvertUtil.ToArray(issueForm.getSendEmails()), EmailType.ISSUE_SEND_1, issueMap, null);
+ }else if(issueForm.getTemplate().equals(EmailType.ISSUE_SEND_2.toString())){
+ this.systemEmailService.directEmail(ConvertUtil.ToArray(issueForm.getSendEmails()), EmailType.ISSUE_SEND_2, issueMap, null);
+ }else if(issueForm.getTemplate().equals(EmailType.ISSUE_SEND_3.toString())){
+ this.systemEmailService.directEmail(ConvertUtil.ToArray(issueForm.getSendEmails()), EmailType.ISSUE_SEND_3, issueMap, null);
+ }
+ }
+
+ // �씠�뒋瑜� �뀥�뵆由우뿉 �뵲�씪 �뙆�듃�꼫 �떞�떦�옄�뿉寃� 硫붿씪濡� 諛쒖넚�븳�떎.
+ @Override
+ @Transactional(readOnly = true)
+ public void sendIssueEmailPartners(IssueForm issueForm) {
+ if (issueForm.getSendEmails().size() < 1) {
+ throw new OwlRuntimeException(
+ this.messageAccessor.getMessage(MsgConstants.ISSUE_NOT_SEND_USER));
+ }else if (issueForm.getTemplate() == null){
+ throw new OwlRuntimeException(
+ this.messageAccessor.getMessage(MsgConstants.ISSUE_NOT_SELECT_TEMPLATE));
+ }
+
+ Issue issue = this.getIssue(issueForm.getId());
+
+ Map<String, Object> issueMap = new HashMap<>();
+ // �씠�뒋 �젙蹂대�� �씠硫붿씪 �쟾�넚�뿉 �궗�슜�븯湲� �쐞�빐 Map �삎�깭濡� 蹂��솚�븳�떎.
+ this.makeIssueMapToIssue(issue, issueMap);
+ // 諛쒖떊�옄 �몴�떆
+ UserVo toUser = this.webAppUtil.getLoginUser();
+ issueMap.put("toUser", toUser.getName() + "(" + CommonUtil.decryptAES128(toUser.getAccount()) + ")");
+
+ // �씠�뒋 留곹겕
+ String projectKey = issue.getProject().getProjectKey();
+ Long IssueNumber = issue.getIssueNumber();
+ String link = this.configuration.getEmailSendUrl() + "/#/issues/issueList?projectKey=" + projectKey + "&issueNumber=" + IssueNumber.toString();
+
+ issueMap.put("issueLink", link);
+ issueMap.put("projectLink", link);
+
+ // �궗�슜�옄 �떆�뒪�뀥 湲곕뒫 �궗�슜 �젙蹂� �닔吏�
+ log.info(ElasticSearchUtil.makeUserActiveHistoryMessage(this.webAppUtil.getLoginUser(), ElasticSearchConstants.ISSUE_ANOTHER_USER_SEND_EMAIL));
if(issueForm.getTemplate().equals(EmailType.ISSUE_SEND_1.toString())){
this.systemEmailService.directEmail(ConvertUtil.ToArray(issueForm.getSendEmails()), EmailType.ISSUE_SEND_1, issueMap, null);
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 e7015d6..df56c49 100644
--- a/src/main/java/kr/wisestone/owl/web/controller/IssueController.java
+++ b/src/main/java/kr/wisestone/owl/web/controller/IssueController.java
@@ -164,4 +164,14 @@
return this.setSuccessMessage(resJsonData);
}
+ // �씠�뒋 硫붿씪 �뙆�듃�꼫 �떞�떦�옄�뿉寃� 諛쒖넚 (�뀥�뵆由� 異붽�)
+ @RequestMapping(value = "/issue/sendEmailPartners", produces = MediaType.APPLICATION_JSON_VALUE)
+ public
+ @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)));
+ return this.setSuccessMessage(resJsonData);
+ }
+
}
diff --git a/src/main/resources/system_dev.properties b/src/main/resources/system_dev.properties
index 35ad9ac..faa8726 100644
--- a/src/main/resources/system_dev.properties
+++ b/src/main/resources/system_dev.properties
@@ -39,10 +39,10 @@
mail.password=
# email \uC124\uC815
-email.host=mail.g2works.kra
+email.host=mail.g2works.kr
email.port=587
-email.userName=wyu@maprex.co.kr
-email.password=1234
+email.userName=supportowl@wisestone.kr
+email.password=Stone0620**
email.transport.protocol=smtp
email.smtp.auth=true
email.smtp.starttle.enable=true
diff --git a/src/main/webapp/scripts/app/issue/issueSendMailPartners.controller.js b/src/main/webapp/scripts/app/issue/issueSendMailPartners.controller.js
index dae8caa..1b6d5cc 100644
--- a/src/main/webapp/scripts/app/issue/issueSendMailPartners.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueSendMailPartners.controller.js
@@ -61,7 +61,7 @@
$rootScope.spinner = true;
var content = {
- // id : $scope.vm.form.id,
+ id : $scope.vm.form.id,
template : $scope.vm.form.template,
sendEmails : (function () {
var sendEmails = [];
diff --git a/src/main/webapp/scripts/components/issue/issue.service.js b/src/main/webapp/scripts/components/issue/issue.service.js
index 1a27238..577afd5 100644
--- a/src/main/webapp/scripts/components/issue/issue.service.js
+++ b/src/main/webapp/scripts/components/issue/issue.service.js
@@ -103,12 +103,6 @@
$log.debug("�씠�뒋 �씠硫붿씪 諛쒖넚 寃곌낵 : ", response);
return response;
});
- },
- findMailTargetAll : function (conditions) {
- return $http.post("issue/findMailTargetAll", conditions).then(function (response) {
- $log.debug("�씠�뒋 �씠硫붿씪 諛쒖넚 寃곌낵 : ", response);
- return response;
- });
}
}
}
--
Gitblit v1.8.0