Merge remote-tracking branch 'origin/33.6_app_carrier_messsage_20241106' into test_jdk17

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

@@ -224,4 +224,5 @@ public class RabbitKeyConstants {
     //发送承运端站内信routing_key
     public static final String SEND_CARRIER_INTERNAL_MESSAGE_ROUTING_KEY = "clx_performance.send.carrier.internal.message..routing.key";
 
+
 }

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

@@ -26,6 +26,7 @@ import com.scm.lms.manage.action.LmsWeighingSignatureAction;
 import com.smart.business.sdk.request.dto.WeightChildSignatureDto;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -71,6 +72,8 @@ public class OrderChildPoundAuditServiceImpl  implements OrderChildPoundAuditSer
     private final OrderService orderService;
     private final LoadAppConfig loadAppConfig;
     private final PerformanceSmartCompanyNoConfig companyNoConfig;
+    @Autowired
+    private SendInternalMessageService sendInternalMessageService;
 
     @Override
     public OrderChildPoundAuditDetailVO getPoundAuditDetail(String childNo) {
@@ -259,6 +262,17 @@ public class OrderChildPoundAuditServiceImpl  implements OrderChildPoundAuditSer
                 OrderChildLogEnum.CreateType.PLATFORM.getCode(), loginUserInfo.getUserNo(),loginUserInfo.getUserName());
 
         orderChildPostService.orderChildPoundAudit(orderChild, poundAuditDetail);
