Merge remote-tracking branch 'origin/v30.2_break_contract_20241021' into test_jdk17

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

@@ -2,6 +2,7 @@ package com.clx.performance.service.impl;
 
 import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.TypeReference;
 import com.clx.performance.common.MqWrapper;
 import com.clx.performance.dao.vehiclewarn.VehicleWarnUserDao;
 import com.clx.performance.enums.SmsTemplateEnum;
@@ -11,12 +12,15 @@ import com.clx.performance.service.SendSmsService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.poi.ss.formula.functions.T;
 import org.springframework.amqp.core.Message;
 import org.springframework.amqp.core.MessageBuilder;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 import static com.clx.performance.constant.RabbitKeyConstants.NOTICE_SEND_SMS_QUEUE_EXCHANGE;
@@ -54,6 +58,7 @@ public class SendSmsServiceImpl implements SendSmsService {
     }
 
 
+
     private List<String> getTargets(int code){
         return vehicleWarnUserDao.listAllEnable()
                 .stream()
@@ -75,7 +80,6 @@ public class SendSmsServiceImpl implements SendSmsService {
         return String.format(content, list.toArray());
     }
 
-
     //查找字符在字符串出现的次数
     public static int countCharTimes(String mainStr,String subStr){
         // 声明一个要返回的变量

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

@@ -11,7 +11,7 @@ public enum SmsTemplateEnum {
     @Getter
     @AllArgsConstructor
     public enum Type {
-        EXCEPTION_REPORT_DEAL("childExceptionReportDeal", "异常上报处理","{childNo:%s}"),
+        EXCEPTION_REPORT_DEAL("childExceptionReportDeal", "异常上报处理","{\"childNo\":\"%s\"}"),
         ;
         private final String code;
         private final String msg;