优化告警内容

tongran-rocketmq/src/main/java/com/tongran/rocketmq/utils/SendAlarmPushUtil.java

@@ -27,12 +27,15 @@ public class SendAlarmPushUtil {
     private IRmAlarmPushConfigService rmAlarmPushConfigService;
     @Autowired
     private IRmNetworkInterfaceService rmNetworkInterfaceService;
+    @Autowired
+    private SmsAlarmUtil smsAlarmUtil;
     /**
      * 发送告警推送
      * @param rmAlarmLog 告警日志参数
      */
     public void sendAlarmPush(RmAlarmLog rmAlarmLog) {
 
+        String clientId = rmAlarmLog.getClientId();
         RmAlarmPushConfig rmAlarmPushConfig = new RmAlarmPushConfig();
         rmAlarmPushConfig.setPushAlarmTypes(rmAlarmLog.getAlarmType());
         List<RmAlarmPushConfig> alarmConfigList = rmAlarmPushConfigService.selectRmAlarmPushConfigList(rmAlarmPushConfig);
@@ -57,7 +60,7 @@ public class SendAlarmPushUtil {
                 alarmMap.put("告警时间", rmAlarmLog.getAlarmTime());
                 alarmMap.put("IP", rmAlarmLog.getMgmPublicIp());
                 alarmMap.put("告警类型", AlarmTypeEnum.CPU使用率高.getMsg());
-                alarmMap.put("告警设备", rmAlarmLog.getClientId());
+                alarmMap.put("告警设备", clientId.substring(clientId.length() - 8));
                 alarmMap.put("告警内容", rmAlarmLog.getAlarmContent());
                 for (RmAlarmPushConfig alarmPushConfig : alarmConfigList) {
                     if(PushMethodEnum.企业微信.getCode().equals(alarmPushConfig.getPushMethod())){
@@ -102,7 +105,6 @@ public class SendAlarmPushUtil {
         String actualContent = WeChatWorkBot.processTemplate(contentTemplate, alarmMap, alarmMap.get("告警内容"));
         if (alarmPushConfig.getContactPhones() != null) {
             String[] phones = alarmPushConfig.getContactPhones().split(",");
-            SmsAlarmUtil smsAlarmUtil = new SmsAlarmUtil();
             int successCount = smsAlarmUtil.sendAlarmToMultiple(alarmPushConfig.getContactPhones(), actualContent);
             // 计算有效手机号数量（过滤空值）
             long validPhoneCount = Arrays.stream(phones)