+
+        // 发送站内信
+        sendInternalMessageService.sendInternalMessageMq(InternalMessageTemplateEnum.PlatformType.DRIVER_APP.getCode(),
+                InternalMessageTemplateEnum.BusinessType.APP_SECOND_CLASSIFICATION.getCode(),
+                InternalMessageTemplateEnum.POUND_AUDIT_PASS_CODE,
+                // 跳转参数
+                null,
+                // 跳转页面
+                null,
+                // App端司机账号
+                orderChild.getDriverUserNo());
     }
 
     /***

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

@@ -292,6 +292,9 @@ public class OrderChildServiceImpl implements OrderChildService {
     @Autowired
     FeignOrderService feignOrderService;
 
+    @Autowired
+    private SendInternalMessageService sendInternalMessageService;
+
     @PostConstruct
     public void init(){
         String[] activeProfiles = environment.getActiveProfiles();
@@ -3483,6 +3486,20 @@ public class OrderChildServiceImpl implements OrderChildService {
                         log.info("{}超出货源地x公里范围了，运单{}为到达货源地状态，发送短信", truckNo, childNo);
                         sendLoadSms(child.getDriverMobile(), child.getTruckNo(), child.getChildNo());
                         redisTemplate.opsForValue().increment(RedisConstants.NOTICE_MESSAGE_LIMIT_UNLOAD + childNo);
+
+                        // 司机触发驶离货源地配置距离 APP站内信
+                        sendInternalMessageService.sendInternalMessageMq(
+                                // APP
+                                InternalMessageTemplateEnum.PlatformType.DRIVER_APP.getCode(),
+                                // 业务类型
+                                InternalMessageTemplateEnum.BusinessType.APP_SECOND_CLASSIFICATION.getCode(),
+                                // 司机触发卸货预警规则-超出货源地x公里范围
+                                InternalMessageTemplateEnum.DRIVER_TRIGGER_LEAVE_SOURCE_LOCAL_DISTANCE,
+                                // 发送内容参数
+                                null,
+                                // URL路径参数，运单号、isShowMsg==true
+                                List.of(childNo, true),
+                                child.getDriverUserNo());
                     }
                     // 已装货
                     if (Objects.equals(child.getStatus(), OrderChildEnum.Status.LOAD.getCode())) {
@@ -3795,6 +3812,8 @@ public class OrderChildServiceImpl implements OrderChildService {
         canCancelOrderChildList.forEach(orderChild-> orderChildPostService.orderChildCancelByCarrier(orderChild,
                 UserTypeEnum.CARRIER.getCode(), loginUserInfo.getUserNo(), loginUserInfo.getUserName()));
 
+        // 批量取消运单发送站内信
+        this.sendAppCarrierMessage(canCancelOrderChildList, param.getRemark());
 
         UpdateCarrierBatchCancelVO result = new UpdateCarrierBatchCancelVO();
         result.setFailChildNoList(notCancelOrderChildList.stream().map(OrderChild :: getChildNo).collect(Collectors.toList()));
@@ -3802,6 +3821,27 @@ public class OrderChildServiceImpl implements OrderChildService {
         return result;
     }
 
+    /**
+     * 批量取消运单发送站内信通知
+     */
+    private void sendAppCarrierMessage(List<OrderChild> canCancelOrderChildList, String remark) {
+        for (OrderChild child : canCancelOrderChildList) {
+            // 司机触发驶离货源地配置距离 APP站内信
+            sendInternalMessageService.sendInternalMessageMq(
+                    // APP
+                    InternalMessageTemplateEnum.PlatformType.DRIVER_APP.getCode(),
+                    // 业务类型
+                    InternalMessageTemplateEnum.BusinessType.APP_SECOND_CLASSIFICATION.getCode(),
+                    // 运单列表-填写取消原因-确认，触发消息通知
+                    InternalMessageTemplateEnum.CONFIRM_CANCEL_REASON_CODE,
+                    // 发送内容参数
+                    List.of(remark),
+                    // URL参数-运单号、true
+                    List.of(child.getChildNo(), true),
+                    child.getDriverUserNo());
+        }
+    }
+
 
     private void batchUpdateOrderGoodsWeightReturn(List<OrderChild> canCancelOrderChildList) {
         //按照货单分组，每个货单下取消的运单个数map

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

@@ -188,6 +188,20 @@ public class BreakContractDriverRecordServiceImpl  implements BreakContractDrive
         sendInternalMessageService.sendInternalMessageMq(InternalMessageTemplateEnum.PlatformType.CARRIER.getCode(),
                 InternalMessageTemplateEnum.BusinessType.WAIT_APPROVED_ITEM.getCode(),
                 InternalMessageTemplateEnum.CUSTOM_DRIVER_TRIGGER_BREAK_CONTRACT_CODE, List.of(record.getBreakNo()),null,null);
+
+        // 司机违约通知APP站内信
+        sendInternalMessageService.sendInternalMessageMq(
+                // APP
+                InternalMessageTemplateEnum.PlatformType.DRIVER_APP.getCode(),
+                // 业务类型
+                InternalMessageTemplateEnum.BusinessType.APP_SECOND_CLASSIFICATION.getCode(),
+                // 司机违约规则配置-司机取消
+                InternalMessageTemplateEnum.DRIVER_CANCEL_ORDER_CODE,
+                // 运单编号、接单时间小于X小时、收费X元
+                List.of(orderChild.getChildNo(), breakContractDriverRuleVO.getDriverCancelRule().getBaseTime(),
+                        breakContractDriverRuleVO.getDriverCancelRule().getBaseFigure()),
+                null,
+                orderChild.getDriverUserNo());
     }
 
     @Override
@@ -235,6 +249,19 @@ public class BreakContractDriverRecordServiceImpl  implements BreakContractDrive
                 InternalMessageTemplateEnum.BusinessType.WAIT_APPROVED_ITEM.getCode(),
                 InternalMessageTemplateEnum.CUSTOM_DRIVER_TRIGGER_BREAK_CONTRACT_CODE, List.of(record.getBreakNo()),null,null);
 
