Merge remote-tracking branch 'origin/v29.3_carrier_messsage_20241016' into dev_jdk17

clx-performance-web/src/main/java/com/clx/performance/controller/temp/TempInternalMessageController.java

@@ -55,7 +55,7 @@ public class TempInternalMessageController {
            ) {
         sendInternalMessageService.sendInternalMessageMq(InternalMessageTemplateEnum.PlatformType.CARRIER.getCode(),
                 businessType, typeCode, JSON.parseObject(listJson, new TypeReference<>() {
-                }),null);
+                }),null,null);
         return Result.ok();
 
     }

clx-performance-web/src/main/java/com/clx/performance/service/SendInternalMessageService.java

@@ -7,7 +7,7 @@ import java.util.List;
 public interface SendInternalMessageService {
     //发送站内信的业务Code
 
-    void sendInternalMessageMq(String productCode,String businessType, Integer typeCode, List<String> variableList, Long userNo);
+    void sendInternalMessageMq(String productCode,String businessType, Integer typeCode, List<String> variableList, List<String> jumpUrlVariableList, Long userNo);
 
     //发送承运站内信
     void sendCarrierInternalMessage(InternalMessageParam internalMessageDTO);

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

@@ -61,7 +61,7 @@ public class CustomerComplaintDetailServiceImpl implements CustomerComplaintDeta
         //客户投诉 站内信
         sendInternalMessageService.sendInternalMessageMq(InternalMessageTemplateEnum.PlatformType.CARRIER.getCode(),
                 InternalMessageTemplateEnum.BusinessType.COMPLAINT_NOTICE.getCode(),
-                InternalMessageTemplateEnum.CUSTOM_DRIVER_SUBMIT_COMPLAINT_CODE, List.of(param.getChildNo(),type.getName(),param.getContent()),null);
+                InternalMessageTemplateEnum.CUSTOM_DRIVER_SUBMIT_COMPLAINT_CODE, List.of(param.getChildNo(),type.getName(),param.getContent()),null,null);
 
     }
 

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

@@ -59,11 +59,12 @@ public class SendInternalMessageServiceImpl implements SendInternalMessageServic
     //发送站内信的业务Code
 
     @Override
-    public void sendInternalMessageMq(String productCode,String businessType, Integer typeCode, List<String> variableList, Long userNo){
+    public void sendInternalMessageMq(String productCode,String businessType, Integer typeCode, List<String> variableList, List<String> jumpUrlVariableList,Long userNo){
         InternalMessageParam param = new InternalMessageParam();
         param.setBusinessType(businessType);
         param.setTypeCode(typeCode);
         param.setVariableList(variableList);
+        param.setJumpUrlVariableList(jumpUrlVariableList);
         param.setUserNo(userNo);
         param.setProductCode(productCode);
         log.info("发送站内信消息开始,站内信业务类型{}，实际业务Code：{},消息内容:{}", businessType,typeCode,JSON.toJSONString(param));
@@ -163,9 +164,11 @@ public class SendInternalMessageServiceImpl implements SendInternalMessageServic
 
         }
         if(StringUtils.isNotBlank(templateType.getBusinessDetailType().getParamJson())){
-            data.putAll(JSON.parseObject(templateType.getBusinessDetailType().getParamJson(),new TypeReference<Map<String, String>>(){}));
+            String jumpUrlParamJson = replaceContent(templateType.getBusinessDetailType().getParamJson(),
+                    internalMessageDTO.getJumpUrlVariableList());
+            data.putAll(JSON.parseObject(jumpUrlParamJson,new TypeReference<Map<String, String>>(){}));
         }
-        defaultMessageContent.setData(data);   //放入标识，让前端根据这个标识跳转页面
+        defaultMessageContent.setData(data);
 
 
         message.setMessageContent(defaultMessageContent);

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

@@ -119,7 +119,7 @@ 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(breakNo),null);
+                InternalMessageTemplateEnum.CUSTOM_DRIVER_TRIGGER_BREAK_CONTRACT_CODE, List.of(breakNo),null,null);
 
 
     }
@@ -187,7 +187,7 @@ 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);
+                InternalMessageTemplateEnum.CUSTOM_DRIVER_TRIGGER_BREAK_CONTRACT_CODE, List.of(record.getBreakNo()),null,null);
     }
 
     @Override
