Merge branch 'refs/heads/v16.3_line_warn_20240528' into test

performance-web/src/main/java/com/clx/performance/service/impl/linewarn/LineWarnLoadWarnServiceImpl.java

@@ -17,6 +17,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.time.Duration;
 import java.time.LocalDateTime;
 import java.util.Arrays;
@@ -54,8 +55,9 @@ public class LineWarnLoadWarnServiceImpl implements LineWarnLoadWarnService {
         BigDecimal taskCompleteRatio = BigDecimal.ZERO;
         BigDecimal weight = orderChildDao.sumLoadWeightByOrderGoodsNo(orderGoods.getOrderGoodsNo());
         if (weight != null){
-            taskCompleteRatio = weight.divide(taskWeight, 4, BigDecimal.ROUND_UP).movePointRight(2);
+            taskCompleteRatio = weight.divide(taskWeight, 4, RoundingMode.UP).movePointRight(2);
         }
+        log.info("装车预警，任务量:{}, 完成量:{}, 任务完成率:{}, 总时间:{}, 需要时间:{}, 相差时间:{}", taskWeight, weight, taskCompleteRatio, totalTime, needTime, difTime);
 
         List<LineWarnConfig> lineWarnConfigList = lineWarnConfigDao
                 .listByWarnType(LineWarnConfigEnum.WarnType.LOAD.getCode());

performance-web/src/main/java/com/clx/performance/service/impl/linewarn/LineWarnMqHandlerServiceImpl.java

@@ -94,14 +94,14 @@ public class LineWarnMqHandlerServiceImpl implements LineWarnMqHandlerService {
                 .getOrderInfo(orderGoods.getOrderNo()).orElseThrow(ResultEnum.DATA_NOT_FIND);
 
         // 计算货源地到
-        int arriveSendExpectTime = gdUtils.getNeedTime(new BigDecimal[]{orderGoods.getSendLongitude(),
+        int arriveReceiveExpectTime = gdUtils.getNeedTime(new BigDecimal[]{orderGoods.getSendLongitude(),
                 orderGoods.getSendLatitude()}, orderGoods.getReceiveLongitude(), orderGoods.getReceiveLatitude());
 
         LineWarnOrderGoods lineWarnOrderGoods = new LineWarnOrderGoods();
         lineWarnOrderGoods.setOrderGoodsNo(orderGoods.getOrderGoodsNo());
         lineWarnOrderGoods.setTransportEndTime(LocalDateTimeUtils.parseTime(orderInfo.getTransportEndTime()));
         lineWarnOrderGoods.setPendingOrderTime(orderGoods.getPendingOrderTime());
-        lineWarnOrderGoods.setArriveReceiveExpectTime(arriveSendExpectTime==0? null : arriveSendExpectTime);
+        lineWarnOrderGoods.setArriveReceiveExpectTime(arriveReceiveExpectTime==0? null : arriveReceiveExpectTime);
         lineWarnOrderGoodsDao.saveEntity(lineWarnOrderGoods);
     }
 

performance-web/src/main/java/com/clx/performance/service/impl/linewarn/LineWarnTakeWarnServiceImpl.java

@@ -17,6 +17,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.time.Duration;
 import java.time.LocalDateTime;
 import java.util.Arrays;
@@ -56,9 +57,10 @@ public class LineWarnTakeWarnServiceImpl implements LineWarnTakeWarnService {
         BigDecimal taskCompleteRatio = BigDecimal.ZERO;
         BigDecimal weight = orderChildDao.sumTakeWeightByOrderGoodsNo(orderGoods.getOrderGoodsNo());
         if (weight != null){
-            taskCompleteRatio = weight.divide(taskWeight, 4, BigDecimal.ROUND_UP).movePointRight(2);
+            taskCompleteRatio = weight.divide(taskWeight, 4, RoundingMode.UP).movePointRight(2);
         }
 
+        log.info("接单预警，任务量:{}, 完成量:{}, 任务完成率:{}, 总时间:{}, 需要时间:{}, 相差时间:{}", taskWeight, weight, taskCompleteRatio, totalTime, needTime, difTime);
         List<LineWarnConfig> lineWarnConfigList = lineWarnConfigDao
                 .listByWarnType(LineWarnConfigEnum.WarnType.TAKE.getCode());
         if (lineWarnConfigList.isEmpty()) {return;}

performance-web/src/main/java/com/clx/performance/service/impl/linewarn/LineWarnUnloadServiceImpl.java

@@ -16,6 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.time.Duration;
 import java.time.LocalDateTime;
 import java.util.List;
@@ -49,8 +50,9 @@ public class LineWarnUnloadServiceImpl implements LineWarnUnloadWarnService {
         BigDecimal taskCompleteRatio = BigDecimal.ZERO;
         BigDecimal weight = orderChildDao.sumTakeWeightByOrderGoodsNo(orderGoods.getOrderGoodsNo());
         if (weight != null){
-            taskCompleteRatio = weight.divide(taskWeight, 4, BigDecimal.ROUND_UP).movePointRight(2);
+            taskCompleteRatio = weight.divide(taskWeight, 4, RoundingMode.UP).movePointRight(2);
         }
+        log.info("卸车预警，任务量:{}, 完成量:{}, 任务完成率:{}, 总时间:{}, 需要时间:{}, 相差时间:{}", taskWeight, weight, taskCompleteRatio, totalTime, needTime, difTime);
 
         List<LineWarnConfig> lineWarnConfigList = lineWarnConfigDao
                 .listByWarnType(LineWarnConfigEnum.WarnType.UNLOAD.getCode());

performance-web/src/main/java/com/clx/performance/sqlProvider/vehiclewarn/VehicleWarnRangeSqlProvider.java

@@ -23,8 +23,8 @@ public class VehicleWarnRangeSqlProvider {
             if (Objects.nonNull(param.getWarnRang())) {WHERE("warn_rang = #{param.warnRang}");}
 
             if (StringUtils.isNotBlank(param.getSuspendObject())) {
-                WHERE("((warn_rage=1 and child_no =#{param.suspendObject}) " +
-                        "or (warn_rage=2 and order_goods_no =#{param.suspendObject}))");}
+                WHERE("((warn_rang=1 and child_no =#{param.suspendObject}) " +
+                        "or (warn_rang=2 and order_goods_no =#{param.suspendObject}))");}
 
             if (StringUtils.isNotBlank(param.getBeginTime())) {WHERE("create_time >= #{param.beginTime}");}
             if (StringUtils.isNotBlank(param.getEndTime())) {WHERE("create_time <= #{param.endTime}");}