更新邮件模块,解决尾期验货日期发送邮件到对应生产科

chenhang4442024
1 parent 5d08aa73
Showing 4 changed files with 167 additions and 63 deletions
src/main/java/com/order/erp/common/constant/Constant.java
src/main/java/com/order/erp/common/utils/EmailSendUtils.java
src/main/java/com/order/erp/job/OrderOverTimeEventJob.java
src/main/resources/templates/mail.ftl
@@ -329,5 +329,9 @@ public class Constant {
      * 缓存导入excel错误信息 redis key
      */
     public static final String EXCEL_IMPORT_ERROR_PREFIX = "excel:import:error:";
+    /**
+     * redis过期时间。
+     */
+    public static final  long  REDIS_EMAIL_TIME = 90;
 }
 package com.order.erp.common.utils;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.order.erp.common.constant.ServerResultCode;
+import com.order.erp.common.exception.BusinessException;
 import com.order.erp.domain.EmailTemplateEnum;
 import com.order.erp.domain.email.OrderProductEmailVO;
 import com.order.erp.domain.vo.order.OrderEventJobVO;
@@ -28,7 +31,7 @@ import java.util.Map;
 @Component
 public class EmailSendUtils {
     @Value("${spring.mail.username}")
-    public   String sendEmail;
+    public String sendEmail;
     @Resource
     private JavaMailSender javaMailSender;
     @Resource
@@ -43,28 +46,35 @@ public class EmailSendUtils {
      * @throws IOException
      */
-    public  void sendEmail(EmailTemplateEnum emailTemplateEnum, List<String> receiveemailList, OrderEventJobVO orderEventJobVO) throws MessagingException, IOException, TemplateException {
-        MimeMessage mimeMessage = javaMailSender.createMimeMessage();
-        if(CollectionUtils.isNotEmpty(receiveemailList)){
-            MimeMessageHelper helper=new MimeMessageHelper(mimeMessage,true);
-            //设置邮件的主题
-            helper.setSubject(emailTemplateEnum.getTitle());
-            //设置发件人
-            helper.setFrom(sendEmail);
-            //设置收件人
-            String[] receiveemailListArray = receiveemailList.toArray(new String[receiveemailList.size()]);
-            helper.setTo(receiveemailListArray);
-            helper.setSentDate(new Date());
+    public  void sendEmail(EmailTemplateEnum emailTemplateEnum, List<String> receiveemailList, OrderEventJobVO orderEventJobVO)  {
+        if(CollectionUtils.isEmpty(receiveemailList) && emailTemplateEnum ==null && ObjectUtils.isNull(orderEventJobVO)){
+            throw new BusinessException(ServerResultCode.PARAM_ERROR);
+        }
+            MimeMessage mimeMessage = javaMailSender.createMimeMessage();
+            MimeMessageHelper helper= null;
             Map<String, Object> map = new HashMap<>();
             map.put("context",emailTemplateEnum.getContent());
             map.put("title",emailTemplateEnum.getTitle());
             map.put("data",orderEventJobVO);
-            Template template = freeMarkerConfigurer.getConfiguration().getTemplate("mail.ftl");
-            StringWriter stringWriter = new StringWriter();
-            template.process(map,stringWriter);
-            helper.setText(stringWriter.toString(),true);
-            javaMailSender.send(mimeMessage);
+            Template template = null;
+            //设置收件人
+            String[] receiveemailListArray = receiveemailList.toArray(new String[receiveemailList.size()]);
+            try {
+                helper = new MimeMessageHelper(mimeMessage,true);
+            //设置邮件的主题
+                helper.setSubject(emailTemplateEnum.getTitle());
+            //设置发件人
+                helper.setFrom(sendEmail);
+                helper.setTo(receiveemailListArray);
+                helper.setSentDate(new Date());
+                template = freeMarkerConfigurer.getConfiguration().getTemplate("mail.ftl");
+                StringWriter stringWriter = new StringWriter();
+                template.process(map,stringWriter);
+                helper.setText(stringWriter.toString(),true);
+            } catch (TemplateException | IOException  | MessagingException e) {
+                throw new RuntimeException("邮件发送失败！");
         }
+            javaMailSender.send(mimeMessage);
     }
     /**
      * @Description:    发送生产指示书邮件
@@ -75,19 +85,27 @@ public class EmailSendUtils {
      * @throws IOException
      */
     //生产指示书以附件方式发送。
-    public  void sendEmail(EmailTemplateEnum emailTemplateEnum, List<String> receiveemailList, File pdfFile) throws MessagingException {
-        MimeMessage mimeMessage = javaMailSender.createMimeMessage();
-        MimeMessageHelper helper=new MimeMessageHelper(mimeMessage,true);
-        //设置邮件的主题
-        helper.setSubject(emailTemplateEnum.getTitle());
-        //设置发件人
-        helper.setFrom(sendEmail);
-        //设置收件人
-        String[] receiveemailListArray = receiveemailList.toArray(new String[receiveemailList.size()]);
-        helper.setTo(receiveemailListArray);
-        helper.setSentDate(new Date());
-        helper.setText(emailTemplateEnum.getContent());
-        helper.addAttachment(pdfFile.getName(),pdfFile);
-        javaMailSender.send(mimeMessage);
-    }
+    public  void sendEmail(EmailTemplateEnum emailTemplateEnum, List<String> receiveemailList, File pdfFile) {
+        if (CollectionUtils.isEmpty(receiveemailList) && emailTemplateEnum == null && ObjectUtils.isNull(pdfFile)) {
+            throw new BusinessException(ServerResultCode.PARAM_ERROR);
+        }
+            MimeMessage mimeMessage = javaMailSender.createMimeMessage();
+            //设置收件人
+            String[] receiveemailListArray = receiveemailList.toArray(new String[receiveemailList.size()]);
+            MimeMessageHelper helper = null;
+            try {
+                helper = new MimeMessageHelper(mimeMessage, true);
+            //设置邮件的主题
+                helper.setSubject(emailTemplateEnum.getTitle());
+            //设置发件人
+                helper.setFrom(sendEmail);
+                helper.setTo(receiveemailListArray);
+                helper.setSentDate(new Date());
+                helper.setText(emailTemplateEnum.getContent());
+                helper.addAttachment(pdfFile.getName(), pdfFile);
+            } catch (MessagingException e) {
+                throw new RuntimeException("邮件发送失败！");
+            }
+            javaMailSender.send(mimeMessage);
+        }
 }
 \ No newline at end of file
@@ -8,11 +8,14 @@ import com.order.erp.common.constant.Constant;
 import com.order.erp.common.utils.*;
 import com.order.erp.domain.EmailTemplateEnum;
 import com.order.erp.domain.OrderEventEnum;
+import com.order.erp.domain.dto.BaseDO;
+import com.order.erp.domain.dto.admin.AdminUserDO;
 import com.order.erp.domain.dto.order.OrderBaseInfoDO;
 import com.order.erp.domain.dto.order.OrderInspectionStageDO;
 import com.order.erp.domain.dto.order.OrderTrackStageDO;
 import com.order.erp.domain.dto.order.ReceiveEmailMappingDO;
 import com.order.erp.domain.vo.order.*;
+import com.order.erp.service.admin.AdminUserService;
 import com.order.erp.service.order.*;
 import freemarker.template.TemplateException;
 import lombok.extern.slf4j.Slf4j;
@@ -71,6 +74,9 @@ public class OrderOverTimeEventJob {
     @Resource
     private RedisUtils redisUtils;
+    @Resource
+    private AdminUserService adminUserService;
+
     /**
      * 凌晨1点执行，一天一次
      */
@@ -98,48 +104,80 @@ public class OrderOverTimeEventJob {
      * @param eventJobVOS
      */
     //发送邮件。
-    private void sendEmail4OrderEvent(OrderEventEnum eventEnum, List<OrderEventJobVO> eventJobVOS) throws MessagingException, TemplateException, IOException {
+    private void sendEmail4OrderEvent(OrderEventEnum eventEnum, List<OrderEventJobVO> eventJobVOS) {
-        HashSet<String> strings = new HashSet<>();
+        HashSet<String> customerCodeList = new HashSet<>();
         for (OrderEventJobVO orderEventJob : eventJobVOS) {
             if (!redisUtils.hasKey(EmailTemplateEnum.byTemplate(
                     eventEnum.getTemplateId()) + Constant.CROSS_BAR_CHARACTER + orderEventJob.getBaseInfo().getId())) {
-                strings.add(orderEventJob.getBaseInfo().getCustomerCode());
+                customerCodeList.add(orderEventJob.getBaseInfo().getCustomerCode());
             }
         }
         LambdaQueryWrapper<ReceiveEmailMappingDO> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(ReceiveEmailMappingDO::getEnableFlag, Constant.ENABLE_TEN);
-        if (strings == null || strings.isEmpty()) {
+        if (CollectionUtils.isEmpty(customerCodeList)) {
             queryWrapper.eq(ReceiveEmailMappingDO::getTypeValue, "");
         } else {
-            queryWrapper.in(ReceiveEmailMappingDO::getTypeValue, strings);
+            queryWrapper.in(ReceiveEmailMappingDO::getTypeValue, customerCodeList);
         }
-        queryWrapper.apply("JSON_CONTAINS(JSON_EXTRACT(config_infos,'$[*].event'),JSON_QUOTE({0}),'$')", eventEnum.getEvent());
-        List<ReceiveEmailMappingDO> receiveEmailMappingDOList = receiveEmailMappingService.list(queryWrapper);
+//        queryWrapper.apply("JSON_CONTAINS(JSON_EXTRACT(config_infos,'$[*].event'),JSON_QUOTE({0}),'$')", eventEnum.getEvent());
-        Set<Map<String, List<String>>> set = receiveEmailMappingDOList.stream().map(x -> {
-            Map<String, List<String>> map = new HashMap<>();
-            String customerCode = x.getTypeValue();
-//            ReceiveEmailConfigItemVO receiveEmailConfigItemVO = JSON.parseObject(x.getConfigInfos(), ReceiveEmailConfigItemVO.class);
-            List<ReceiveEmailConfigItemVO> receiveEmailConfigItemVOList = JSON.parseObject(
-                    x.getConfigInfos(), new TypeReference<List<ReceiveEmailConfigItemVO>>() {
+        List<ReceiveEmailMappingDO> receiveEmailMappingDOList = receiveEmailMappingService.list(queryWrapper);
+        List<ReceiveEmailMappingDO> receiveEmailMappingDOS = receiveEmailMappingDOList.stream().map(x -> {
+                    List<ReceiveEmailConfigItemVO> receiveEmailConfigItemVOList = JSON.parseObject(x.getConfigInfos(), new TypeReference<List<ReceiveEmailConfigItemVO>>() {
                     });
-            List<String> strings1 = new ArrayList<>();
-            for (ReceiveEmailConfigItemVO item : receiveEmailConfigItemVOList) {
-                strings1 = item.getEmails();
+                    for (ReceiveEmailConfigItemVO receiveEmailConfigItemVO : receiveEmailConfigItemVOList) {
+                        if (eventEnum.getEvent().equals(receiveEmailConfigItemVO.getEvent())) {
+                            return x;
+                        }
+                    }
+                    return null;
+                }).filter(Objects::nonNull)
+                .collect(Collectors.toList());
+        //如果为尾期验货事件的话,需要从订单中的生产科角色中得到邮箱。而不是从邮件配置中得到邮箱。
+        if (OrderEventEnum.END_CHECK_DATE_EVENT.equals(eventEnum)) {
+            for (OrderEventJobVO orderEventJob : eventJobVOS) {
+                String productionDepartment = orderEventJob.getBaseInfo().getProductionDepartment();
+                //根据订单的生产科得到生产科用户信息。
+                AdminUserDO productionDepartmentUser = adminUserService.getOne(new LambdaQueryWrapper<AdminUserDO>()
+                        .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                        .eq(AdminUserDO::getUserName, productionDepartment));
+                List<String> productionEmail = Arrays.asList(productionDepartmentUser.getEmail().split("[,，]+"))
+                                .stream().map(String::trim)
+                                .collect(Collectors.toList());
+                emailSendUtils.sendEmail(EmailTemplateEnum.byTemplate(eventEnum.getTemplateId()),
+                        productionEmail, orderEventJob);
+                redisUtils.set(EmailTemplateEnum.byTemplate(
+                                eventEnum.getTemplateId()) + Constant.CROSS_BAR_CHARACTER + orderEventJob.getBaseInfo().getId(),
+                        orderEventJob, 90, TimeUnit.DAYS);
             }
-            List<String> emails = strings1;
-            map.put(customerCode, emails);
-            return map;
-        }).collect(Collectors.toSet());
-        for (OrderEventJobVO orderEventJob : eventJobVOS) {
-            for (Map<String, List<String>> map : set) {
-                if (orderEventJob.getBaseInfo().getCustomerCode().equals(map.keySet().iterator().next())) {
-                    emailSendUtils.sendEmail(EmailTemplateEnum.byTemplate(eventEnum.getTemplateId()),
-                            map.get(map.keySet().iterator().next()), orderEventJob);
-                    redisUtils.set(EmailTemplateEnum.byTemplate(
-                                    eventEnum.getTemplateId()) + Constant.CROSS_BAR_CHARACTER + orderEventJob.getBaseInfo().getId(),
-                            orderEventJob, 90, TimeUnit.DAYS);
+        } else {
+            Set<Map<String, List<String>>> set = receiveEmailMappingDOS.stream().map(x -> {
+                Map<String, List<String>> map = new HashMap<>();
+                String customerCode = x.getTypeValue();
+//            ReceiveEmailConfigItemVO receiveEmailConfigItemVO = JSON.parseObject(x.getConfigInfos(), ReceiveEmailConfigItemVO.class);
+                List<ReceiveEmailConfigItemVO> receiveEmailConfigItemVOList = JSON.parseObject(
+                        x.getConfigInfos(), new TypeReference<List<ReceiveEmailConfigItemVO>>() {
+                        });
+                List<String> emailList = new ArrayList<>();
+                for (ReceiveEmailConfigItemVO item : receiveEmailConfigItemVOList) {
+                    if (eventEnum.getEvent().equals(item.getEvent())) {
+                        emailList = item.getEmails();
+                    }
+                }
+                List<String> emails = emailList;
+                map.put(customerCode, emails);
+                return map;
+            }).collect(Collectors.toSet());
+            for (OrderEventJobVO orderEventJob : eventJobVOS) {
+                for (Map<String, List<String>> map : set) {
+                    if (orderEventJob.getBaseInfo().getCustomerCode().equals(map.keySet().iterator().next())) {
+                        emailSendUtils.sendEmail(EmailTemplateEnum.byTemplate(eventEnum.getTemplateId()),
+                                map.get(map.keySet().iterator().next()), orderEventJob);
+                        redisUtils.set(EmailTemplateEnum.byTemplate(
+                                        eventEnum.getTemplateId()) + Constant.CROSS_BAR_CHARACTER + orderEventJob.getBaseInfo().getId(),
+                                orderEventJob, Constant.REDIS_EMAIL_TIME, TimeUnit.DAYS);
+                    }
                 }
             }
         }
@@ -34,7 +34,7 @@
 <h3>${context}</h3>
 <table border="1">
     <tr id="title1">
-        <#if title=="中期验货报告" || title=="尾期验货报告">
+        <#if title=="中期验货报告">
             <td> 项目号</td>
             <td> 生产科</td>
             <td> 内部编号</td>
@@ -42,12 +42,34 @@
             <td> 客户SYSTEM</td>
             <td> PO COLOR</td>
             <td> 订单图片</td>
+            <td> 生产要求</td>
             <td> 数量 </td>
             <td> 生产科拖货时间</td>
             <td> 包装类型</td>
             <td> 中期验货申请时间</td>
             <td> 中期验货（功能性-拉力/跌落等、外观性-颜色/规格等、耐力性-烤厅等）</td>
             <td> 中期验货结果PASS/FALL</td>
+        <#elseif title=="尾期验货报告">
+            <td> 项目号</td>
+            <td> 生产科</td>
+            <td> 内部编号</td>
+            <td> 客户PO号</td>
+            <td> 客户SYSTEM</td>
+            <td> PO COLOR</td>
+            <td> 订单图片</td>
+            <td> 生产要求</td>
+            <td> 数量 </td>
+            <td> 生产科拖货时间</td>
+            <td> 包装类型</td>
+            <td> 尾期验货申请时间</td>
+            <td> 长度/规格 </td>
+            <td> 功能性不良</td>
+            <td> 电镀不良 </td>
+            <td> 不良1 </td>
+            <td> 不良2 </td>
+            <td> 不良3 </td>
+            <td> 包装:卡片、条码、箱贴、箱单 </td>
+            <td> 中期验货结果PASS/FALL </td>
         <#elseif title=="尾期验货日期">
             <td> 客户编码</td>
             <td> 项目号</td>
@@ -77,7 +99,7 @@
         </#if>
     </tr>
     <tr id="title2">
-        <#if title=="中期验货报告" || title=="尾期验货报告">
+        <#if title=="中期验货报告" >
             <td>${data.baseInfo.projectNo! " "}</td>
             <td>${data.baseInfo.productionDepartment! " "}</td>
             <td>${data.baseInfo.internalNo! " "}</td>
@@ -85,12 +107,34 @@
             <td>${data.baseInfo.customerStyle! " "}</td>
             <td>${data.baseInfo.poColor! " "}</td>
             <td><img src="${data.baseInfo.smallPicUrl! " "}" alt="Image"></td>
+            <td>${data.baseInfo.productionComment! " "}</td>
             <td>${data.baseInfo.orderCount! " "}</td>
             <td>${data.baseInfo.productionDepartmentConsignTime! " "}</td>
             <td>${data.baseInfo.packetType! " "}</td>
             <td>${data.inspectionStageInfo.midCheckApplyTime! " "}</td>
             <td>${data.inspectionStageInfo.midCheckComment! " "}</td>
             <td>${data.inspectionStageInfo.midCheckResult! " "}</td>
+        <#elseif title=="尾期验货报告">
+            <td>${data.baseInfo.projectNo! " "}</td>
+            <td>${data.baseInfo.productionDepartment! " "}</td>
+            <td>${data.baseInfo.internalNo! " "}</td>
+            <td>${data.baseInfo.customerPo! " "}</td>
+            <td>${data.baseInfo.customerStyle! " "}</td>
+            <td>${data.baseInfo.poColor! " "}</td>
+            <td><img src="${data.baseInfo.smallPicUrl! " "}" alt="Image"></td>
+            <td>${data.baseInfo.productionComment! " "}</td>
+            <td>${data.baseInfo.orderCount! " "}</td>
+            <td>${data.baseInfo.productionDepartmentConsignTime! " "}</td>
+            <td>${data.baseInfo.packetType! " "}</td>
+            <td> ${data.inspectionStageInfo.endCheckApplyTime! " "}</td>
+            <td> ${data.inspectionStageInfo.specification! " "} </td>
+            <td> ${data.inspectionStageInfo.functionality! " "}</td>
+            <td> ${data.inspectionStageInfo.electroplate! " "} </td>
+            <td> ${data.inspectionStageInfo.value1! " "}</td>
+            <td> ${data.inspectionStageInfo.value2! " "}</td>
+            <td> ${data.inspectionStageInfo.value3! " "}</td>
+            <td> ${data.inspectionStageInfo.boxPacket! " "} </td>
+            <td> ${data.inspectionStageInfo.endCheckResult! " "} </td>
         <#elseif title=="尾期验货日期">
             <td>${data.baseInfo.customerCode! " "}</td>
             <td>${data.baseInfo.projectNo! " "}</td>