Merge branch 'v29.3_carrier_messsage_20241016' of…

clx-performance-web/src/main/java/com/clx/performance/controller/temp/TempInternalMessageController.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();
 
     }

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

@@ -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);

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

@@ -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)){

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

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