+        // 司机违约通知APP站内信
+        sendInternalMessageService.sendInternalMessageMq(
+                // APP
+                InternalMessageTemplateEnum.PlatformType.DRIVER_APP.getCode(),
+                // 业务类型
+                InternalMessageTemplateEnum.BusinessType.APP_SECOND_CLASSIFICATION.getCode(),
+                // 未按约定时间到达货源地
+                InternalMessageTemplateEnum.DRIVER_ARRIVE_SOURCE_LOCAL_TIMEOUT_CODE,
+                // 运单编号、收费X元
+                List.of(orderChild.getChildNo(), breakContractDriverRuleVO.getDriverCancelRule().getBaseFigure()),
+                null,
+                orderChild.getDriverUserNo());
+
     }
 
     @Override
@@ -278,6 +305,19 @@ public class BreakContractDriverRecordServiceImpl  implements BreakContractDrive
         sendInternalMessageService.sendInternalMessageMq(InternalMessageTemplateEnum.PlatformType.CARRIER.getCode(),
                 InternalMessageTemplateEnum.BusinessType.WAIT_APPROVED_ITEM.getCode(),
                 InternalMessageTemplateEnum.CUSTOM_DRIVER_TRIGGER_BREAK_CONTRACT_CODE, List.of(record.getBreakNo()),null,null);
+
+        // 司机违约通知APP站内信
+        sendInternalMessageService.sendInternalMessageMq(
+                // APP
+                InternalMessageTemplateEnum.PlatformType.DRIVER_APP.getCode(),
+                // 业务类型
+                InternalMessageTemplateEnum.BusinessType.APP_SECOND_CLASSIFICATION.getCode(),
+                // 未按约定时间到达目的地（到达目的地超时）
+                InternalMessageTemplateEnum.DRIVER_ARRIVE_DESTINATION_TIMEOUT_CODE,
+                // 运单编号、收费X元
+                List.of(orderChild.getChildNo(), breakContractDriverRuleVO.getDriverCancelRule().getBaseFigure()),
+                null,
+                orderChild.getDriverUserNo());
     }
 
     @Override

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

@@ -2,12 +2,14 @@ package com.clx.performance.service.impl.vehiclewarn;
 
 import com.clx.performance.dao.vehiclewarn.VehicleWarnConfigDao;
 import com.clx.performance.dao.vehiclewarn.VehicleWarnInfoDao;
+import com.clx.performance.enums.InternalMessageTemplateEnum;
 import com.clx.performance.enums.vehiclewarn.VehicleWarnConfigEnum;
 import com.clx.performance.enums.vehiclewarn.VehicleWarnInfoEnum;
 import com.clx.performance.model.OrderChild;
 import com.clx.performance.model.vehiclewarn.VehicleWarnChild;
 import com.clx.performance.model.vehiclewarn.VehicleWarnConfig;
 import com.clx.performance.model.vehiclewarn.VehicleWarnInfo;
+import com.clx.performance.service.SendInternalMessageService;
 import com.clx.performance.service.vehiclewarn.VehicleWarnCommonService;
 import com.clx.performance.service.vehiclewarn.VehicleWarnLoadAndUnloadWarnService;
 import lombok.extern.slf4j.Slf4j;
@@ -31,6 +33,8 @@ public class VehicleWarnLoadAndUnloadWarnServiceImpl implements VehicleWarnLoadA
     private VehicleWarnInfoDao vehicleWarnInfoDao;
     @Autowired
     private VehicleWarnCommonService vehicleWarnCommonService;
