Merge branch 'v21.1_jianzhuang_20240807' into test

performance-web/src/main/java/com/clx/performance/constant/RedisConstants.java

@@ -48,4 +48,13 @@ public class RedisConstants {
      */
     public static final String ORDER_LAST_TRUCK_CHILD = "clx-performance:order:last:truck:child:";
 
+    /**
+     * 电子围栏短信通知 未装车
+     */
+    public static final String NOTICE_MESSAGE_LIMIT_UNLOAD = "clx-performance:notice_message_limit_unload:";
+    /**
+     * 电子围栏短信通知 未监装
+     */
+    public static final String NOTICE_MESSAGE_LIMIT_UNSUPERVISED = "clx-performance:notice_message_limit_unsupervised:";
+
 }

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

@@ -1789,7 +1789,6 @@ public class OrderChildServiceImpl implements OrderChildService {
     }
 
     /**
-     * todo 要改成两个
      * 获取监装
      * @param orderNo
      * @param childNo
@@ -1815,7 +1814,6 @@ public class OrderChildServiceImpl implements OrderChildService {
         if (Objects.isNull(supervisionLoadInfo)) {//有监装信息
             return null;
         }
-        //通过运单号查询监装监卸子任务状态
         return new SuperviseInfo(supervisionLoadInfo.getTaskContracts(), supervisionLoadInfo.getTaskMobile(), supervisionLoadInfo.getTaskAddress());
     }
 
@@ -1825,7 +1823,7 @@ public class OrderChildServiceImpl implements OrderChildService {
      * @param childNo
      * @return
      */
