From 1ec3490a4c03a08e2300368182168b22ad065ffa Mon Sep 17 00:00:00 2001 From: wyu <kknd09321@nate.com> Date: 목, 02 12월 2021 00:42:26 +0900 Subject: [PATCH] 사용자 정행 --- src/main/java/kr/wisestone/owl/service/impl/SystemEmailServiceImpl.java | 44 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 43 insertions(+), 1 deletions(-) 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 d6f06f8..5d35f1e 100644 --- a/src/main/java/kr/wisestone/owl/service/impl/SystemEmailServiceImpl.java +++ b/src/main/java/kr/wisestone/owl/service/impl/SystemEmailServiceImpl.java @@ -9,6 +9,7 @@ import kr.wisestone.owl.config.CommonConfiguration; import kr.wisestone.owl.constant.MailConstants; import kr.wisestone.owl.constant.MsgConstants; +import kr.wisestone.owl.domain.Department; import kr.wisestone.owl.domain.SystemEmail; import kr.wisestone.owl.domain.User; import kr.wisestone.owl.domain.enumType.EmailType; @@ -96,7 +97,6 @@ locale = CommonUtil.getUserLanguage(loginUser.getLanguage()); } } - this.makeDirectContextEmail(emailType, params, locale, new String[]{CommonUtil.decryptAES128(sendUser)}); } } @@ -174,6 +174,24 @@ case ISSUE_SEND: // �씠�뒋 �씠硫붿씪濡� ���긽�옄�뿉寃� 諛쒖넚 mailConstants = MailConstants.ISSUE_SEND; + context = StringTemplateUtil.makeContext(params, locale); + content = this.springTemplateEngine.process(mailConstants.getMailTemplate(), context); + break; + + case ISSUE_SEND_1: // �씠�뒋 �씠硫붿씪 �뀥�뵆由�1濡� ���긽�옄�뿉寃� 諛쒖넚 + mailConstants = MailConstants.ISSUE_SEND_1; + context = StringTemplateUtil.makeContext(params, locale); + content = this.springTemplateEngine.process(mailConstants.getMailTemplate(), context); + break; + + case ISSUE_SEND_2: // �씠�뒋 �씠硫붿씪 �뀥�뵆由�2濡� ���긽�옄�뿉寃� 諛쒖넚 + mailConstants = MailConstants.ISSUE_SEND_2; + context = StringTemplateUtil.makeContext(params, locale); + content = this.springTemplateEngine.process(mailConstants.getMailTemplate(), context); + break; + + case ISSUE_SEND_3: // �씠�뒋 �씠硫붿씪 �뀥�뵆由�3濡� ���긽�옄�뿉寃� 諛쒖넚 + mailConstants = MailConstants.ISSUE_SEND_3; context = StringTemplateUtil.makeContext(params, locale); content = this.springTemplateEngine.process(mailConstants.getMailTemplate(), context); break; @@ -298,6 +316,30 @@ return results; } + // �봽濡쒖젥�듃�뿉�꽌 蹂�寃쎈맂 �떞�떦遺��꽌瑜� 李얘린 �쐞�빐 �궗�슜 + @Override + @Transactional(readOnly = true) + public List<String> notificationDepartmentChange(List<Department> totalDepartments, List<Department> targetDepartments) { + List<String> results = Lists.newArrayList(); + + // �젣�쇅 ���긽�옄 李얘린 + for (Department department : totalDepartments) { + boolean excludeCheck = true; + + for (Department newDepartment : targetDepartments) { + if (department.getId().equals(newDepartment.getId())) { + excludeCheck = false; + break; + } + } + + if (excludeCheck) { + results.add(department.getDepartmentName()); + } + } + return results; + } + // �븘吏� 諛쒖넚�릺吏� �븡�� �씠硫붿씪�쓣 議고쉶�븳�떎. @Override @Transactional(readOnly = true) -- Gitblit v1.8.0