From b769c2dcd17af4978fe152ec2ae306a6d6d7773d Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 월, 03 1월 2022 14:31:05 +0900
Subject: [PATCH] 이메일 전송 템플릿을 가져올때 db에서 가져오지 않고 서버의 이메일 템플릿을 가져오도록 수정
---
src/main/java/kr/wisestone/owl/service/impl/EmailTemplateServiceImpl.java | 35 ++++++++++++++++++++++++++++++++---
1 files changed, 32 insertions(+), 3 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/impl/EmailTemplateServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/EmailTemplateServiceImpl.java
index e09e59d..44695f8 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/EmailTemplateServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/EmailTemplateServiceImpl.java
@@ -2,9 +2,11 @@
import com.google.common.collect.Lists;
import kr.wisestone.owl.common.ExcelConditionCheck;
+import kr.wisestone.owl.config.CommonConfiguration;
import kr.wisestone.owl.constant.Constants;
import kr.wisestone.owl.constant.MsgConstants;
import kr.wisestone.owl.domain.*;
+import kr.wisestone.owl.domain.enumType.EmailType;
import kr.wisestone.owl.exception.OwlRuntimeException;
import kr.wisestone.owl.mapper.CompanyFieldMapper;
import kr.wisestone.owl.mapper.EmailTemplateMapper;
@@ -13,6 +15,7 @@
import kr.wisestone.owl.repository.HostingFieldRepository;
import kr.wisestone.owl.repository.IspFieldRepository;
import kr.wisestone.owl.service.*;
+import kr.wisestone.owl.util.CommonUtil;
import kr.wisestone.owl.util.ConvertUtil;
import kr.wisestone.owl.vo.*;
import kr.wisestone.owl.web.condition.CompanyFieldCondition;
@@ -43,7 +46,13 @@
private EmailTemplateMapper emailTemplateMapper;
@Autowired
- private EmailTemplateService emailTemplateService;
+ private SystemEmailService systemEmailService;
+
+ @Autowired
+ private IssueService issueService;
+
+ @Autowired
+ private CommonConfiguration configuration;
@Override
protected JpaRepository<EmailTemplate, Long> getRepository() {
@@ -52,9 +61,29 @@
@Override
+ @Transactional
public void find(Map<String, Object> resJsonData, EmailTemplateCondition condition) {
- EmailTemplate emailTemplate = this.getEmailTemplate(condition.getId());
- EmailTemplateVo emailTemplateVo = ConvertUtil.copyProperties(emailTemplate, EmailTemplateVo.class);
+ //EmailTemplate emailTemplate = this.getEmailTemplate(condition.getId());
+ //EmailTemplateVo emailTemplateVo = ConvertUtil.copyProperties(emailTemplate, EmailTemplateVo.class);
+
+ Issue issue = this.issueService.getIssue(condition.getIssueId());
+ Map<String, Object> issueMap = new HashMap<>();
+ // �씠�뒋 �젙蹂대�� �씠硫붿씪 �쟾�넚�뿉 �궗�슜�븯湲� �쐞�빐 Map �삎�깭濡� 蹂��솚�븳�떎.
+ this.issueService.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);
+
+ EmailType emailType = EmailType.valueOf(condition.getTemplateType());
+ String type = this.systemEmailService.makeEmailContent(emailType, issueMap);
+ EmailTemplateVo emailTemplateVo = new EmailTemplateVo();
+ emailTemplateVo.setTemplate(type);
resJsonData.put(Constants.RES_KEY_CONTENTS, emailTemplateVo);
}
--
Gitblit v1.8.0