+    @Autowired
+    private SendInternalMessageService sendInternalMessageService;
 
     /**
      * 装车超时
@@ -69,6 +73,19 @@ public class VehicleWarnLoadAndUnloadWarnServiceImpl implements VehicleWarnLoadA
         // 更新
         vehicleWarnCommonService.vehicleWarnInfoUpdate(orderChild, vehicleWarnInfo, vehicleWarnConfig);
 
+        // 司机触发运单预警规则，系统通知给司机，APP站内信
+        sendInternalMessageService.sendInternalMessageMq(
+                // APP
+                InternalMessageTemplateEnum.PlatformType.DRIVER_APP.getCode(),
+                // 业务类型
+                InternalMessageTemplateEnum.BusinessType.APP_SECOND_CLASSIFICATION.getCode(),
+                // 司机触发运单预警规则-装车超时
+                InternalMessageTemplateEnum.DRIVER_TRIGGER_UPLOAD_TIMEOUT,
+                // 运单编号、前往目的地超时时间
+                List.of(orderChild.getChildNo(), time),
+                null,
+                orderChild.getDriverUserNo());
+
     }
 
     /**
@@ -107,6 +124,20 @@ public class VehicleWarnLoadAndUnloadWarnServiceImpl implements VehicleWarnLoadA
 
         // 更新
         vehicleWarnCommonService.vehicleWarnInfoUpdate(orderChild, vehicleWarnInfo, vehicleWarnConfig);
+
+        // 司机触发运单预警规则，系统通知给司机，APP站内信
+        sendInternalMessageService.sendInternalMessageMq(
+                // APP
+                InternalMessageTemplateEnum.PlatformType.DRIVER_APP.getCode(),
+                // 业务类型
+                InternalMessageTemplateEnum.BusinessType.APP_SECOND_CLASSIFICATION.getCode(),
+                // 司机触发运单预警规则-卸车超时
+                InternalMessageTemplateEnum.DRIVER_TRIGGER_DOWNLOAD_TIMEOUT,
+                // 运单编号、前往目的地超时时间
+                List.of(orderChild.getChildNo(), time),
+                null,
+                orderChild.getDriverUserNo());
+
     }
 
 }

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

@@ -3,6 +3,7 @@ package com.clx.performance.service.impl.vehiclewarn;
 import com.clx.performance.dao.vehiclewarn.VehicleWarnConfigDao;
 import com.clx.performance.dao.vehiclewarn.VehicleWarnInfoDao;
 import com.clx.performance.dto.vehiclewarn.VehicleWarnCommonInfoDTO;
+import com.clx.performance.enums.InternalMessageTemplateEnum;
 import com.clx.performance.enums.OrderChildEnum;
 import com.clx.performance.enums.vehiclewarn.VehicleWarnConfigEnum;
 import com.clx.performance.enums.vehiclewarn.VehicleWarnInfoEnum;
@@ -10,6 +11,7 @@ import com.clx.performance.model.OrderChild;
 import com.clx.performance.model.vehiclewarn.VehicleWarnChild;
 import com.clx.performance.model.vehiclewarn.VehicleWarnConfig;
 import com.clx.performance.model.vehiclewarn.VehicleWarnInfo;
+import com.clx.performance.service.SendInternalMessageService;
 import com.clx.performance.service.trace.TruckTraceService;
 import com.clx.performance.service.vehiclewarn.VehicleWarnCommonService;
 import com.clx.performance.service.vehiclewarn.VehicleWarnParkWarnService;
@@ -39,6 +41,9 @@ public class VehicleWarnParkWarnServiceImpl implements VehicleWarnParkWarnServic
     @Autowired
     private VehicleWarnCommonService vehicleWarnCommonService;
 
+    @Autowired
+    private SendInternalMessageService sendInternalMessageService;
+
     /**
      * 停留超时
      */
@@ -89,6 +94,19 @@ public class VehicleWarnParkWarnServiceImpl implements VehicleWarnParkWarnServic
         // 更新
         vehicleWarnCommonService.vehicleWarnInfoUpdate(orderChild, vehicleWarnInfo, vehicleWarnConfig);
 
+        // 司机触发运单预警规则，系统通知给司机，APP站内信
+        sendInternalMessageService.sendInternalMessageMq(
+                // APP
+                InternalMessageTemplateEnum.PlatformType.DRIVER_APP.getCode(),
+                // 业务类型
+                InternalMessageTemplateEnum.BusinessType.APP_SECOND_CLASSIFICATION.getCode(),
+                // 司机触发运单预警规则-停留超时
+                InternalMessageTemplateEnum.DRIVER_TRIGGER_STAY_TIMEOUT,
+                // 运单编号、停留时间
+                List.of(orderChild.getChildNo(), parkTime),
+                null,
+                orderChild.getDriverUserNo());
+
     }
 
     @Override

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

