zrj
2024-07-11 6e4c8d00a3e745fdb910c2325840e3b88f634d21
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/AsyncNoticeHandle.java
@@ -508,9 +508,12 @@
      if (smsRequestTemplate.getPersonVOList().size() > 0) {
         for (List<String> list : smsRequestTemplate.getTemplateContent()) {
            // 拼接市县水利部人员姓名及联系方式
            noticeHandle.addCityCountyBusinessPersonInfo(list);
//            noticeHandle.addCityCountyBusinessPersonInfo(list);
            String remark = StringUtil.format("降雨:{}\n",
               list.get(6) + "毫米"
            );
            // 保存告警记录信息
            AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid);
            AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid, remark);
            if (null != alarmRecord) {
               list.add(alarmRecord.getId().toString());
            }
@@ -994,7 +997,9 @@
            // 拼接市县水利部人员姓名及联系方式
            noticeHandle.addCityCountyBusinessPersonInfo(list);
            String remark = list.get(9);
            String remark = StringUtil.format("降雨:{}\n",
               list.get(6) + "毫米"
            );
            // 保存告警记录信息
            AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid, remark);
@@ -1915,7 +1920,7 @@
            // 拼接市县水利部人员姓名及联系方式
            noticeHandle.addCityCountyBusinessPersonInfo(list);
            String remark = StringUtil.format("de_val:{}\ndn_val:{}\ndu_value:{}\n",
            String remark = StringUtil.format("上下游:{}\n左右岸:{}\n垂直位移:{}\n",
               list.get(13), list.get(14), list.get(15)
            );
            list.remove(13);
@@ -1999,7 +2004,7 @@
            // 拼接市县水利部人员姓名及联系方式
            noticeHandle.addCityCountyBusinessPersonInfo(list);
            String remark = StringUtil.format("de_val:{}\ndn_val:{}\ndu_value:{}\n",
            String remark = StringUtil.format("上下游:{}\n左右岸:{}\n垂直位移:{}\n",
               list.get(13), list.get(14), list.get(15)
            );
            list.remove(13);
@@ -2044,8 +2049,16 @@
            noticeHandle.addPatrolTechnologyInfo(list, false);
            // 拼接市县水利部人员姓名及联系方式
            noticeHandle.addCityCountyBusinessPersonInfo(list);
            String remark = StringUtil.format("上下游:{}\n左右岸:{}\n垂直位移:{}\n",
               list.get(13), list.get(14), list.get(15)
            );
            list.remove(13);
            list.remove(14);
            list.remove(15);
            // 保存告警记录信息
            AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid);
            AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid, remark);
            if (null != alarmRecord) {
               list.add(alarmRecord.getId().toString());
            }
@@ -2082,8 +2095,16 @@
            noticeHandle.addPatrolTechnologyInfo(list, false);
            // 拼接市县水利部人员姓名及联系方式
            noticeHandle.addCityCountyBusinessPersonInfo(list);
            String remark = StringUtil.format("上下游:{}\n左右岸:{}\n垂直位移:{}\n",
               list.get(13), list.get(14), list.get(15)
            );
            list.remove(13);
            list.remove(14);
            list.remove(15);
            // 保存告警记录信息
            AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid);
            AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid, remark);
            if (null != alarmRecord) {
               list.add(alarmRecord.getId().toString());
            }