Merge remote-tracking branch 'origin/jtdev' into jtdev

ke

2024-08-27 f73dbcd6c21d28ab1e98840eee73c6d09bd0f929

 skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/NoticeHandle.java

@@ -1003,6 +1003,8 @@
         messageRecord.setSender(AuthUtil.getUserId().toString());
         messageRecord.setSource("智能告警");
         messageRecord.setStatus(0);
         messageRecord.setAlarmRuleId(alarmRule.getId());
         messageRecord.setTemplateId(smsTemplate.getTemplateId());
         // 设置告警记录信息
         AlarmRecordDetail alarmRecordDetail = new AlarmRecordDetail();
         alarmRecordDetail.setReservoirNumber(list.get(0));
@@ -1087,6 +1089,8 @@
         messageRecord.setSource("智能告警");
         messageRecord.setStatus(0);
         messageRecord.setRecipient(phone);
         messageRecord.setTemplateId(smsTemplate.getTemplateId());
         messageRecord.setAlarmRuleId(alarmRule.getId());


         StringBuilder builder = new StringBuilder();
@@ -1165,6 +1169,8 @@
         messageRecord.setSource("智能告警");
         messageRecord.setStatus(0);
         messageRecord.setRecipient(phone);
         messageRecord.setTemplateId(smsTemplate.getTemplateId());
         messageRecord.setAlarmRuleId(alarmRule.getId());

         List<String> resCdList = new ArrayList<>();
         Map<String, List<Temp>> resCollect = temps.stream().collect(Collectors.groupingBy(Temp::getReservoirCode));
@@ -1237,6 +1243,8 @@
         messageRecord.setSource("智能告警");
         messageRecord.setStatus(0);
         messageRecord.setRecipient(phone);
         messageRecord.setTemplateId(smsTemplate.getTemplateId());
         messageRecord.setAlarmRuleId(alarmRule.getId());
         List<String> contentList = new ArrayList<>();
         //因为只能按编号分组，名称会有重复，所以拿第一条数据的名称就行
         temps.forEach(info -> {