@@ -233,7 +233,7 @@ 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);
+                InternalMessageTemplateEnum.CUSTOM_DRIVER_TRIGGER_BREAK_CONTRACT_CODE, List.of(record.getBreakNo()),null,null);
 
     }
 
@@ -277,7 +277,7 @@ 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);
+                InternalMessageTemplateEnum.CUSTOM_DRIVER_TRIGGER_BREAK_CONTRACT_CODE, List.of(record.getBreakNo()),null,null);
     }
 
     @Override

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

@@ -126,7 +126,7 @@ public class BreakContractOwnerRecordServiceImpl  implements BreakContractOwnerR
         //货主违约通知 站内信
         sendInternalMessageService.sendInternalMessageMq(InternalMessageTemplateEnum.PlatformType.CARRIER.getCode(),
                 InternalMessageTemplateEnum.BusinessType.WAIT_APPROVED_ITEM.getCode(),
-                InternalMessageTemplateEnum.CUSTOM_OWNER_TRIGGER_BREAK_CONTRACT_CODE, List.of(breakNo),null);
+                InternalMessageTemplateEnum.CUSTOM_OWNER_TRIGGER_BREAK_CONTRACT_CODE, List.of(breakNo),null,null);
 
     }
 
@@ -199,7 +199,7 @@ public class BreakContractOwnerRecordServiceImpl  implements BreakContractOwnerR
         //货主违约通知 站内信
         sendInternalMessageService.sendInternalMessageMq(InternalMessageTemplateEnum.PlatformType.CARRIER.getCode(),
                 InternalMessageTemplateEnum.BusinessType.WAIT_APPROVED_ITEM.getCode(),
-                InternalMessageTemplateEnum.CUSTOM_OWNER_TRIGGER_BREAK_CONTRACT_CODE, List.of(breakNo),null);
+                InternalMessageTemplateEnum.CUSTOM_OWNER_TRIGGER_BREAK_CONTRACT_CODE, List.of(breakNo),null,null);
 
     }
 

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.dao.OrderChildDao;
 import com.clx.performance.dao.OrderGoodsDao;
 import com.clx.performance.dao.collect.CollectLineReportDao;
+import com.clx.performance.enums.InternalMessageTemplateEnum;
 import com.clx.performance.enums.PerformanceResultEnum;
 import com.clx.performance.enums.integral.IntegralRecordEnum;
 import com.clx.performance.model.OrderChild;
@@ -13,6 +14,7 @@ import com.clx.performance.model.collect.CollectLineReport;
 import com.clx.performance.param.app.collect.*;
 import com.clx.performance.param.pc.carrier.*;
 import com.clx.performance.service.IntegralRecordService;
+import com.clx.performance.service.SendInternalMessageService;
 import com.clx.performance.service.collect.CollectLineReportService;
 import com.clx.performance.service.integral.IntegralRuleService;
 import com.clx.performance.struct.collect.CollectLineReportStruct;
@@ -26,6 +28,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
+import java.util.List;
 import java.util.Objects;
 
 @Slf4j
