水位初次超汛告警合并发送内容调整

zrj

2024-09-02 61a1d1977ce7c15ba5aa0064c35e48bec41064c9

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

@@ -208,17 +208,17 @@
      if (smsRequestTemplate.getPersonVOList().size() > 0) {
         for (List<String> list : smsRequestTemplate.getTemplateContent()) {
            // 依次拼接巡查责任人，技术责任人姓名
            noticeHandle.addPatrolTechnologyInfo(list, false);
//            noticeHandle.addPatrolTechnologyInfo(list, false);
            // 拼接市县水利部人员姓名及联系方式
            noticeHandle.addCityCountyBusinessPersonInfo(list);

            String remark = StringUtil.format("水位：{}\n汛限水位：{}米\n超汛限水位：{}米\n",
               list.get(9), list.get(11), String.format("%.2f", Double.valueOf(list.get(9).replace("米", "")) - Double.valueOf(list.get(11)))
            );
            list.remove(11);
//            String remark = StringUtil.format("水位：{}\n汛限水位：{}米\n超汛限水位：{}米\n",
//               list.get(9), list.get(11), String.format("%.2f", Double.valueOf(list.get(9).replace("米", "")) - Double.valueOf(list.get(11)))
//            );
//            list.remove(11);

            // 保存告警记录信息
            AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid, remark);
            AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid, null);
            if (null != alarmRecord) {
               list.add(alarmRecord.getId().toString());
            }