电子单签收数据预处理第四版优化查询

suishenbang-admin/src/main/resources/application-prod-druid.yml

@@ -13,9 +13,9 @@ spring:
             slave:
                 # 从数据源开关/默认关闭
                 enabled: false
-                url: 
-                username: 
-                password: 
+                url:
+                username:
+                password:
             # 初始连接数
             initialSize: 10
             # 最小连接池数量
@@ -35,7 +35,7 @@ spring:
             testWhileIdle: true
             testOnBorrow: false
             testOnReturn: false
-            webStatFilter: 
+            webStatFilter:
                 enabled: true
             statViewServlet:
                 enabled: true
@@ -43,15 +43,15 @@ spring:
                 allow:
                 url-pattern: /druid/*
                 # 控制台管理用户名和密码
-                login-username: 
-                login-password: 
+                login-username:
+                login-password:
             filter:
                 stat:
                     enabled: true
                     # 慢SQL记录
                     log-slow-sql: true
-                    slow-sql-millis: 5000
+                    slow-sql-millis: 30000
                     merge-sql: true
                 wall:
                     config:
-                        multi-statement-allow: true
+                        multi-statement-allow: true

suishenbang-admin/src/main/resources/application-uat-druid.yml

@@ -50,7 +50,7 @@ spring:
                     enabled: true
                     # 慢SQL记录
                     log-slow-sql: true
-                    slow-sql-millis: 5000
+                    slow-sql-millis: 30000
                     merge-sql: true
                 wall:
                     config:

suishenbang-system/src/main/java/com/dgtly/system/service/impl/MetaHanaDeliverSignServiceImpl.java

@@ -10,6 +10,8 @@ import java.util.stream.Collectors;
 import com.dgtly.system.domain.DeliverSignVO;
 import com.dgtly.system.domain.OrderSignVO;
 import com.dgtly.system.domain.TmsShipmentSignVO;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.dgtly.system.mapper.MetaHanaDeliverSignMapper;
@@ -26,6 +28,8 @@ import com.dgtly.common.core.text.Convert;
 @Service
 public class MetaHanaDeliverSignServiceImpl implements IMetaHanaDeliverSignService
 {
+    private static final Logger log = LoggerFactory.getLogger(MetaHanaDeliverSignServiceImpl.class);
+
     @Autowired
     private MetaHanaDeliverSignMapper metaHanaDeliverSignMapper;
 
@@ -105,13 +109,12 @@ public class MetaHanaDeliverSignServiceImpl implements IMetaHanaDeliverSignServi
         //先处理订单，（处理电子单签收里的订单）
         if(orderList !=null && orderList.size()>0){
             List<OrderSignVO> orderSignVOList = new ArrayList<>();
-            // 先建立运单号与对象的映射关系
+            // 先建立订单号与对象的映射关系
             Map<String, List<MetaHanaDeliverSign>> orderSignList = orderList.stream()
                     .collect(Collectors.groupingBy(MetaHanaDeliverSign::getOrderNumber));
 
-            // 遍历处理每个运单号
+            // 遍历处理每个订单
             orderSignList.forEach((orderNum, list) -> {
-                        if(orderSignVOList !=null && orderSignVOList.size()>0){
                             if(!orderSignVOList.contains(orderNum)){
                                 OrderSignVO vo = new OrderSignVO();
                                 vo.setOrderNumber(orderNum);
@@ -165,7 +168,6 @@ public class MetaHanaDeliverSignServiceImpl implements IMetaHanaDeliverSignServi
 
                                 }
                             }
-                }
             });
             if(orderSignVOList !=null && orderSignVOList.size()>0){
                 //清除表数据再批量新增
@@ -174,7 +176,7 @@ public class MetaHanaDeliverSignServiceImpl implements IMetaHanaDeliverSignServi
 
             }
         }
-
+        log.info("电子单签收：订单预处理结束++++++++++++++++++");
         //再处理运单，（处理tms运单表中的运单）
         List<DeliverSignVO> tmsShipMentList =  metaHanaDeliverSignMapper.selectDeliverSignByTmsShipmentNumber();
         if(tmsShipMentList !=null && tmsShipMentList.size()>0){
@@ -186,7 +188,6 @@ public class MetaHanaDeliverSignServiceImpl implements IMetaHanaDeliverSignServi
 
             // 遍历处理每个运单号
                         shipmentMap.forEach((shipmentNum, list) -> {
-                            if (tmsList != null && tmsList.size() > 0) {
                                 //已处理过就跳过
                                 if (!tmsList.contains(shipmentNum)) {
                                     TmsShipmentSignVO signVO = new TmsShipmentSignVO();
@@ -239,7 +240,6 @@ public class MetaHanaDeliverSignServiceImpl implements IMetaHanaDeliverSignServi
 
                                     tmsList.add(signVO);
                                 }
-                            }
                         });
                         if(tmsList !=null && tmsList.size()>0){
                             //清楚表数据再批量新增
@@ -247,6 +247,7 @@ public class MetaHanaDeliverSignServiceImpl implements IMetaHanaDeliverSignServi
                             metaHanaDeliverSignMapper.batchTmsShipmentSign(tmsList);
 
                         }
+            log.info("电子单签收：运单预处理结束++++++++++++++++++");
 
         }