From d25c62b6ff3ef7637f9358cfb0782c6706c9b55d Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 02 12월 2021 10:13:00 +0900
Subject: [PATCH] 이슈 메일 전송 이력 남기기 완료 * 바로 이력이 안남겨지는 문제 해결필요(현재 새로고침을 해야 이력이 보임)
---
src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java | 22 +++++-----
src/main/java/kr/wisestone/owl/service/IssueHistoryService.java | 2 +
src/main/java/kr/wisestone/owl/domain/enumType/IssueHistoryType.java | 3 +
src/main/java/kr/wisestone/owl/service/impl/SystemEmailServiceImpl.java | 2
src/main/java/kr/wisestone/owl/service/IssueService.java | 8 ----
src/main/webapp/i18n/ko/global.json | 2 +
src/main/webapp/WEB-INF/i18n/code_ko_KR.properties | 1
src/main/java/kr/wisestone/owl/service/impl/IssueHistoryServiceImpl.java | 31 +++++++++++++++
8 files changed, 50 insertions(+), 21 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/domain/enumType/IssueHistoryType.java b/src/main/java/kr/wisestone/owl/domain/enumType/IssueHistoryType.java
index 98e90b4..1da422a 100644
--- a/src/main/java/kr/wisestone/owl/domain/enumType/IssueHistoryType.java
+++ b/src/main/java/kr/wisestone/owl/domain/enumType/IssueHistoryType.java
@@ -7,5 +7,6 @@
ADD,
MODIFY,
DELETE,
- TOTAL
+ TOTAL,
+ SEND
}
diff --git a/src/main/java/kr/wisestone/owl/service/IssueHistoryService.java b/src/main/java/kr/wisestone/owl/service/IssueHistoryService.java
index 0951dd2..8f1e445 100644
--- a/src/main/java/kr/wisestone/owl/service/IssueHistoryService.java
+++ b/src/main/java/kr/wisestone/owl/service/IssueHistoryService.java
@@ -58,6 +58,8 @@
void detectDownIssues(IssueHistoryType type, Issue issue, StringBuilder description);
+ void detectSendIssueMail(IssueHistoryType type, IssueForm issueForm, StringBuilder description);
+
void detectIssueCompany(IssueHistoryType type, Map<String, Object> param, IssueCompany issueCompany, StringBuilder description);
void detectIssueIsp(IssueHistoryType type, Map<String, Object> param, IssueIsp issueIsp, StringBuilder description);
diff --git a/src/main/java/kr/wisestone/owl/service/IssueService.java b/src/main/java/kr/wisestone/owl/service/IssueService.java
index 5a6f802..f873e09 100644
--- a/src/main/java/kr/wisestone/owl/service/IssueService.java
+++ b/src/main/java/kr/wisestone/owl/service/IssueService.java
@@ -81,12 +81,4 @@
void modifyParentIssue(IssueForm issueForm);
void findPartner(Map<String, Object> resJsonData, Map<String, Object> params);
-
- //void findMailTargetAll(Map<String, Object> resJsonData, IssueCondition condition, Pageable pageable);
-
- /*void findMailTargetCompany(Map<String, Object> resJsonData, Map<String, Object> params);
-
- void findMailTargetIsp(Map<String, Object> resJsonData, Map<String, Object> params);
-
- void findMailTargetHosting(Map<String, Object> resJsonData, Map<String, Object> params);*/
}
diff --git a/src/main/java/kr/wisestone/owl/service/impl/IssueHistoryServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/IssueHistoryServiceImpl.java
index 375f32b..d0624c9 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueHistoryServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueHistoryServiceImpl.java
@@ -146,6 +146,28 @@
description.append(")");
description.append("</span></h6>");
break;
+
+ case SEND:
+ description.append("<h6 class=\"creat\"><span class=\"dot\"></span><span translate=\"common.sendMailIssue\">�씠�뒋 硫붿씪 �쟾�넚</span>");
+ description.append("<span class=\"activity-timestamp\">");
+ description.append(DateUtil.convertDateToStr(new Date()));
+ description.append(" (");
+
+ if (user != null) {
+ description.append(user.getName());
+ description.append(" - ");
+ description.append(CommonUtil.decryptAES128(user.getAccount()));
+ }
+ else {
+ description.append("OWL-ITS-SYSTEM");
+ description.append(" - ");
+ description.append(this.systemEmail);
+ }
+
+ description.append(")");
+ description.append("</span></h6>");
+ description.append(issueChangeDescription);
+ break;
}
description.append("</div>");
@@ -496,6 +518,15 @@
}
}
+ // �씠�뒋 硫붿씪 �쟾�넚 �젙蹂대�� 湲곕줉�븳�떎.
+ @Override
+ public void detectSendIssueMail(IssueHistoryType type, IssueForm issueForm, StringBuilder description) {
+ if (type == IssueHistoryType.SEND) {
+ description.append("<span translate=\"issue.sendIssueMailHistory\">�씠�뒋 硫붿씪 �쟾�넚�쓣 �셿猷뚰뻽�뒿�땲�떎. </span>");
+ description.append("<span class=\"text-primary bold\"> > " + CommonUtil.decryptAES128(issueForm.getSendEmails().toString()) + "</span>");
+ }
+ }
+
// �뾽泥� �젙蹂� 蹂�寃� �젙蹂대�� 湲곕줉�븳�떎.
@Override
public void detectIssueCompany(IssueHistoryType type, Map<String, Object> param, IssueCompany issueCompany, StringBuilder description) {
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 14aae02..934520a 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
@@ -377,7 +377,6 @@
if (projectRoleUsers != null && !projectRoleUsers.isEmpty()) {
for (Map<String, Object> projectRoleUser : projectRoleUsers) {
UserVo userVo = ConvertUtil.convertMapToClass(projectRoleUser, UserVo.class);
-
// �씠�뒋 �깮�꽦 �븣由� 硫붿씪 �쟾�넚
this.systemEmailService.reservationEmail(new String[]{userVo.getAccount()}, emailType, issueMap);
}
@@ -2625,14 +2624,6 @@
// �궗�슜�옄 �떆�뒪�뀥 湲곕뒫 �궗�슜 �젙蹂� �닔吏�
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);
-
- 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);
- }
}
// �씠�뒋瑜� �뀥�뵆由우뿉 �뵲�씪 �뙆�듃�꼫 �떞�떦�옄�뿉寃� 硫붿씪濡� 諛쒖넚�븳�떎.
@@ -2666,6 +2657,7 @@
// �궗�슜�옄 �떆�뒪�뀥 湲곕뒫 �궗�슜 �젙蹂� �닔吏�
log.info(ElasticSearchUtil.makeUserActiveHistoryMessage(this.webAppUtil.getLoginUser(), ElasticSearchConstants.ISSUE_ANOTHER_USER_SEND_EMAIL));
+ StringBuilder sb = new StringBuilder();
if(issueForm.getTemplate().equals(EmailType.ISSUE_SEND_1.toString())){
this.systemEmailService.directEmail(ConvertUtil.ToArray(issueForm.getSendEmails()), EmailType.ISSUE_SEND_1, issueMap, null);
@@ -2674,6 +2666,9 @@
}else if(issueForm.getTemplate().equals(EmailType.ISSUE_SEND_3.toString())){
this.systemEmailService.directEmail(ConvertUtil.ToArray(issueForm.getSendEmails()), EmailType.ISSUE_SEND_3, issueMap, null);
}
+ //硫붿씪 �쟾�넚 �씠�젰 �궓湲곌린
+ this.issueHistoryService.detectSendIssueMail(IssueHistoryType.SEND, issueForm, sb);
+ this.issueHistoryService.addIssueHistory(issue, IssueHistoryType.SEND, sb.toString());
}
// �삁�빟 諛쒖깮 �씠�뒋瑜� �떎�뻾�븳�떎
@@ -2845,11 +2840,16 @@
@Override
public void modifyParentIssue(IssueForm issueDownForm) {
Issue issue = this.getIssue(issueDownForm.getId()); //�븯�쐞 �씠�뒋
- Issue parentIssue = issue.getParentIssue(); //蹂�寃� �쟾 �븯�쐞�씠�뒋�쓽 �긽�쐞�씠�뒋
-
Long newParentIssueId = issueDownForm.getParentIssueId(); //蹂�寃쏀븷 �븯�쐞�씠�뒋�쓽 �긽�쐞�씠�뒋
+
StringBuilder sb = new StringBuilder();
+ Issue parentIssue = issue.getParentIssue(); //蹂�寃� �쟾 �븯�쐞�씠�뒋�쓽 �긽�쐞�씠�뒋
+ if(parentIssue != null){ //蹂�寃� �쟾 �븯�쐞�씠�뒋�쓽 �긽�쐞�씠�뒋媛� 議댁옱 �븷 寃쎌슦
+ this.issueHistoryService.detectDownIssues(IssueHistoryType.DELETE, issue, sb);
+ this.issueHistoryService.addIssueHistory(parentIssue, IssueHistoryType.MODIFY, sb.toString());
+ }
+
if (newParentIssueId != null) { // 異붽� �븷 寃쎌슦
parentIssue = this.getIssue(newParentIssueId); //�긽�쐞�씠�뒋(myIssue)
issue.setParentIssue(parentIssue); //myIssue瑜� �븯�쐞�씠�뒋�쓽 �긽�쐞�씠�뒋濡� set
diff --git a/src/main/java/kr/wisestone/owl/service/impl/SystemEmailServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/SystemEmailServiceImpl.java
index 5d35f1e..377b12e 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/SystemEmailServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/SystemEmailServiceImpl.java
@@ -247,8 +247,8 @@
}
}
}
-
this.javaMailSender.send(message);
+
} catch (MailSendException e) {
log.error(e.getMessage());
Exception[] exceptions = e.getMessageExceptions();
diff --git a/src/main/webapp/WEB-INF/i18n/code_ko_KR.properties b/src/main/webapp/WEB-INF/i18n/code_ko_KR.properties
index d0355db..1288bb8 100644
--- a/src/main/webapp/WEB-INF/i18n/code_ko_KR.properties
+++ b/src/main/webapp/WEB-INF/i18n/code_ko_KR.properties
@@ -97,6 +97,7 @@
common.createIssue=\uC774\uC288 \uC0DD\uC131
common.updateIssue=\uC774\uC288 \uBCC0\uACBD
common.deleteIssue=\uC774\uC288 \uC0AD\uC81C
+common.sendMailIssue=\uC774\uC288 \uBA54\uC77C \uC804\uC1A1
common.updateTitle=\uC81C\uBAA9\uC774 \uBCC0\uACBD\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
common.updateContent=\uB0B4\uC6A9\uC774 \uBCC0\uACBD\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
common.updateProject=\uD504\uB85C\uC81D\uD2B8\uAC00 \uBCC0\uACBD\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
diff --git a/src/main/webapp/i18n/ko/global.json b/src/main/webapp/i18n/ko/global.json
index 302c2c5..994f964 100644
--- a/src/main/webapp/i18n/ko/global.json
+++ b/src/main/webapp/i18n/ko/global.json
@@ -171,6 +171,7 @@
"relationIssueAddHistory" : "�뿰愿� �씠�뒋媛� 異붽��릺�뿀�뒿�땲�떎.",
"downIssueRemoveHistory" : "�븯�쐞 �씠�뒋媛� �궘�젣�릺�뿀�뒿�땲�떎.",
"downIssueAddHistory" : "�븯�쐞 �씠�뒋媛� 異붽��릺�뿀�뒿�땲�떎.",
+ "sendIssueMailHistory" : "�씠�뒋 硫붿씪 �쟾�넚�쓣 �셿猷뚰뻽�뒿�땲�떎.",
"issueCompanyRemoveHistory" : "�뾽泥� �젙蹂닿� �궘�젣�릺�뿀�뒿�땲�떎.",
"issueCompanyAddHistory" : "�뾽泥� �젙蹂닿� 異붽��릺�뿀�뒿�땲�떎.",
@@ -778,6 +779,7 @@
"createIssue": "�씠�뒋 �깮�꽦",
"updateIssue": "�씠�뒋 蹂�寃�",
"deleteIssue": "�씠�뒋 �궘�젣",
+ "sendMailIssue": "�씠�뒋 硫붿씪 �쟾�넚",
"updateTitle": "�젣紐⑹씠 蹂�寃쎈릺�뿀�뒿�땲�떎.",
"updateContent": "�궡�슜�씠 蹂�寃쎈릺�뿀�뒿�땲�떎.",
"updateProject": "�봽濡쒖젥�듃媛� 蹂�寃쎈릺�뿀�뒿�땲�떎.",
--
Gitblit v1.8.0