@@ -45,6 +48,8 @@ public class CollectLineReportServiceImpl implements CollectLineReportService {
     private IntegralRuleService integralRuleService;
     @Autowired
     private IntegralRecordService integralRecordService;
+    @Autowired
+    SendInternalMessageService sendInternalMessageService;
 
     @Transactional(rollbackFor = Exception.class)
     @Override
@@ -83,12 +88,17 @@ public class CollectLineReportServiceImpl implements CollectLineReportService {
         collectLineReport.setReportTime(LocalDateTime.now());
         collectLineReport.setCreateTime(collectLineReport.getReportTime());
         collectLineReportDao.saveEntity(collectLineReport);
+
+        //待审核：司机货源地信息上报  站内信
+        sendInternalMessageService.sendInternalMessageMq(InternalMessageTemplateEnum.PlatformType.CARRIER.getCode(),
+                InternalMessageTemplateEnum.BusinessType.DRIVER_REPORT.getCode(),
+                InternalMessageTemplateEnum.CUSTOM_DRIVER_REPORT_SEND_INFO_CODE, List.of(loginUserInfo.getUserName()),null,null);
     }
 
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void saveAbnormalReport(CollectLineReportAbnormalSaveParam param) {
-
+        UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
         if (Objects.equals(param.getReportType(), CollectLineReport.ReportType.UNABLE_TO_SEND_ADDRESS.getCode())){
             saveSendAddressAbnormalReport(new CollectLineReportSendAddressAbnormalSaveParam(param.getChildNo(), param.getRemark()));
         }
@@ -102,6 +112,10 @@ public class CollectLineReportServiceImpl implements CollectLineReportService {
             saveLoadUnloadAbnormalReport(new CollectLineReportLoadUnloadAbnormalSaveParam(param.getChildNo(), param.getRemark()));
         }
 
+        //待审核：司机异常情况上报  站内信
+        sendInternalMessageService.sendInternalMessageMq(InternalMessageTemplateEnum.PlatformType.CARRIER.getCode(),
+                InternalMessageTemplateEnum.BusinessType.DRIVER_REPORT.getCode(),
+                InternalMessageTemplateEnum.CUSTOM_DRIVER_REPORT_EXCEPTION_SITUATION_CODE, List.of(loginUserInfo.getUserName()),null,null);
     }
 
     @Transactional(rollbackFor = Exception.class)
@@ -258,6 +272,11 @@ public class CollectLineReportServiceImpl implements CollectLineReportService {
         collectLineReport.setReportTime(LocalDateTime.now());
         collectLineReport.setCreateTime(collectLineReport.getReportTime());
         collectLineReportDao.saveEntity(collectLineReport);
+
+        //待审核：无接单上报 站内信
+        sendInternalMessageService.sendInternalMessageMq(InternalMessageTemplateEnum.PlatformType.CARRIER.getCode(),
+                InternalMessageTemplateEnum.BusinessType.DRIVER_REPORT.getCode(),
+                InternalMessageTemplateEnum.CUSTOM_DRIVER_REPORT_NO_TAKE_ORDER_CODE, List.of(loginUserInfo.getUserName()),null,null);
     }
 
     @Transactional(rollbackFor = Exception.class)
@@ -280,6 +299,11 @@ public class CollectLineReportServiceImpl implements CollectLineReportService {
         collectLineReport.setReportTime(LocalDateTime.now());
         collectLineReport.setCreateTime(collectLineReport.getReportTime());
         collectLineReportDao.saveEntity(collectLineReport);
+
+        //司机上报：其他 站内信
+        sendInternalMessageService.sendInternalMessageMq(InternalMessageTemplateEnum.PlatformType.CARRIER.getCode(),
+                InternalMessageTemplateEnum.BusinessType.DRIVER_REPORT.getCode(),
+                InternalMessageTemplateEnum.CUSTOM_DRIVER_REPORT_OTHER_CODE, List.of(loginUserInfo.getUserName()),null,null);
     }
 
     @Transactional(rollbackFor = Exception.class)
@@ -312,6 +336,11 @@ public class CollectLineReportServiceImpl implements CollectLineReportService {
         collectLineReport.setCreateTime(collectLineReport.getReportTime());
         collectLineReportDao.saveEntity(collectLineReport);
 
+        //待审核：煤炭质量上报 站内信
+        sendInternalMessageService.sendInternalMessageMq(InternalMessageTemplateEnum.PlatformType.CARRIER.getCode(),
+                InternalMessageTemplateEnum.BusinessType.DRIVER_REPORT.getCode(),
+                InternalMessageTemplateEnum.CUSTOM_DRIVER_REPORT_COAL_QUALITY_CODE, List.of(loginUserInfo.getUserName()),null,null);
+
     }
 
     @Override

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

@@ -3,6 +3,7 @@ package com.clx.performance.service.impl.collect;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.dao.collect.CollectTrafficCongestionDao;
+import com.clx.performance.enums.InternalMessageTemplateEnum;
 import com.clx.performance.enums.PerformanceResultEnum;
 import com.clx.performance.enums.integral.IntegralRecordEnum;
 import com.clx.performance.model.collect.CollectTrafficCongestion;
@@ -11,6 +12,7 @@ import com.clx.performance.param.app.collect.CollectTrafficCongestionSaveParam;
 import com.clx.performance.param.app.collect.PageCollectTraficCongestionParam;
 import com.clx.performance.param.pc.carrier.CarrierPageCollectTraficCongestionParam;
 import com.clx.performance.service.IntegralRecordService;
+import com.clx.performance.service.SendInternalMessageService;
 import com.clx.performance.service.collect.CollectTrafficCongestionService;
 import com.clx.performance.service.integral.IntegralRuleService;
 import com.clx.performance.struct.collect.CollectTrafficCongestionStruct;
@@ -25,6 +27,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
 
 import java.time.LocalDateTime;
+import java.util.List;
 
 @Slf4j
 @Service
@@ -36,9 +39,7 @@ public class CollectTrafficCongestionServiceImpl implements CollectTrafficConges
     @Autowired
     private CollectTrafficCongestionStruct collectTrafficCongestionStruct;
     @Autowired
-    private IntegralRecordService integralRecordService;
-    @Autowired
-    private IntegralRuleService integralRuleService;
+    private SendInternalMessageService sendInternalMessageService;
 
     @Transactional(rollbackFor = Exception.class)
     @Override
@@ -77,7 +78,10 @@ public class CollectTrafficCongestionServiceImpl implements CollectTrafficConges
         collectTrafficCongestion.setCreateTime(collectTrafficCongestion.getReportTime());
         collectTrafficCongestionDao.saveEntity(collectTrafficCongestion);
 
-
+        //待审核：交通情况上报 站内信
+        sendInternalMessageService.sendInternalMessageMq(InternalMessageTemplateEnum.PlatformType.CARRIER.getCode(),
+                InternalMessageTemplateEnum.BusinessType.DRIVER_REPORT.getCode(),
+                InternalMessageTemplateEnum.CUSTOM_DRIVER_REPORT_TRAFFIC_SITUATION_CODE, List.of(loginUserInfo.getUserName()),null,null);
     }
 
     @Override

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

