From 4356da2b030443f74c25335ad60b9f3c40f5b789 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 수, 15 12월 2021 09:55:54 +0900
Subject: [PATCH] 이슈 하위이슈 삭제버튼, 최고관리자인데 수정 권한이 없는 오류 수정

---
 src/main/java/kr/wisestone/owl/service/impl/SystemEmailServiceImpl.java |   49 +++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 45 insertions(+), 4 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 377b12e..2e4602d 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/SystemEmailServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/SystemEmailServiceImpl.java
@@ -7,20 +7,20 @@
 import com.google.common.collect.Lists;
 import com.sun.mail.smtp.SMTPAddressFailedException;
 import kr.wisestone.owl.config.CommonConfiguration;
+import kr.wisestone.owl.constant.ElasticSearchConstants;
 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.UserDepartment;
 import kr.wisestone.owl.domain.enumType.EmailType;
 import kr.wisestone.owl.exception.OwlRuntimeException;
 import kr.wisestone.owl.repository.SystemEmailRepository;
 import kr.wisestone.owl.service.SystemEmailService;
+import kr.wisestone.owl.service.UserDepartmentService;
 import kr.wisestone.owl.service.UserService;
-import kr.wisestone.owl.util.CommonUtil;
-import kr.wisestone.owl.util.DateUtil;
-import kr.wisestone.owl.util.MapUtil;
-import kr.wisestone.owl.util.StringTemplateUtil;
+import kr.wisestone.owl.util.*;
 import org.apache.commons.io.FilenameUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -63,6 +63,9 @@
 
     @Autowired
     private SpringTemplateEngine springTemplateEngine;
+
+    @Autowired
+    private UserDepartmentService userDepartmentService;
 
     @Override
     protected JpaRepository<SystemEmail, Long> getRepository() {
@@ -334,6 +337,13 @@
             }
 
             if (excludeCheck) {
+                /*List<UserDepartment> userDepartments = this.userDepartmentService.getUserDepartments(department.getId());
+                if(userDepartments != null){
+                    for (UserDepartment userDepartment : userDepartments){
+                        User user = this.userService.getUser(userDepartment.getUserId());
+                        results.add(user.getAccount());
+                    }
+                }*/
                 results.add(department.getDepartmentName());
             }
         }
@@ -378,6 +388,37 @@
         }
     }
 
+    //  �떎�떆媛� �씠硫붿씪 諛쒖넚
+    @Override
+    @Transactional
+    public void realTimeSendEmail() {
+
+        List<String> sendUsers = this.userService.findByRealTimeNotifyTime();
+
+        for (String sendUser : sendUsers) {
+            //  �궗�슜�옄 蹂꾨줈 �븘吏� 諛쒖넚�릺吏� �븡�� �씠硫붿씪�쓣 議고쉶�븳�떎.
+            List<SystemEmail> systemEmails = this.findBySendAddressAndSendYn(sendUser);
+            StringBuilder emailBuilder = new StringBuilder();
+            User user = this.userService.findByAccount(sendUser);
+
+            if (user != null) {
+                Locale locale = CommonUtil.getUserLanguage(user.getLanguage());    //  硫붿씪�쓣 諛쏅뒗 �궗�슜�옄媛� �궗�슜�븯怨� �엳�뒗 �뼵�뼱 �젙蹂대�� 媛��졇�삩�떎.
+
+                for (SystemEmail systemEmail : systemEmails) {
+                    //  諛쏅뒗 �궗�엺�쓽 �뼵�뼱濡� 蹂�寃쏀븯�뿬 �삁�빟�맂 �씠硫붿씪�쓣 諛쒖넚�븳�떎.
+                    this.makeReservationContextEmail(emailBuilder, systemEmail, locale);
+                    systemEmail.setSendYn(true);
+                }
+                //  �궡�슜�씠 �엳�쑝硫� 諛쒖넚
+                if (!StringUtils.isEmpty(emailBuilder.toString())) {
+                    //  �씠硫붿씪�쓣 諛쒖넚�븳�떎.
+                    this.sendEmail(this.messageAccessor.message(MsgConstants.REALTIME_EMAIL_TITLE, locale), emailBuilder.toString(), new String[]{CommonUtil.decryptAES128(sendUser)}, null);
+                    this.systemEmailRepository.saveAll(systemEmails);
+                }
+            }
+        }
+    }
+
     //  諛쏅뒗 �궗�엺�쓽 �뼵�뼱濡� 蹂�寃쏀븯�뿬 �삁�빟�맂 �씠硫붿씪�쓣 諛쒖넚�븳�떎.
     private void makeReservationContextEmail(StringBuilder emailBuilder, SystemEmail systemEmail, Locale locale) {
         MailConstants mailConstants;

--
Gitblit v1.8.0