@@ -3,6 +3,7 @@ package com.clx.performance.service.impl.vehiclewarn;
 import com.clx.performance.dao.vehiclewarn.VehicleWarnConfigDao;
 import com.clx.performance.dao.vehiclewarn.VehicleWarnInfoDao;
 import com.clx.performance.dto.vehiclewarn.VehicleWarnCommonInfoDTO;
+import com.clx.performance.enums.InternalMessageTemplateEnum;
 import com.clx.performance.enums.OrderChildEnum;
 import com.clx.performance.enums.vehiclewarn.VehicleWarnConfigEnum;
 import com.clx.performance.enums.vehiclewarn.VehicleWarnInfoEnum;
@@ -10,6 +11,7 @@ import com.clx.performance.model.OrderChild;
 import com.clx.performance.model.vehiclewarn.VehicleWarnChild;
 import com.clx.performance.model.vehiclewarn.VehicleWarnConfig;
 import com.clx.performance.model.vehiclewarn.VehicleWarnInfo;
+import com.clx.performance.service.SendInternalMessageService;
 import com.clx.performance.service.vehiclewarn.VehicleWarnCommonService;
 import com.clx.performance.service.vehiclewarn.VehicleWarnReceiveAddressWarnService;
 import lombok.extern.slf4j.Slf4j;
@@ -34,6 +36,8 @@ public class VehicleWarnReceiveAddressWarnServiceImpl implements VehicleWarnRece
     private VehicleWarnInfoDao vehicleWarnInfoDao;
     @Autowired
     private VehicleWarnCommonService vehicleWarnCommonService;