@@ -2,11 +2,13 @@ package com.clx.performance.service.impl.collect;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.dao.collect.CollectTruckLocationDao;
+import com.clx.performance.enums.InternalMessageTemplateEnum;
 import com.clx.performance.enums.PerformanceResultEnum;
 import com.clx.performance.model.collect.CollectTruckLocation;
 import com.clx.performance.param.app.collect.CollectTruckLocationSaveParam;
 import com.clx.performance.param.app.collect.PageCollectTruckLocationParam;
 import com.clx.performance.param.pc.carrier.CarrierPageCollectTruckLocationParam;
+import com.clx.performance.service.SendInternalMessageService;
 import com.clx.performance.service.collect.CollectTruckLocationService;
 import com.clx.performance.struct.collect.CollectTruckLocationStruct;
 import com.clx.performance.vo.pc.collect.CollectTruckLocationVO;
@@ -18,6 +20,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
 import java.time.LocalDateTime;
+import java.util.List;
 
 @Slf4j
 @Service
@@ -29,6 +32,9 @@ public class CollectTruckLocationServiceImpl implements CollectTruckLocationServ
     @Autowired
     private CollectTruckLocationStruct collectTruckLocationStruct;
 
+    @Autowired
+    SendInternalMessageService sendInternalMessageService;
+
 
     @Override
     public void saveLocationReport(CollectTruckLocationSaveParam param) {
@@ -68,6 +74,11 @@ public class CollectTruckLocationServiceImpl implements CollectTruckLocationServ
         collectTruckLocation.setReportTime(LocalDateTime.now());
         collectTruckLocation.setCreateTime(collectTruckLocation.getReportTime());
         collectTruckLocationDao.saveEntity(collectTruckLocation);
+
+        //司机上报：位置 站内信
+        sendInternalMessageService.sendInternalMessageMq(InternalMessageTemplateEnum.PlatformType.CARRIER.getCode(),
+                InternalMessageTemplateEnum.BusinessType.DRIVER_REPORT.getCode(),
+                InternalMessageTemplateEnum.CUSTOM_DRIVER_REPORT_POSITION_CODE, List.of(loginUserInfo.getUserName()),null,null);
     }
 
     @Override

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

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.dao.OrderChildDao;
 import com.clx.performance.dao.collect.CollectTruckRefuelDao;
+import com.clx.performance.enums.InternalMessageTemplateEnum;
 import com.clx.performance.enums.PerformanceResultEnum;
 import com.clx.performance.enums.integral.IntegralRecordEnum;
 import com.clx.performance.model.OrderChild;
@@ -12,6 +13,7 @@ import com.clx.performance.param.app.collect.CollectTruckRefuelSaveParam;
 import com.clx.performance.param.app.collect.PageCollectTruckRefuelParam;
 import com.clx.performance.param.pc.carrier.CarrierPageCollectTruckRefuelParam;
 import com.clx.performance.service.IntegralRecordService;
