Revert "feat:防止没有给生产科配置邮箱产生空指针异常"

This reverts commit 3efd19ba.

Revert "feat:防止没有给生产科配置邮箱产生空指针异常"
This reverts commit 3efd19ba.
chenhang4442024
1 parent 3efd19ba
Showing 8 changed files with 46 additions and 106 deletions
pom.xml
src/main/java/com/order/erp/job/OrderOverTimeEventJob.java
src/main/java/com/order/erp/mapper/order/OrderBaseInfoMapper.java
src/main/java/com/order/erp/service/order/impl/OrderBaseInfoServiceImpl.java
src/main/resources/application-local.yml
src/main/resources/application-pre-prod.yml
src/main/resources/application-test.yml
src/main/resources/application.yml
@@ -55,12 +55,6 @@
             <groupId>com.alibaba</groupId>
             <artifactId>easyexcel</artifactId>
             <version>${easyexcel.version}</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>asm</artifactId>
-                    <groupId>org.ow2.asm</groupId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
@@ -92,12 +86,6 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <version>${springboot.version}</version>
             <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <artifactId>asm</artifactId>
-                    <groupId>org.ow2.asm</groupId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
@@ -277,12 +265,6 @@
             <groupId>com.aliyun.oss</groupId>
             <artifactId>aliyun-sdk-oss</artifactId>
             <version>${aliyun-sdk-oss.version}</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>aliyun-java-sdk-core</artifactId>
-                    <groupId>com.aliyun</groupId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <!--thumbnailator 图片压缩工具-->
@@ -298,12 +280,6 @@
             <groupId>wiki.xsx</groupId>
             <artifactId>x-easypdf-pdfbox</artifactId>
             <version>${x-easypdf-pdfbox.version}</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>commons-logging</artifactId>
