提交 c0eba43f authored 作者: 马路路's avatar 马路路

Merge branch 'v29.3_carrier_messsage_20241016' of…

Merge branch 'v29.3_carrier_messsage_20241016' of t.clxkj.cn:clx-java/clx-performance into 33.6_app_carrier_messsage_20241106 # Conflicts: # clx-performance-web/src/main/java/com/clx/performance/service/SendInternalMessageService.java
......@@ -51,11 +51,13 @@ public class TempInternalMessageController {
@RequestMapping(value = "/send", method = RequestMethod.GET)
public Result<Object> send(@RequestParam("businessType") @NotBlank(message = "站内信大类业务不能为空") String businessType,
@RequestParam("typeCode") @NotNull(message = "业务code不能为空") Integer typeCode,
@RequestParam("listJson") @NotBlank(message = "参数字符串") String listJson
@RequestParam("listJson") @NotBlank(message = "参数字符串") String listJson,
@RequestParam("jumpParamJson") @NotBlank(message = "跳转参数字符串") String jumpParamJson
) {
sendInternalMessageService.sendInternalMessageMq(InternalMessageTemplateEnum.PlatformType.CARRIER.getCode(),
businessType, typeCode, JSON.parseObject(listJson, new TypeReference<>() {
}),null,null);
}),JSON.parseObject(jumpParamJson, new TypeReference<>() {
}),null);
return Result.ok();
}
......
......@@ -7,8 +7,7 @@ import java.util.List;
public interface SendInternalMessageService {
//发送站内信的业务Code
void sendInternalMessageMq(String productCode,String businessType, Integer typeCode,
List<String> variableList, List<String> jumpUrlVariableList, Long userNo);
void sendInternalMessageMq(String productCode,String businessType, Integer typeCode, List<Object> variableList, List<Object> jumpUrlVariableList, Long userNo);
//发送承运站内信
void sendCarrierInternalMessage(InternalMessageParam internalMessageDTO);
......
......@@ -28,6 +28,7 @@ import org.springframework.amqp.core.MessageBuilder;
import org.springframework.amqp.rabbit.core.RabbitTemplate;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.util.*;
import java.util.stream.Collectors;
......@@ -59,7 +60,7 @@ public class SendInternalMessageServiceImpl implements SendInternalMessageServic
//发送站内信的业务Code
@Override
public void sendInternalMessageMq(String productCode,String businessType, Integer typeCode, List<String> variableList, List<String> jumpUrlVariableList,Long userNo){
public void sendInternalMessageMq(String productCode,String businessType, Integer typeCode, List<Object> variableList, List<Object> jumpUrlVariableList,Long userNo){
InternalMessageParam param = new InternalMessageParam();
param.setBusinessType(businessType);
param.setTypeCode(typeCode);
......@@ -146,7 +147,7 @@ public class SendInternalMessageServiceImpl implements SendInternalMessageServic
//发送站内信
DefaultMessageRoute messageRoute = new DefaultMessageRoute();
//TODO 自己定义,提供给消息中心
// 自己定义,提供给消息中心
messageRoute.put("product-code",internalMessageDTO.getProductCode());
message.setMessageRoute(messageRoute);
......@@ -223,7 +224,7 @@ public class SendInternalMessageServiceImpl implements SendInternalMessageServic
}
//构建站内信中的内容,替换变量
private String replaceContent(String content,List<String> list){
private static String replaceContent(String content,List<Object> list){
int listSize = 0;
int times = countCharTimes(content, "%s");
if(CollectionUtils.isNotEmpty(list)){
......
......@@ -515,68 +515,68 @@ public class InternalMessageTemplateEnum {
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"),
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】,触发接单预警,请尽快处理。","","/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"),
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", "订单待报价","您收到了一条货主的订单,请尽快进行报价。","/order-center/order-manage/order-list/quotation",""),
QUOTATION_REJECT("QUOTATION_REJECT", "报价驳回:重新报价","您的订单【%s】报价已被驳回,请重新报价。","/order-center/order-manage/order-list/quotation",""),
WAIT_QUOTATION("WAIT_QUOTATION", "订单待报价","您收到了一条货主的订单,请尽快进行报价。","/order-center/order-manage/order-list/quotation","{\"orderNo\":\"%s\",\"id\":\"%s\"}"),
QUOTATION_REJECT("QUOTATION_REJECT", "报价驳回:重新报价","您的订单【%s】报价已被驳回,请重新报价。","/order-center/order-manage/order-list/quotation","{\"orderNo\":\"%s\",\"id\":\"%s\",,\"repeat\":\"1\"}"),
//待办-待审核事项
WAIT_AUDIT_LICENCE_AUTH("WAIT_AUDIT_LICENCE", "待审核:司机驾驶认证","您有一个司机认证待审核,请及时处理。","",""),
WAIT_AUDIT_TRUCK_AUTH("WAIT_AUDIT_TRUCK_AUTH", "待审核:司机车辆认证","您有一个车辆认证待审核,请及时处理。","",""),
CONFIRMED_QUOTATION("CONFIRMED_QUOTATION", "已同意报价","【%s】货主已同意报价。","",""),
PLATFORM_UNDERTAKING("PLATFORM_UNDERTAKING", "已承接订单","【%s】货主已同意报价,平台已承接。","",""),
OWNER_TRIGGER_BREAK_CONTRACT("OWNER_TRIGGER_BREAK_CONTRACT", "货主违约通知","您收到一条货主违约信息,违约编号【%s】","",""),
DRIVER_TRIGGER_BREAK_CONTRACT("DRIVER_TRIGGER_BREAK_CONTRACT", "司机违约通知","您收到一条司机违约信息,违约编号【%s】","",""),
RECEIVE_SUB_WEIGHT_APPLY("RECEIVE_SUB_WEIGHT_APPLY", "收到减吨申请","您收到一条司机违约信息,违约编号【%s】","",""),
RECEIVE_DELAY_APPLY("RECEIVE_DELAY_APPLY", "收到延期申请","您收到一条延期申请,订单编号【%s】。","",""),
AGREE_SUB_WEIGHT_APPLY("AGREE_SUB_WEIGHT_APPLY", "货主同意减吨申请","货主已同意您的减吨申请,订单编号【%s】。","",""),
REJECT_SUB_WEIGHT_APPLY("REJECT_SUB_WEIGHT_APPLY", "货主拒绝减吨申请","货主已拒绝您的减吨申请,订单编号【%s】。","",""),
AGREE_DELAY_APPLY("AGREE_DELAY_APPLY", "货主同意延期申请","货主已同意您的延期申请,订单编号【%s】。","",""),
REJECT_DELAY_APPLY("REJECT_DELAY_APPLY", "货主拒绝延期申请","货主已拒绝您的延期申请,订单编号【%s】。","",""),
WAIT_AUDIT_LICENCE_AUTH("WAIT_AUDIT_LICENCE", "待审核:司机驾驶认证","您有一个司机认证待审核,请及时处理。","/cs-center/document-auth/driver/driver-detail","{\"id\":\"%s\"}"),
WAIT_AUDIT_TRUCK_AUTH("WAIT_AUDIT_TRUCK_AUTH", "待审核:司机车辆认证","您有一个车辆认证待审核,请及时处理。","/cs-center/document-auth/car/car-detail","{\"truckId\":\"%s\"}"),
CONFIRMED_QUOTATION("CONFIRMED_QUOTATION", "已同意报价","【%s】货主已同意报价。","/order-center/order-manage/order-list/order-detail","{\"orderNo\":\"%s\",\"id\":\"%s\"}"),
PLATFORM_UNDERTAKING("PLATFORM_UNDERTAKING", "已承接订单","【%s】平台已承接。","/order-center/order-manage/order-list/order-detail","{\"orderNo\":\"%s\",\"id\":\"%s\"}"),
OWNER_TRIGGER_BREAK_CONTRACT("OWNER_TRIGGER_BREAK_CONTRACT", "货主违约通知","您收到一条货主违约信息,违约编号【%s】","/cost-center/default-manage/owner-default",""),
DRIVER_TRIGGER_BREAK_CONTRACT("DRIVER_TRIGGER_BREAK_CONTRACT", "司机违约通知","您收到一条司机违约信息,违约编号【%s】","/cost-center/default-manage/driver-default",""),
RECEIVE_SUB_WEIGHT_APPLY("RECEIVE_SUB_WEIGHT_APPLY", "收到减吨申请","您收到一条减吨申请,订单编号【%s】。","/order-center/order-manage/order_reduce_ton_apply","{\"orderNo\":\"%s\",\"orderStatus\":\"%s\"}"),
RECEIVE_DELAY_APPLY("RECEIVE_DELAY_APPLY", "收到延期申请","您收到一条延期申请,订单编号【%s】。","/order-center/order-manage/order_delay_apply","{\"orderNo\":\"%s\",\"orderId\":\"%s\",\"orderStatus\":\"%s\"}"),
AGREE_SUB_WEIGHT_APPLY("AGREE_SUB_WEIGHT_APPLY", "货主同意减吨申请","货主已同意您的减吨申请,订单编号【%s】。","/order-center/order-manage/order_reduce_ton_apply","{\"orderNo\":\"%s\",\"orderStatus\":\"%s\"}"),
REJECT_SUB_WEIGHT_APPLY("REJECT_SUB_WEIGHT_APPLY", "货主拒绝减吨申请","货主已拒绝您的减吨申请,订单编号【%s】。","/order-center/order-manage/order_reduce_ton_apply","{\"orderNo\":\"%s\",\"orderStatus\":\"%s\"}"),
AGREE_DELAY_APPLY("AGREE_DELAY_APPLY", "货主同意延期申请","货主已同意您的延期申请,订单编号【%s】。","/order-center/order-manage/order_delay_apply","{\"orderNo\":\"%s\",\"orderId\":\"%s\",\"orderStatus\":\"%s\"}"),
REJECT_DELAY_APPLY("REJECT_DELAY_APPLY", "货主拒绝延期申请","货主已拒绝您的延期申请,订单编号【%s】。","/order-center/order-manage/order_delay_apply","{\"orderNo\":\"%s\",\"orderId\":\"%s\",\"orderStatus\":\"%s\"}"),
//待办-待创建货单
WAIT_CREATE_ORDER_GOODS("WAIT_CREATE_ORDER_GOODS", "货单待创建","【%s】货主已同意报价,请及时创建货单。","",""),
OWNER_AGREE_UNDERTAKING_ORDER_ADJUSTMENT_PRICE("OWNER_AGREE_UNDERTAKING_ORDER_ADJUSTMENT_PRICE", "货主同意调价申请","货主已同意您的调价申请,【%s】。","",""),//已承接订单
WAIT_CREATE_ORDER_GOODS("WAIT_CREATE_ORDER_GOODS", "货单待创建","【%s】货主已同意报价,请及时创建货单。","/order-center/cargo-manage/cargo-list/create",""),
OWNER_AGREE_UNDERTAKING_ORDER_ADJUSTMENT_PRICE("OWNER_AGREE_UNDERTAKING_ORDER_ADJUSTMENT_PRICE", "货主同意调价申请","货主已同意您的调价申请,【%s】。","/order-center/order-manage/price-adjustment",""),//已承接订单
//通知-订单通知
OWNER_AGREE_POST_ORDER_ORDER_ADJUSTMENT_PRICE("OWNER_AGREE_POST_ORDER_ORDER_ADJUSTMENT_PRICE", "货主同意调价申请","货主已同意您的调价申请,【%s】。","",""),//已挂单订单
OWNER_REJECT_UNDERTAKING_ORDER_ADJUSTMENT_PRICE("OWNER_REJECT_UNDERTAKING_ORDER_ADJUSTMENT_PRICE", "货主拒绝调价申请","货主已拒绝您的调价申请,订单编号【】。","",""),//已承接订单
OWNER_CANCEL_ORDER("OWNER_CANCEL_ORDER", "货主已取消订单","货主已取消订单,订单编号【%s】。","",""),
OWNER_AGREE_POST_ORDER_ORDER_ADJUSTMENT_PRICE("OWNER_AGREE_POST_ORDER_ORDER_ADJUSTMENT_PRICE", "货主同意调价申请","货主已同意您的调价申请,【%s】。","/order-center/order-manage/price-adjustment",""),//已挂单订单
OWNER_REJECT_UNDERTAKING_ORDER_ADJUSTMENT_PRICE("OWNER_REJECT_UNDERTAKING_ORDER_ADJUSTMENT_PRICE", "货主拒绝调价申请","货主已拒绝您的调价申请,订单编号【】。","/order-center/order-manage/order-list/order-detail","{\"orderNo\":\"%s\",\"id\":\"%s\"}"),//已承接订单
OWNER_CANCEL_ORDER("OWNER_CANCEL_ORDER", "货主已取消订单","货主已取消订单,订单编号【%s】。","/order-center/order-manage/order-list/order-detail",""),
//通知-投诉通知
DRIVER_SUBMIT_COMPLAINT("DRIVER_SUBMIT_COMPLAINT","客户投诉","您收到了一条客户投诉,运单编号【%s】,投诉类型【%s】,投诉内容【%s】。","",""),
DRIVER_SUBMIT_COMPLAINT("DRIVER_SUBMIT_COMPLAINT","客户投诉","您收到了一条客户投诉,运单编号【%s】,投诉类型【%s】,投诉内容【%s】。","/cs-center/customer-complain","{\"orderNo\":\"%s\",\"id\":\"%s\"}"),
//上报-司机上报、
DRIVER_REPORT_SEND_INFO("DRIVER_REPORT_SEND_INFO","待审核:司机货源地信息上报","【%s】上报了一条货源地信息,请前往处理审核。","",""),
DRIVER_REPORT_EXCEPTION_SITUATION("DRIVER_REPORT_EXCEPTION_SITUATION","待审核:司机异常情况上报","【%s】上报了一条异常信息,异常类型【】,异常原因【】请前往处理审核。","",""),
DRIVER_REPORT_NO_TAKE_ORDER("DRIVER_REPORT_NO_TAKE_ORDER","待审核:无接单上报","【%s】上报了一条无接单信息,无接单原因【】,请前往处理审核。","",""),
DRIVER_REPORT_TRAFFIC_SITUATION("DRIVER_REPORT_TRAFFIC_SITUATION","待审核:交通情况上报","【%s】上报了一条交通信息,请前往处理审核。","",""),
DRIVER_REPORT_COAL_QUALITY("DRIVER_REPORT_COAL_QUALITY","待审核:煤炭质量上报","【%s】上报了一条煤炭质量信息,请前往处理审核。","",""),
DRIVER_REPORT_LINE_UP_INFO("DRIVER_REPORT_LINE_UP_INFO","待审核:排队信息上报","【%s】上报了一条排队信息,请前往处理审核。","",""),
DRIVER_REPORT_POSITION("DRIVER_REPORT_POSITION","司机上报:位置","【%s】上报了一条位置信息【%s】。","",""),
DRIVER_REPORT_REFUEL("DRIVER_REPORT_REFUEL","司机上报:油表信息","【%s】上报了一条油表信息。","",""),
DRIVER_REPORT_OTHER("DRIVER_REPORT_OTHER","司机上报:其他","【%s】上报了一条其他信息,内容为:【%s】。","",""),
DRIVER_REPORT_SEND_INFO("DRIVER_REPORT_SEND_INFO","待审核:司机货源地信息上报","【%s】上报了一条货源地信息,请前往处理审核。","/data-center/driver-upload/origin-condition",""),
DRIVER_REPORT_EXCEPTION_SITUATION("DRIVER_REPORT_EXCEPTION_SITUATION","待审核:司机异常情况上报","【%s】上报了一条异常信息,异常类型【】,异常原因【】请前往处理审核。","/data-center/driver-upload/abnormal-report",""),
DRIVER_REPORT_NO_TAKE_ORDER("DRIVER_REPORT_NO_TAKE_ORDER","待审核:无接单上报","【%s】上报了一条无接单信息,无接单原因【】,请前往处理审核。","/data-center/driver-upload/no-orders-taken-report",""),
DRIVER_REPORT_TRAFFIC_SITUATION("DRIVER_REPORT_TRAFFIC_SITUATION","待审核:交通情况上报","【%s】上报了一条交通信息,请前往处理审核。","/data-center/driver-upload/traffic-report",""),
DRIVER_REPORT_COAL_QUALITY("DRIVER_REPORT_COAL_QUALITY","待审核:煤炭质量上报","【%s】上报了一条煤炭质量信息,请前往处理审核。","/data-center/driver-upload/coal-quality",""),
DRIVER_REPORT_LINE_UP_INFO("DRIVER_REPORT_LINE_UP_INFO","待审核:排队信息上报","【%s】上报了一条排队信息,请前往处理审核。","/data-center/driver-upload/line-report",""),
DRIVER_REPORT_POSITION("DRIVER_REPORT_POSITION","司机上报:位置","【%s】上报了一条位置信息【%s】。","/data-center/driver-upload/driver-location",""),
DRIVER_REPORT_REFUEL("DRIVER_REPORT_REFUEL","司机上报:油表信息","【%s】上报了一条油表信息。","/data-center/driver-upload/fuel-gauge-report",""),
DRIVER_REPORT_OTHER("DRIVER_REPORT_OTHER","司机上报:其他","【%s】上报了一条其他信息,内容为:【%s】。","/data-center/driver-upload/others-report",""),
//上报-内部上报
INTERNAL_REPORT_ROUTE("INTERNAL_REPORT_ROUTE","内部上报:线路信息","【%s】上报了一条线路信息,请点击查看。","",""),
INTERNAL_REPORT_TRAFFIC_VOLUME("INTERNAL_REPORT_TRAFFIC_VOLUME","内部上报:车流量","【%s】上报了一条车流量信息,请点击查看。","",""),
INTERNAL_REPORT_SITE_RULES("INTERNAL_REPORT_SITE_RULES","内部上报:厂区规则","【%s】上报了一条厂区规定,规定内容【%s】,请点击查看。","",""),
INTERNAL_REPORT_SCHEDULING_EXCEPTION("INTERNAL_REPORT_SCHEDULING_EXCEPTION","内部上报:调度异常","【%s】上报了一条调度异常,异常情况【%s】,异常内容【%s】,请点击查看。","",""),
INTERNAL_REPORT_COORDINATE_POSITION("INTERNAL_REPORT_COORDINATE_POSITION","内部上报:位置坐标","【%s】上报了一条位置坐标,请点击查看。","",""),
INTERNAL_REPORT_ROUTE("INTERNAL_REPORT_ROUTE","内部上报:线路信息","【%s】上报了一条线路信息,请点击查看。","/data-center/interior-report/report-route-info/report-route-info-detail","{\"id\":\"%s\"}"),
INTERNAL_REPORT_TRAFFIC_VOLUME("INTERNAL_REPORT_TRAFFIC_VOLUME","内部上报:车流量","【%s】上报了一条车流量信息,请点击查看。","/data-center/interior-report/report-traffic",""),
INTERNAL_REPORT_SITE_RULES("INTERNAL_REPORT_SITE_RULES","内部上报:厂区规则","【%s】上报了一条厂区规定,规定内容【%s】,请点击查看。","/data-center/interior-report/report-factory-rules",""),
INTERNAL_REPORT_SCHEDULING_EXCEPTION("INTERNAL_REPORT_SCHEDULING_EXCEPTION","内部上报:调度异常","【%s】上报了一条调度异常,异常情况【%s】,异常内容【%s】,请点击查看。","/data-center/interior-report/report-scheduling-abnormal",""),
INTERNAL_REPORT_COORDINATE_POSITION("INTERNAL_REPORT_COORDINATE_POSITION","内部上报:位置坐标","【%s】上报了一条位置坐标,请点击查看。","/data-center/interior-report/report-location-coordinates",""),
// App二级分类
// 跳转磅单审核通过,司机待确认完成运单页面
......
......@@ -22,10 +22,10 @@ public class InternalMessageParam {
private Integer typeCode;
//内容参数
List<String> variableList;
List<Object> variableList;
//跳转地址参数
List<String> jumpUrlVariableList;
List<Object> jumpUrlVariableList;
//站内信点对点的用户
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论