From 174dc12380c54730014e86c8897be16389fc804f Mon Sep 17 00:00:00 2001
From: 박지현 <jhpark@maprex.co.kr>
Date: 월, 21 2월 2022 11:42:38 +0900
Subject: [PATCH] Merge branch 'master' of http://maprex.iptime.org:9001/r/owl-kisa
---
src/main/java/kr/wisestone/owl/service/impl/SystemEmailServiceImpl.java | 133 ++++++++++++++++++++++++++++++++++++-------
1 files changed, 110 insertions(+), 23 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 5d35f1e..1004513 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/SystemEmailServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/SystemEmailServiceImpl.java
@@ -7,21 +7,22 @@
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.flywaydb.core.internal.util.scanner.filesystem.FileSystemResource;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -38,12 +39,11 @@
import javax.activation.DataSource;
import javax.activation.FileDataSource;
import javax.mail.SendFailedException;
-import javax.mail.internet.InternetAddress;
-import javax.mail.internet.MimeMessage;
-import javax.mail.internet.MimeUtility;
+import javax.mail.internet.*;
import java.io.IOException;
import java.util.*;
+import org.springframework.web.multipart.MultipartFile;
import org.thymeleaf.context.Context;
import org.thymeleaf.spring5.SpringTemplateEngine;
@@ -64,6 +64,9 @@
@Autowired
private SpringTemplateEngine springTemplateEngine;
+ @Autowired
+ private UserDepartmentService userDepartmentService;
+
@Override
protected JpaRepository<SystemEmail, Long> getRepository() {
return this.systemEmailRepository;
@@ -74,6 +77,9 @@
@Value("${email.userName}")
private String emailUserName;
+
+ @Value("${email.sender}")
+ private String emailSender;
// �씠硫붿씪 利됱떆 �쟾�넚
@Async
@@ -221,34 +227,77 @@
break;
}
- this.sendEmail(this.messageAccessor.message(mailConstants.getTitle(), locale), content, sendUsers, filePaths);
+ this.sendEmail(this.messageAccessor.message(mailConstants.getTitle(), locale), content, sendUsers, filePaths, null);
}
+
+ // �씠硫붿씪 �뀥�뵆由� 李얘린
+ public String makeEmailContent(EmailType emailType, Map<String, Object> params) {
+ MailConstants mailConstants = null;
+ Context context;
+ String content = null;
+ //params.put("url", this.commonConfiguration.getEmailSendUrl());
+
+ Locale locale = Locale.getDefault();
+
+ switch (emailType) {
+ 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;
+ }
+ return content;
+ }
+
// �씠硫붿씪�쓣 諛쒖넚�븳�떎.
@Override
@Transactional(readOnly = true)
- public void sendEmail(String subject, String content, String[] to, String[] filePaths) {
+ public void sendEmail(String subject, String content, String[] to, String[] filePaths, List<MultipartFile> multipartFiles) {
MimeMessage message = this.javaMailSender.createMimeMessage();
try {
- InternetAddress from = new InternetAddress(this.emailUserName, "OWL-ITS");
- MimeMessageHelper messageHelper = new MimeMessageHelper(message, true, "utf-8");
- messageHelper.setSubject(subject);
- messageHelper.setText(content, true);
- messageHelper.setFrom(from);
- messageHelper.setTo(to);
+ if (this.emailSender != null && !this.emailSender.equals("")
+ && this.emailUserName != null && !this.emailUserName.equals("")) {
- if (filePaths != null && filePaths.length > 0) {
- for (String filePath : filePaths) {
- if (!StringUtils.isEmpty(filePath)) {
- DataSource dataSource = new FileDataSource(filePath);
- messageHelper.addAttachment(MimeUtility.encodeText(
- FilenameUtils.getBaseName(filePath), "utf-8", "B"), dataSource);
+ InternetAddress from = new InternetAddress(this.emailUserName, this.emailSender);
+ MimeMessageHelper messageHelper = new MimeMessageHelper(message, true, "utf-8");
+ messageHelper.setSubject(subject);
+ messageHelper.setText(content, true);
+ messageHelper.setFrom(from);
+ messageHelper.setTo(to);
+
+ if (multipartFiles != null && multipartFiles.size() > 0) {
+ for (MultipartFile file : multipartFiles) {
+ // �뙆�씪 泥⑤�
+ messageHelper.addAttachment(MimeUtility.encodeText(file.getOriginalFilename(), "utf-8", "B"), file);
}
}
+
+ if (filePaths != null && filePaths.length > 0) {
+ for (String filePath : filePaths) {
+ if (!StringUtils.isEmpty(filePath)) {
+ DataSource dataSource = new FileDataSource(filePath);
+ messageHelper.addAttachment(MimeUtility.encodeText(
+ FilenameUtils.getBaseName(filePath), "utf-8", "B"), dataSource);
+ }
+ }
+ }
+ this.javaMailSender.send(message);
}
- this.javaMailSender.send(message);
} catch (MailSendException e) {
log.error(e.getMessage());
Exception[] exceptions = e.getMessageExceptions();
@@ -334,6 +383,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());
}
}
@@ -371,7 +427,38 @@
// �궡�슜�씠 �엳�쑝硫� 諛쒖넚
if (!StringUtils.isEmpty(emailBuilder.toString())) {
// �씠硫붿씪�쓣 諛쒖넚�븳�떎.
- this.sendEmail(this.messageAccessor.message(MsgConstants.RESERVATION_EMAIL_TITLE, locale), emailBuilder.toString(), new String[]{CommonUtil.decryptAES128(sendUser)}, null);
+ this.sendEmail(this.messageAccessor.message(MsgConstants.RESERVATION_EMAIL_TITLE, locale), emailBuilder.toString(), new String[]{CommonUtil.decryptAES128(sendUser)}, null, null);
+ this.systemEmailRepository.saveAll(systemEmails);
+ }
+ }
+ }
+ }
+
+ // �떎�떆媛� �씠硫붿씪 諛쒖넚
+ @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, null);
this.systemEmailRepository.saveAll(systemEmails);
}
}
--
Gitblit v1.8.0