-    private SuperviseInfo getSuperviseInfoWithSubStatus(String orderNo, String childNo) {
+    private SuperviseInfo getSuperviseInfoWithSubStatus(String orderNo, String childNo, String truckNo) {
         NeedAlertSuperviseInfoResultVO result = new NeedAlertSuperviseInfoResultVO();
         App app = appConfig.getPurchaseManageApp();//对接马上来供应链配置信息
         //组装配置信息
@@ -1853,10 +1851,15 @@ public class OrderChildServiceImpl implements OrderChildService {
         if (!supervisionLoadTruckInfoDto.succeed()) {//接口调用失败
             return null;
         }
+        //监装子任务状态
         SupervisionLoadTruckInfoDto supervisionLoadTruckInfo = supervisionLoadTruckInfoDto.getData();
         if (Objects.isNull(supervisionLoadTruckInfo) || !supervisionLoadTruckInfo.getLoadStatus()) {
             return null;
         }
+        //判断当前卡车是否是监装车辆
+        if (!Objects.equals(truckNo, supervisionLoadTruckInfo.getTruckNo())) {
+            return null;
+        }
         return new SuperviseInfo(supervisionLoadInfo.getTaskContracts(), supervisionLoadInfo.getTaskMobile(), supervisionLoadInfo.getTaskAddress());
     }
 
@@ -3287,8 +3290,8 @@ public class OrderChildServiceImpl implements OrderChildService {
                 truckLatitudeY = truckTraceDTO.getLocation()[1];
             }
             if (truckLongitudeX == null || truckLatitudeY == null) {
-                BigDecimal[] location = truckTraceService.getTruckCurrentPosition(truckNo);
-                log.info("运单号:{}，卡车:{}，卡车经纬度:{}", childNo, truckNo, location);
+                BigDecimal[] location = truckTraceService.getCurrentPosition(truckNo, driverUserNo);
+                log.info("运单号:{}，卡车:{}，卡车/司机经纬度:{}", childNo, truckNo, location);
                 if (location != null && location.length >= 2) {
                     truckLongitudeX = location[0];
                     truckLatitudeY = location[1];
@@ -3300,10 +3303,10 @@ public class OrderChildServiceImpl implements OrderChildService {
             BigDecimal siteLongitudeX = orderGoods.getSendLongitude();
             BigDecimal siteLatitudeY = orderGoods.getSendLatitude();
             log.info("运单号：{}，卡车:{}，status:{}，站点经度：{},站点纬度：{},卡车经度：{},卡车纬度：{}", childNo, truckNo, child.getStatus(), siteLongitudeX, siteLatitudeY, truckLongitudeX, truckLatitudeY);
-            //调高德获取距离
             if (Objects.isNull(truckLongitudeX) || Objects.isNull(truckLatitudeY)) {
                 continue;
             }
+            //调高德获取距离
             Integer distance = getGdRoute(truckNo, truckLongitudeX, truckLatitudeY, siteLongitudeX,
                     siteLatitudeY);
             if (distance == null) {
@@ -3319,16 +3322,28 @@ public class OrderChildServiceImpl implements OrderChildService {
                     //超出货源地x公里范围了,且通知状态为未通知
                     // 到达货源地
                     if (Objects.equals(child.getStatus(), OrderChildEnum.Status.ARRIVE_SEND.getCode())) {
+                        Integer count = (Integer) redisTemplate.opsForValue().get(RedisConstants.NOTICE_MESSAGE_LIMIT_UNLOAD + childNo);
+                        if (count != null && count > 3) {
+                            log.info("{}超出货源地x公里范围了，运单{}为到达货源地状态，运单已发送短信次数:{}，不进行短信通知", truckNo, childNo, count);
+                            continue;
+                        }
                         log.info("{}超出货源地x公里范围了，运单{}为到达货源地状态，发送短信", truckNo, childNo);
                         sendLoadSms(child.getDriverMobile(), child.getTruckNo(), child.getChildNo());
+                        redisTemplate.opsForValue().increment(RedisConstants.NOTICE_MESSAGE_LIMIT_UNLOAD + childNo);
                     }
                     // 已装货
                     if (Objects.equals(child.getStatus(), OrderChildEnum.Status.LOAD.getCode())) {
-                        SuperviseInfo superviseInfo = getSuperviseInfoWithSubStatus(child.getOrderNo(), child.getChildNo());
+                        SuperviseInfo superviseInfo = getSuperviseInfoWithSubStatus(child.getOrderNo(), child.getChildNo(), child.getTruckNo());
                         log.info("运单号：{}，卡车:{}，监装信息{}", childNo, truckNo, superviseInfo);
                         if (superviseInfo != null) {
+                            Integer count = (Integer) redisTemplate.opsForValue().get(RedisConstants.NOTICE_MESSAGE_LIMIT_UNSUPERVISED + childNo);
+                            if (count != null && count > 3) {
+                                log.info("{}超出货源地x公里范围了，运单{}为装货成功状态，运单已发送短信次数:{}，不进行短信通知", truckNo, childNo, count);
+                                continue;
+                            }
                             log.info("{}超出货源地x公里范围了，运单{}为装货成功状态，发送短信", truckNo, childNo);
                             sendSupervisionSms(child.getDriverMobile(), child.getTruckNo(), child.getChildNo(), superviseInfo.getTaskAddress());
+                            redisTemplate.opsForValue().increment(RedisConstants.NOTICE_MESSAGE_LIMIT_UNSUPERVISED + childNo);
                         }
                     }
                     // 修改 通知状态 为已通知

performance-web/src/main/java/com/clx/performance/sqlProvider/OrderChildSqlProvider.java

@@ -16,8 +16,6 @@ import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.jdbc.SQL;
 
 import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
 import java.util.StringJoiner;
@@ -181,40 +179,34 @@ public class OrderChildSqlProvider {
         return sql;
     }
 
-    public String findArtificialCancelOrder(@Param("param") ArtificialCancelOrderQueryParam param) {
-        //todo jiangwujie 改成 new SQL()形式
-        StringBuilder sql = new StringBuilder();
-        sql.append("SELECT child_no, goods_name, freight_price, order_no, ");
-        sql.append("send_address, receive_address, ");
-        sql.append("driver_user_no, driver_name, driver_mobile, ");
-        sql.append("truck_no, unload_pound_no, weight, ");
-        sql.append("cancel_remark, pound_status, status, ");
-        sql.append("DATE_FORMAT(load_deadline, '%Y-%m-%d %H:%i:%s') AS loadDeadline, ");
-        sql.append("DATE_FORMAT(create_time, '%Y-%m-%d %H:%i:%s') AS createTime, ");
-        sql.append("DATE_FORMAT(unload_time, '%Y-%m-%d %H:%i:%s') AS unloadTime ");
-        sql.append("FROM order_child ");
-        sql.append("WHERE 1=1 ");
-
-        List<String> conditions = new ArrayList<>();
-        if (StringUtils.isNotBlank(param.getOrderChildNo())) {
-            conditions.add("child_no = #{param.orderChildNo}");
-        }
-        if (StringUtils.isNotBlank(param.getTruckNo())) {
-            conditions.add("truck_no = #{param.truckNo}");
-        }
-        //todo :jiangwujie 支付状态 可以忽略 ，还是使用<= >=
-        List<Integer> statuses = Arrays.asList(
-                OrderChildEnum.Status.CREATED.getCode(),
-                OrderChildEnum.Status.GO_TO_SEND.getCode(),
-                OrderChildEnum.Status.ARRIVE_SEND.getCode(),
-                OrderChildEnum.Status.LOAD.getCode(),
-                OrderChildEnum.Status.GO_TO_RECEIVE.getCode(),
-                OrderChildEnum.Status.ARRIVE_RECEIVE.getCode()
-        );
-        conditions.add("status IN (" + StringUtils.join(statuses, ", ") + ")");
-        sql.append("AND ");
-        sql.append(StringUtils.join(conditions, " AND "));
-        return sql.toString();
+    public String findArtificialCancelOrder(ArtificialCancelOrderQueryParam param) {
+        return new SQL() {{
+            SELECT("child_no, goods_name, freight_price, order_no, " +
+                    "send_address, receive_address, " +
+                    "driver_user_no, driver_name, driver_mobile, " +
+                    "truck_no, unload_pound_no, weight, " +
+                    "cancel_remark, pound_status, status, " +
+                    "DATE_FORMAT(load_deadline, '%Y-%m-%d %H:%i:%s') AS loadDeadline, " +
+                    "DATE_FORMAT(create_time, '%Y-%m-%d %H:%i:%s') AS createTime, " +
+                    "DATE_FORMAT(unload_time, '%Y-%m-%d %H:%i:%s') AS unloadTime ");
+            FROM("order_child ");
+            if (StringUtils.isNotBlank(param.getOrderChildNo())) {
+                WHERE("child_no = #{param.orderChildNo,jdbcType=VARCHAR}");
+            }
+            if (StringUtils.isNotBlank(param.getTruckNo())) {
+                WHERE("truck_no = #{param.truckNo,jdbcType=VARCHAR}");
+            }
+            //支付状态 可以忽略
+            WHERE("status >=" + OrderChildEnum.Status.CREATED.getCode());
+            WHERE("status <=" + OrderChildEnum.Status.ARRIVE_RECEIVE.getCode());
+        }}.toString();
+    }
+
+    public static void main(String[] args) {
+        ArtificialCancelOrderQueryParam param = new ArtificialCancelOrderQueryParam();
+        param.setTruckNo("A123456");
+        param.setOrderChildNo("CYD1234567890");
+        System.out.println(new OrderChildSqlProvider().findArtificialCancelOrder(param));
     }
 
     public String orderChildCancelRecord(@Param("page") Page<OrderChildVO> page, @Param("param") OrderChildCancelRecordParam param) {