diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/feignclient/SystemClient.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/feignclient/SystemClient.java index 39588af2..b0343df8 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/feignclient/SystemClient.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/feignclient/SystemClient.java @@ -21,7 +21,8 @@ public interface SystemClient { Map findUserMap(); @GetMapping("/sys/sendMessage/send") - void sendMessage(@RequestParam String message, + void sendMessage(@RequestParam String title, + @RequestParam String message, @RequestParam String groupId, @RequestParam String notific); diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/redisStream/AnalysisConsumer.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/redisStream/AnalysisConsumer.java index 4f3a6ff1..00402558 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/redisStream/AnalysisConsumer.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/redisStream/AnalysisConsumer.java @@ -29,6 +29,8 @@ import org.springframework.data.redis.connection.stream.ObjectRecord; import org.springframework.data.redis.connection.stream.RecordId; import org.springframework.data.redis.stream.StreamListener; import org.springframework.stereotype.Component; +import org.springframework.web.bind.annotation.RequestParam; + import static org.jeecg.common.constant.enums.MessageTypeEnum.*; import static org.jeecg.common.util.TokenUtils.getTempToken; @@ -139,7 +141,7 @@ public class AnalysisConsumer implements StreamListener nuclidesCross){ String ONE = "1";String TWO = "2";String THREE = "3"; Set nuclideNames = nuclidesCross.keySet(); - String alarmInfo = ""; + StringBuilder alarmInfo = new StringBuilder(); List firstDetected; List moreThanAvg = new ArrayList<>(); String conditionStr = info.getConditions(); @@ -150,8 +152,8 @@ public class AnalysisConsumer implements StreamListener= 2){ - String message = "同时检测到核素"+StrUtil.join(comma,nuclideNames); - alarmInfo += comma + message; + String message = "Simultaneously detecting nuclides: [" + StrUtil.join(comma,nuclideNames) + "]"; + alarmInfo.append(comma).append(message); } } } - if (StrUtil.isNotBlank(alarmInfo)){ + if (StrUtil.isNotBlank(alarmInfo.toString())){ // 保存报警日志 AlarmAnalysisLog logInfo = new AlarmAnalysisLog(); BeanUtil.copyProperties(info,logInfo); - if (alarmInfo.startsWith(comma)) - alarmInfo = StrUtil.sub(alarmInfo, 1, alarmInfo.length()); - logInfo.setAlarmInfo(alarmInfo); + if (alarmInfo.toString().startsWith(comma)) + alarmInfo = new StringBuilder(StrUtil.sub(alarmInfo.toString(), 1, alarmInfo.length())); + logInfo.setAlarmInfo(alarmInfo.toString()); if (CollUtil.isNotEmpty(moreThanAvg)) logInfo.setNuclideInfoList(moreThanAvg); logService.saveLog(logInfo); // 发送报警信息 String groupId = info.getGroupId(); if (StrUtil.isNotBlank(groupId)) - systemClient.sendMessage(alarmInfo,groupId, ALL.getValue()); + systemClient.sendMessage("Nuclide Analysis Warn Message", + alarmInfo.toString(),groupId, ALL.getValue()); } } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/SendMessage.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/SendMessage.java index 0b37f189..99aeb0d6 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/SendMessage.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/SendMessage.java @@ -12,6 +12,7 @@ import org.jeecg.modules.feignclient.AbnormalAlarmClient; import org.jeecg.modules.system.service.ISysUserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import org.springframework.web.bind.annotation.RequestParam; import java.util.HashMap; import java.util.List; @@ -48,9 +49,8 @@ public class SendMessage { * 根据联系人组id向用户推送消息 * */ - public void send(String message,String groupId,String notific){ + public void send(String title, String message, String groupId, String notific){ // 封装MessageDTO消息体 - String title = "Nuclide System Warning Message"; MessageDTO messageDTO = new MessageDTO(title,message); Map contact = getContact(groupId); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/controller/SendMessageController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/controller/SendMessageController.java index 7f58d565..b4decbe8 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/controller/SendMessageController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/controller/SendMessageController.java @@ -15,10 +15,11 @@ public class SendMessageController { private SendMessage sendMessage; @GetMapping("send") - public void sendMessage(@RequestParam String message, + public void sendMessage(@RequestParam String title, + @RequestParam String message, @RequestParam String groupId, @RequestParam String notific){ - sendMessage.send(message, groupId, notific); + sendMessage.send(title, message, groupId, notific); } } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/quartz/job/DatabaseJob.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/quartz/job/DatabaseJob.java index ce0f4e70..4b4a2332 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/quartz/job/DatabaseJob.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/quartz/job/DatabaseJob.java @@ -113,7 +113,7 @@ public class DatabaseJob extends Monitor implements Job{ // 发送报警信息 String groupId = alarmRule.getContactId(); String notific = alarmRule.getNotification(); - getSendMessage().send(message, groupId, notific); + getSendMessage().send("Database Monitor Warn Message", message, groupId, notific); } } catch (JsonProcessingException e) { log.error("Database预警规则: {}解析失败,失败原因: {}", operator, e.getMessage()); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/quartz/job/EmailJob.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/quartz/job/EmailJob.java index 25408dae..64f8f5dc 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/quartz/job/EmailJob.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/quartz/job/EmailJob.java @@ -99,7 +99,7 @@ public class EmailJob extends Monitor implements Job{ // 发送报警信息 String groupId = alarmRule.getContactId(); String notific = alarmRule.getNotification(); - getSendMessage().send(message, groupId, notific); + getSendMessage().send("Email Monitor Warn Message", message, groupId, notific); } } catch (JsonProcessingException e) { log.error("Email预警规则: {}解析失败,失败原因: {}", operator, e.getMessage()); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/quartz/job/ServerJob.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/quartz/job/ServerJob.java index 70904d81..73f79586 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/quartz/job/ServerJob.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/quartz/job/ServerJob.java @@ -112,7 +112,7 @@ public class ServerJob extends Monitor implements Job { // 发送报警信息 String groupId = alarmRule.getContactId(); String notific = alarmRule.getNotification(); - getSendMessage().send(message, groupId, notific); + getSendMessage().send("Server Monitor Warn Message", message, groupId, notific); } } catch (JsonProcessingException e) { log.error("Server预警规则: {}解析失败,失败原因: {}", operator, e.getMessage());