+    @Autowired
+    private SendInternalMessageService sendInternalMessageService;
 
     /**
      * 前往目的地超时
@@ -90,6 +94,19 @@ public class VehicleWarnReceiveAddressWarnServiceImpl implements VehicleWarnRece
 
         // 更新
         vehicleWarnCommonService.vehicleWarnInfoUpdate(orderChild, vehicleWarnInfo, vehicleWarnConfig);
+
+        // 司机触发运单预警规则，系统通知给司机，APP站内信
+        sendInternalMessageService.sendInternalMessageMq(
+                // APP
+                InternalMessageTemplateEnum.PlatformType.DRIVER_APP.getCode(),
+                // 业务类型
+                InternalMessageTemplateEnum.BusinessType.APP_SECOND_CLASSIFICATION.getCode(),
+                // 司机触发运单预警规则-前往目的地超时
+                InternalMessageTemplateEnum.DRIVER_TRIGGER_GO_DESTINATION_TIMEOUT,
+                // 运单编号、前往目的地超时时间
+                List.of(orderChild.getChildNo(), needTime),
+                null,
+                orderChild.getDriverUserNo());
     }
 
     /**
@@ -140,6 +157,19 @@ public class VehicleWarnReceiveAddressWarnServiceImpl implements VehicleWarnRece
 
         // 更新
         vehicleWarnCommonService.vehicleWarnInfoUpdate(orderChild, vehicleWarnInfo, vehicleWarnConfig);
+
+        // 司机触发运单预警规则，系统通知给司机，APP站内信
+        sendInternalMessageService.sendInternalMessageMq(
+                // APP
+                InternalMessageTemplateEnum.PlatformType.DRIVER_APP.getCode(),
+                // 业务类型
+                InternalMessageTemplateEnum.BusinessType.APP_SECOND_CLASSIFICATION.getCode(),
+                // 司机触发运单预警规则-到达目的地超时
+                InternalMessageTemplateEnum.DRIVER_TRIGGER_ARRIVE_DESTINATION_DELAY,
+                // 运单编号、前往目的地超时时间
+                List.of(orderChild.getChildNo()),
+                null,
+                orderChild.getDriverUserNo());
     }
 
 }

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

@@ -3,12 +3,14 @@ package com.clx.performance.service.impl.vehiclewarn;
 import com.clx.performance.dao.vehiclewarn.VehicleWarnConfigDao;
 import com.clx.performance.dao.vehiclewarn.VehicleWarnInfoDao;
 import com.clx.performance.dto.vehiclewarn.VehicleWarnCommonInfoDTO;
+import com.clx.performance.enums.InternalMessageTemplateEnum;
 import com.clx.performance.enums.vehiclewarn.VehicleWarnConfigEnum;
 import com.clx.performance.enums.vehiclewarn.VehicleWarnInfoEnum;
 import com.clx.performance.model.OrderChild;
 import com.clx.performance.model.vehiclewarn.VehicleWarnChild;
 import com.clx.performance.model.vehiclewarn.VehicleWarnConfig;
 import com.clx.performance.model.vehiclewarn.VehicleWarnInfo;
+import com.clx.performance.service.SendInternalMessageService;
 import com.clx.performance.service.vehiclewarn.VehicleWarnCommonService;
 import com.clx.performance.service.vehiclewarn.VehicleWarnSendAddressWarnService;
 import lombok.extern.slf4j.Slf4j;
@@ -32,6 +34,8 @@ public class VehicleWarnSendAddressWarnServiceImpl implements VehicleWarnSendAdd
     private VehicleWarnInfoDao vehicleWarnInfoDao;
     @Autowired
     private VehicleWarnCommonService vehicleWarnCommonService;
+    @Autowired
+    private SendInternalMessageService sendInternalMessageService;
 
     /**
      * 前往货源地超时
@@ -81,6 +85,19 @@ public class VehicleWarnSendAddressWarnServiceImpl implements VehicleWarnSendAdd
         // 更新
         vehicleWarnCommonService.vehicleWarnInfoUpdate(orderChild, vehicleWarnInfo, vehicleWarnConfig);
 
+        // 司机触发运单预警规则，系统通知给司机，APP站内信
+        sendInternalMessageService.sendInternalMessageMq(
+                // APP
+                InternalMessageTemplateEnum.PlatformType.DRIVER_APP.getCode(),
+                // 业务类型
+                InternalMessageTemplateEnum.BusinessType.APP_SECOND_CLASSIFICATION.getCode(),
+                // 司机触发运单预警规则-前往货源地超时
+                InternalMessageTemplateEnum.DRIVER_TRIGGER_GO_SOURCE_LOCAL_TIMEOUT,
+                // 运单编号、货源地超时时间
+                List.of(orderChild.getChildNo(), needTime),
+                null,
+                orderChild.getDriverUserNo());
+
     }
 
     /**
@@ -127,6 +144,19 @@ public class VehicleWarnSendAddressWarnServiceImpl implements VehicleWarnSendAdd
         // 更新
         vehicleWarnCommonService.vehicleWarnInfoUpdate(orderChild, vehicleWarnInfo, vehicleWarnConfig);
 
+        // 司机触发运单预警规则，系统通知给司机，到达货源地延误
+        sendInternalMessageService.sendInternalMessageMq(
+                // APP
+                InternalMessageTemplateEnum.PlatformType.DRIVER_APP.getCode(),
+                // 业务类型
+                InternalMessageTemplateEnum.BusinessType.APP_SECOND_CLASSIFICATION.getCode(),
+                // 司机触发运单预警规则-到达货源地超时
+                InternalMessageTemplateEnum.DRIVER_ARRIVE_SOURCE_LOCAL_DELAY_CODE,
+                // 运单编号
+                List.of(orderChild.getChildNo()),
+                null,
+                orderChild.getDriverUserNo());
+
     }
 
 }