-                    <groupId>commons-logging</groupId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <!--email邮件配置-->
@@ -301,7 +301,7 @@ public class OrderOverTimeEventJob {
     private Boolean filterBigSampleEvent(OrderEventJobVO eventJobVO) {
         String orderHodTime = eventJobVO.getBaseInfo().getOrderHodTime();
         String shippmentSampleConfirmResult = eventJobVO.getTrackStageInfo().getShippmentSampleConfirmResult();
-        String shippmentSampleConfirmTime = eventJobVO.getTrackStageInfo().getShippmentSampleConfirmTime();
+        String shippmentSampleConfirmTime = eventJobVO.getTrackStageInfo().getShippmentSampleSendTime();
         if (StringUtils.isNotBlank(orderHodTime) && StringUtils.isNotBlank(shippmentSampleConfirmResult) && StringUtils.isNotBlank(shippmentSampleConfirmTime)) {
             int daysBetween = getDaysBetween(shippmentSampleConfirmResult, shippmentSampleConfirmTime, orderHodTime);
             if (daysBetween == Constant.SEVEN || daysBetween == Constant.NEGATIVE_ONE) {
@@ -31,8 +31,7 @@ public interface OrderBaseInfoMapper extends BaseMapper&lt;OrderBaseInfoDO&gt; {
     List<QueryProjectNoAndInnerNoDto> queryProjectNoAndInnerNoDto(@Param("flag") Boolean flag,
                                                                   @Param("dto") QueryProjectNoAndInnerNoDto dto);
-//    @Select("SELECT * FROM order_base_info WHERE order_status!=50 and enable_flag=10 and DATE_SUB(CURDATE(), INTERVAL 3 MONTH) <= date(create_time);")
-@Select("SELECT * FROM order_base_info WHERE  enable_flag=10 and DATE_SUB(CURDATE(), INTERVAL 3 MONTH) <= date(create_time);")
+    @Select("SELECT * FROM order_base_info WHERE order_status!=50 and enable_flag=10 and DATE_SUB(CURDATE(), INTERVAL 3 MONTH) <= date(create_time);")
      List<OrderBaseInfoDO> getEventList();
 }
@@ -1801,23 +1801,40 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                 AdminUserDO ProductionDepartmentUserDO = userService.getOne(new LambdaQueryWrapper<AdminUserDO>()
                         .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
                         .eq(AdminUserDO::getUserName, orderBaseInfoDO.getProductionDepartment()));
-                if( Objects.nonNull(ProductionDepartmentUserDO) && StringUtils.isNotBlank(ProductionDepartmentUserDO.getEmail())){
-                sendOrderInspectionStage(updateVO,inspectionStageInfo);
+                OrderEventJobVO orderEventJobVO = new OrderEventJobVO();
+                orderEventJobVO.setInspectionStageInfo(inspectionStageInfo);
+                OrderBaseInfoVO orderBaseInfoVo = BeanUtil.copyProperties(orderBaseInfoDo, OrderBaseInfoVO.class);
+                orderEventJobVO.setBaseInfo(orderBaseInfoVo);
+                List<String> emails = Arrays.asList(ProductionDepartmentUserDO.getEmail().split( "[,，]+"))
+                        .stream().map(String::trim)
+                        .collect(Collectors.toList());
+                //一旦修改完质检信息就自动发送邮件对应的生产科。多次编辑保存多次发送。
+                if (StringUtils.isNotBlank(inspectionStageInfo.getEndCheckApplyTime())) {
+                      String EndCheckApplyTime= inspectionStageInfo.getEndCheckApplyTime().substring(0, 10);
+                      String ProductionDepartmentConsignTime =orderBaseInfoDo.getProductionDepartmentConsignTime().substring(0, 10);
+                      String EndCheckApply = DateUtils.format(DateUtils.parseDate(EndCheckApplyTime, DATE), DATE);
+                      String ProductionDepartmentConsign = DateUtils.format(DateUtils.parseDate(ProductionDepartmentConsignTime,DATE), DATE);
+                      orderEventJobVO.getInspectionStageInfo().setEndCheckApplyTime(EndCheckApply);
+                      orderEventJobVO.getBaseInfo().setProductionDepartmentConsignTime(ProductionDepartmentConsign);
+                    //尾期验货报告。
+                    emailSendUtils.sendEmail(EmailTemplateEnum.END_CHECK_REPORT_TEMPLATE, emails, orderEventJobVO);
+                }else if(StringUtils.isNotBlank(inspectionStageInfo.getMidCheckApplyTime())){
+                    String MidCheckApplyTime= inspectionStageInfo.getMidCheckApplyTime().substring(0, 10);
+                    String ProductionDepartmentConsignTime =orderBaseInfoDo.getProductionDepartmentConsignTime().substring(0, 10);
+                    String MidCheckApply = DateUtils.format(DateUtils.parseDate(MidCheckApplyTime, DATE), DATE);
+                    String ProductionDepartmentConsign = DateUtils.format(DateUtils.parseDate(ProductionDepartmentConsignTime,DATE), DATE);
+                    orderEventJobVO.getInspectionStageInfo().setMidCheckApplyTime(MidCheckApply);
+                    orderEventJobVO.getBaseInfo().setProductionDepartmentConsignTime(ProductionDepartmentConsign);
+                    //中期验货报告。
+                    emailSendUtils.sendEmail(EmailTemplateEnum.MID_CHECK_REPORT_TEMPLATE, emails, orderEventJobVO);
                 }
+
             } else {
                 inspectionStageDO = new OrderInspectionStageDO();
                 BeanUtils.copyProperties(updateVO.getInspectionStageInfo(), inspectionStageDO);
                 inspectionStageDO.setOrderId(updateVO.getOrderId());
                 inspectionStageDO.setOrderStatus(OrderStatusEnum.INSPECT_ING.getStatus());
                 inspectionStageService.save(inspectionStageDO);
-                OrderBaseInfoDO orderBaseInfoDO = baseInfoService.getById(updateVO.getOrderId());
-                AdminUserDO ProductionDepartmentUserDO = userService.getOne(new LambdaQueryWrapper<AdminUserDO>()
-                        .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
-                        .eq(AdminUserDO::getUserName, orderBaseInfoDO.getProductionDepartment()));
-                if( Objects.nonNull(ProductionDepartmentUserDO) && StringUtils.isNotBlank(ProductionDepartmentUserDO.getEmail())){
-                    sendOrderInspectionStage(updateVO,inspectionStageInfo);
-                }
-
             }
             orderBaseInfoDo.setOrderStatus(OrderStatusEnum.INSPECT_ING.getStatus());
             optLogDO = buildOrderOptLogDo(updateVO.getOrderId(), userId, OrderOptTypeEnum.ORDER_INSPECT_EDIT_APPLY.getDesc(), JSONObject.toJSONString(updateVO));
@@ -2138,36 +2155,4 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
         List<OrderBaseInfoDO> orderBaseInfoDOList = baseMapper.getEventList();
         return orderBaseInfoDOList;
     }
-
-    private void sendOrderInspectionStage(OrderUpdateVO updateVO, OrderInspectionStageVO inspectionStageInfo){
-        OrderBaseInfoDO orderBaseInfoDO = baseInfoService.getById(updateVO.getOrderId());
-        AdminUserDO ProductionDepartmentUserDO = userService.getOne(new LambdaQueryWrapper<AdminUserDO>()
-                .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
-                .eq(AdminUserDO::getUserName, orderBaseInfoDO.getProductionDepartment()));
-        OrderEventJobVO orderEventJobVO = new OrderEventJobVO();
-        orderEventJobVO.setInspectionStageInfo(inspectionStageInfo);
-        OrderBaseInfoVO orderBaseInfoVo = BeanUtil.copyProperties(orderBaseInfoDO, OrderBaseInfoVO.class);
-        orderEventJobVO.setBaseInfo(orderBaseInfoVo);
-            List<String> emails = Arrays.asList(ProductionDepartmentUserDO.getEmail().split( "[,，]+"))
-                    .stream().map(String::trim)
-                    .collect(Collectors.toList());
-            //一旦修改完质检信息就自动发送邮件对应的生产科。多次编辑保存多次发送。
-            if (StringUtils.isNotBlank(inspectionStageInfo.getEndCheckApplyTime())) {
-                String EndCheckApplyTime= inspectionStageInfo.getEndCheckApplyTime().substring(0, 10);
-                String ProductionDepartmentConsignTime =orderBaseInfoDO.getProductionDepartmentConsignTime().substring(0, 10);
-                orderEventJobVO.getInspectionStageInfo().setEndCheckApplyTime(EndCheckApplyTime);
-                orderEventJobVO.getBaseInfo().setProductionDepartmentConsignTime(ProductionDepartmentConsignTime);
-                //尾期验货报告。
-                emailSendUtils.sendEmail(EmailTemplateEnum.END_CHECK_REPORT_TEMPLATE, emails, orderEventJobVO);
-            }else if(StringUtils.isNotBlank(inspectionStageInfo.getMidCheckApplyTime())){
-                String MidCheckApplyTime= inspectionStageInfo.getMidCheckApplyTime().substring(0, 10);
-                String ProductionDepartmentConsignTime =orderBaseInfoDO.getProductionDepartmentConsignTime().substring(0, 10);
-                String MidCheckApply = DateUtils.format(DateUtils.parseDate(MidCheckApplyTime, DATE), DATE);
-                String ProductionDepartmentConsign = DateUtils.format(DateUtils.parseDate(ProductionDepartmentConsignTime,DATE), DATE);
-                orderEventJobVO.getInspectionStageInfo().setMidCheckApplyTime(MidCheckApply);
-                orderEventJobVO.getBaseInfo().setProductionDepartmentConsignTime(ProductionDepartmentConsign);
-                //中期验货报告。
-                emailSendUtils.sendEmail(EmailTemplateEnum.MID_CHECK_REPORT_TEMPLATE, emails, orderEventJobVO);
-            }
-    }
 }
@@ -57,13 +57,13 @@ spring:
     testWhileIdle: true
     testOnBorrow: true
     testOnReturn: true
-    password: root
+    password: canrd@2024
     time-between-eviction-runs-millis: 1000
-    url: jdbc:mysql://localhost:3306/order-erp1?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&useSSL=false&autoReconnect=true&failOverReadOnly=false&maxReconnects=10&allowMultiQueries=true&useAffectedRows=true&autoReconnectForPools=true
+    url: jdbc:mysql://39.108.227.113:3307/order-erp1?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&useSSL=false&autoReconnect=true&failOverReadOnly=false&maxReconnects=10&allowMultiQueries=true&useAffectedRows=true&autoReconnectForPools=true
     username: root
   redis:
     database: 0
-    host: localhost
+    host: 39.108.227.113
     lettuce:
       pool:
         max-active: 2000
@@ -76,33 +76,21 @@ spring:
     timeout: 2000
   mail:
     # 配置 SMTP 服务器地址
-#    host: smtp.163.com
     host: smtp.mxhichina.com
-      # 发送者邮箱，已开通POP3/SMTP服务的邮箱，也就是你自己的
-    username: system@canrd.com
-      # 配置密码，注意不是真正的密码，而是刚刚申请到的授权码
-    password: Kelude2015
-      # 邮件接收者
-    mailRecipient: #邮件接收者邮箱
-      # 端口号465或587（QQ邮箱发送邮件仅支持587端口协议）
-    port: 465
-
     # 发送者邮箱，已开通POP3/SMTP服务的邮箱，也就是你自己的
-#    username: chenhang4442024@163.com
+    username: system@canrd.com
     # 配置密码，注意不是真正的密码，而是刚刚申请到的授权码
-#    password: ACHWYJSXRITHTMGA
+    password: Kelude2015
     # 邮件接收者
-#    mailRecipient: #邮件接收者邮箱
+    mailRecipient: #邮件接收者邮箱
     # 端口号465或587（QQ邮箱发送邮件仅支持587端口协议）
-#    port: 25
+    port: 587
     # 默认的邮件编码为UTF-8
     default-encoding: UTF-8
     # 配置SSL 加密工厂
     properties:
       mail:
         smtp:
-          ssl:
-            enabled: true
           socketFactoryClass: javax.net.ssl.SSLSocketFactory
         #表示开启 DEBUG 模式，这样，邮件发送过程的日志会在控制台打印出来，方便排查错误
         debug: true
@@ -76,19 +76,15 @@ spring:
     timeout: 2000
   mail:
     # 配置 SMTP 服务器地址
-#    host: xxx
-    host: smtp.163.com
+    host: xxx
     # 发送者邮箱，已开通POP3/SMTP服务的邮箱，也就是你自己的
-#    username: xxxx
-    username: chenhang4442024@163.com
+    username: xxxx
     # 配置密码，注意不是真正的密码，而是刚刚申请到的授权码
-#    password: xxx
-    password: ACHWYJSXRITHTMGA
+    password: xxx
     # 邮件接收者
     mailRecipient: #邮件接收者邮箱
     # 端口号465或587（QQ邮箱发送邮件仅支持587端口协议）
-#    port: 587
-    port: 25
+    port: 587
     # 默认的邮件编码为UTF-8
     default-encoding: UTF-8
     # 配置SSL 加密工厂
@@ -76,29 +76,25 @@ spring:
     timeout: 2000
   mail:
     # 配置 SMTP 服务器地址
-#    host: smtp.mxhichina.com
-    host: smtp.163.com
+    host: smtp.mxhichina.com
     # 发送者邮箱，已开通POP3/SMTP服务的邮箱，也就是你自己的
-    username: chenhang4442024@163.com
+    username: system@canrd.com
     # 配置密码，注意不是真正的密码，而是刚刚申请到的授权码
-    password: ACHWYJSXRITHTMGA
+    password: Kelude2015
     # 邮件接收者
     mailRecipient: #邮件接收者邮箱
     # 端口号465或587（QQ邮箱发送邮件仅支持587端口协议）
-    port: 465
+    port: 587
     # 默认的邮件编码为UTF-8
     default-encoding: UTF-8
     # 配置SSL 加密工厂
     properties:
       mail:
         smtp:
-          ssl:
-            enable: true
           socketFactoryClass: javax.net.ssl.SSLSocketFactory
         #表示开启 DEBUG 模式，这样，邮件发送过程的日志会在控制台打印出来，方便排查错误
         debug: true
-
   freemarker:
     template-loader-path: classpath:/template/
     suffix: .flt
 server:
-  port: 18000
+  port: 8000
 spring:
   profiles:
-    active: test
 \ No newline at end of file
+    active: pre-prod
 \ No newline at end of file