+import com.clx.performance.service.SendInternalMessageService;
 import com.clx.performance.service.collect.CollectTruckRefuelService;
 import com.clx.performance.service.integral.IntegralRuleService;
 import com.clx.performance.struct.collect.CollectTruckRefuelStruct;
@@ -20,11 +22,13 @@ import com.clx.performance.vo.pc.integral.AppIntegralRuleVO;
 import com.msl.user.data.UserSessionData;
 import com.msl.user.utils.TokenUtil;
 import lombok.extern.slf4j.Slf4j;
+import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
+import java.util.List;
 
 @Slf4j
 @Service
@@ -43,6 +47,8 @@ public class CollectTruckRefuelServiceImpl implements CollectTruckRefuelService
     private IntegralRuleService integralRuleService;
     @Autowired
     private IntegralRecordService integralRecordService;
+    @Autowired
+    SendInternalMessageService sendInternalMessageService;
 
     @Transactional(rollbackFor = Exception.class)
     @Override
@@ -80,6 +86,10 @@ public class CollectTruckRefuelServiceImpl implements CollectTruckRefuelService
         integralRecordService.addDriverReportRecord(ruleInfo, collectTruckRefuel.getTruckNo(), IntegralRecordEnum.Type.REPORT_REFUEL.getValue(),
                 ruleInfo.getDriverReportRule().getIntegralRefuel(), IntegralRecordEnum.Type.REPORT_REFUEL.getMsg());
 
+        //司机上报：油表信息 站内信
+        sendInternalMessageService.sendInternalMessageMq(InternalMessageTemplateEnum.PlatformType.CARRIER.getCode(),
+                InternalMessageTemplateEnum.BusinessType.DRIVER_REPORT.getCode(),
+                InternalMessageTemplateEnum.CUSTOM_DRIVER_REPORT_REFUEL_CODE, List.of(loginUserInfo.getUserName()),null,null);
     }
 
     @Override

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

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.dao.OrderChildDao;
 import com.clx.performance.dao.collect.CollectTruckWaitDao;
+import com.clx.performance.enums.InternalMessageTemplateEnum;
 import com.clx.performance.enums.PerformanceResultEnum;
 import com.clx.performance.enums.collect.CollectTruckWaitEnum;
 import com.clx.performance.enums.integral.IntegralRecordEnum;
@@ -15,6 +16,7 @@ import com.clx.performance.param.app.collect.CollectWaitReportSendAddressSavePar
 import com.clx.performance.param.app.collect.PageCollectTruckWaitParam;
 import com.clx.performance.param.pc.carrier.CarrierPageCollectTruckWaitParam;
 import com.clx.performance.service.IntegralRecordService;
+import com.clx.performance.service.SendInternalMessageService;
 import com.clx.performance.service.collect.CollectWaitReportService;
 import com.clx.performance.service.integral.IntegralRuleService;
 import com.clx.performance.struct.collect.CollectTruckWaitStruct;
@@ -28,6 +30,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
+import java.util.List;
 import java.util.Objects;
 
 @Slf4j
@@ -46,6 +49,9 @@ public class CollectWaitReportServiceImpl implements CollectWaitReportService {
     @Autowired
     private IntegralRecordService integralRecordService;
 
+    @Autowired
+    SendInternalMessageService sendInternalMessageService;
+
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void saveSendAddressReport(CollectWaitReportSendAddressSaveParam param) {
@@ -74,6 +80,12 @@ public class CollectWaitReportServiceImpl implements CollectWaitReportService {
         collectTruckWait.setCreateTime(collectTruckWait.getReportTime());
         collectTruckWaitDao.saveEntity(collectTruckWait);
 
+        //待审核：排队信息上报 站内信
+        sendInternalMessageService.sendInternalMessageMq(InternalMessageTemplateEnum.PlatformType.CARRIER.getCode(),
+                InternalMessageTemplateEnum.BusinessType.DRIVER_REPORT.getCode(),
+                InternalMessageTemplateEnum.CUSTOM_DRIVER_REPORT_LINE_UP_INFO_CODE, List.of(loginUserInfo.getUserName()),null,null);
+
+
     }
 
     @Transactional(rollbackFor = Exception.class)
@@ -104,6 +116,11 @@ public class CollectWaitReportServiceImpl implements CollectWaitReportService {
         collectTruckWait.setCreateTime(collectTruckWait.getReportTime());
         collectTruckWaitDao.saveEntity(collectTruckWait);
 
+        //待审核：排队信息上报 站内信
+        sendInternalMessageService.sendInternalMessageMq(InternalMessageTemplateEnum.PlatformType.CARRIER.getCode(),
+                InternalMessageTemplateEnum.BusinessType.DRIVER_REPORT.getCode(),
+                InternalMessageTemplateEnum.CUSTOM_DRIVER_REPORT_LINE_UP_INFO_CODE, List.of(loginUserInfo.getUserName()),null,null);
+
     }
 
     @Override

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

@@ -221,7 +221,7 @@ public class LineWarnMqHandlerServiceImpl implements LineWarnMqHandlerService {
         //发送站内信mq
         sendInternalMessageService.sendInternalMessageMq(InternalMessageTemplateEnum.PlatformType.CARRIER.getCode(),
                 InternalMessageTemplateEnum.BusinessType.LINE_WARN.getCode(),
-                vehicleWarnInfo.getWarnType(), List.of(vehicleWarnInfo.getOrderGoodsNo()),null);
+                vehicleWarnInfo.getWarnType(), List.of(vehicleWarnInfo.getOrderGoodsNo()),null,null);
 
 
 

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

@@ -345,7 +345,7 @@ public class VehicleWarnMqHandlerServiceImpl implements VehicleWarnMqHandlerServ
         //发送站内信mq
         sendInternalMessageService.sendInternalMessageMq(InternalMessageTemplateEnum.PlatformType.CARRIER.getCode(),
                 InternalMessageTemplateEnum.BusinessType.CHILD_WARN.getCode(),
-                vehicleWarnInfo.getWarnType(), List.of(vehicleWarnInfo.getChildNo()),null);
+                vehicleWarnInfo.getWarnType(), List.of(vehicleWarnInfo.getChildNo()),null,null);
 
         List<String> mobileList = new ArrayList<>();
 

performance-api/src/main/java/com/clx/performance/enums/InternalMessageTemplateEnum.java

@@ -335,26 +335,26 @@ public class InternalMessageTemplateEnum {
     public enum BusinessTypeDetail {
 
         //预警-运单预警
-        ARRIVE_SEND_DELAY("ARRIVE_SEND_DELAY", "预警通知：到达货源地延误","运单%s,到达货源地延误，请尽快处理。","",""),
-        GOTO_SEND_TIMEOUT("GO_TO_SEND_TIMEOUT", "预警通知：前往货源地超时","运单%s,前往货源地超时，请尽快处理。","",""),
-        ARRIVE_RECEIVE_DELAY("ARRIVE_RECEIVE_DELAY", "预警通知：到达目的地延误","运单%s,到达目的地延误，请尽快处理。","",""),
-        GOTO_RECEIVE_TIMEOUT("GOTO_RECEIVE_TIMEOUT", "预警通知：前往目的地超时","运单%s,到达目的地超时，请尽快处理。","",""),
-        PARK_TIMEOUT("PARK_TIMEOUT", "预警通知：前往货源地超时","运单%s,停留超时，请尽快处理。","",""),
-        LOAD_TIMEOUT("LOAD_TIMEOUT", "预警通知：前往货源地超时","运单%s,装车超时，请尽快处理。","",""),
-        UNLOAD_TIMEOUT("UNLOAD_TIMEOUT", "预警通知：前往货源地超时","运单%s,卸车超时，请尽快处理。","",""),
+        ARRIVE_SEND_DELAY("ARRIVE_SEND_DELAY", "预警通知：到达货源地延误","运单%s,到达货源地延误，请尽快处理。","/fulfillment-center/monitor-warn/vehicle-monitor-warn",""),
+        GOTO_SEND_TIMEOUT("GO_TO_SEND_TIMEOUT", "预警通知：前往货源地超时","运单%s,前往货源地超时，请尽快处理。","/fulfillment-center/monitor-warn/vehicle-monitor-warn",""),
+        ARRIVE_RECEIVE_DELAY("ARRIVE_RECEIVE_DELAY", "预警通知：到达目的地延误","运单%s,到达目的地延误，请尽快处理。","/fulfillment-center/monitor-warn/vehicle-monitor-warn",""),
+        GOTO_RECEIVE_TIMEOUT("GOTO_RECEIVE_TIMEOUT", "预警通知：前往目的地超时","运单%s,到达目的地超时，请尽快处理。","/fulfillment-center/monitor-warn/vehicle-monitor-warn",""),
+        PARK_TIMEOUT("PARK_TIMEOUT", "预警通知：前往货源地超时","运单%s,停留超时，请尽快处理。","","/fulfillment-center/monitor-warn/vehicle-monitor-warn"),
+        LOAD_TIMEOUT("LOAD_TIMEOUT", "预警通知：前往货源地超时","运单%s,装车超时，请尽快处理。","","/fulfillment-center/monitor-warn/vehicle-monitor-warn"),
+        UNLOAD_TIMEOUT("UNLOAD_TIMEOUT", "预警通知：前往货源地超时","运单%s,卸车超时，请尽快处理。","","/fulfillment-center/monitor-warn/vehicle-monitor-warn"),
 
         //预警-线路预警
-        TAKE("TAKE", "预警通知：接单预警","货单【%s】，触发接单预警，请尽快处理。","",""),
-        UNLOAD("UNLOAD", "预警通知：卸车预警","货单【%s】，触发卸车预警，请尽快处理。","",""),
-        CONGESTION("CONGESTION", "预警通知：拥堵预警","货单【%s】，触发拥堵，请尽快处理。","",""),
-        WEATHER("WEATHER", "预警通知：天气预警","货单【%s】，触发天气预警，请尽快处理。","",""),
-        CHILD_ABNORMAL("CHILD_ABNORMAL", "预警通知：运单异常","货单【%s】，触发运单预警，请尽快处理。","",""),
-        LINE_ABNORMAL("LINE_ABNORMAL", "预警通知：线路异常","货单【%s】，触发线路预警，请尽快处理。","",""),
+        TAKE("TAKE", "预警通知：接单预警","货单【%s】，触发接单预警，请尽快处理。","","/fulfillment-center/monitor-warn/route-monitor-warn"),
+        UNLOAD("UNLOAD", "预警通知：卸车预警","货单【%s】，触发卸车预警，请尽快处理。","","/fulfillment-center/monitor-warn/route-monitor-warn"),
+        CONGESTION("CONGESTION", "预警通知：拥堵预警","货单【%s】，触发拥堵，请尽快处理。","","/fulfillment-center/monitor-warn/route-monitor-warn"),
+        WEATHER("WEATHER", "预警通知：天气预警","货单【%s】，触发天气预警，请尽快处理。","","/fulfillment-center/monitor-warn/route-monitor-warn"),
+        CHILD_ABNORMAL("CHILD_ABNORMAL", "预警通知：运单异常","货单【%s】，触发运单预警，请尽快处理。","","/fulfillment-center/monitor-warn/route-monitor-warn"),
+        LINE_ABNORMAL("LINE_ABNORMAL", "预警通知：线路异常","货单【%s】，触发线路预警，请尽快处理。","","/fulfillment-center/monitor-warn/route-monitor-warn"),
 
 
         //待办-待报价订单
-        WAIT_QUOTATION("WAIT_QUOTATION", "订单待报价","您收到了一条货主的订单，请尽快进行报价。","",""),
-        QUOTATION_REJECT("QUOTATION_REJECT", "报价驳回：重新报价","您的订单【%s】报价已被驳回，请重新报价。","",""),
+        WAIT_QUOTATION("WAIT_QUOTATION", "订单待报价","您收到了一条货主的订单，请尽快进行报价。","/order-center/order-manage/order-list/quotation",""),
+        QUOTATION_REJECT("QUOTATION_REJECT", "报价驳回：重新报价","您的订单【%s】报价已被驳回，请重新报价。","/order-center/order-manage/order-list/quotation",""),
 
         //待办-待审核事项
         WAIT_AUDIT_LICENCE_AUTH("WAIT_AUDIT_LICENCE", "待审核：司机驾驶认证","您有一个司机认证待审核，请及时处理。","",""),

performance-api/src/main/java/com/clx/performance/param/mq/InternalMessageParam.java

@@ -24,6 +24,10 @@ public class InternalMessageParam {
     //内容参数
     List<String> variableList;
 
+    //跳转地址参数
+    List<String> jumpUrlVariableList;
+
+
     //站内信点对点的用户
     private Long userNo;