From d6e5d8b88c2cea6e05e249105e585cad9f6082dd Mon Sep 17 00:00:00 2001
From: zrj <646384940@qq.com>
Date: Mon, 02 Sep 2024 15:34:30 +0800
Subject: [PATCH] 水雨情告警合并发送内容调整
---
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/AsyncNoticeHandle.java | 90 ++++++++++++++++++++++----------------------
1 files changed, 45 insertions(+), 45 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/AsyncNoticeHandle.java b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/AsyncNoticeHandle.java
index b9f7128..29087b9 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/AsyncNoticeHandle.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/AsyncNoticeHandle.java
@@ -265,17 +265,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(12), String.format("%.2f", Double.valueOf(list.get(9).replace("米", "")) - Double.valueOf(list.get(12)))
- );
- list.remove(12);
+// String remark = StringUtil.format("水位：{}\n汛限水位：{}米\n超汛限水位：{}米\n",
+// list.get(9), list.get(12), String.format("%.2f", Double.valueOf(list.get(9).replace("米", "")) - Double.valueOf(list.get(12)))
+// );
+// list.remove(12);
// 保存告警记录信息
- AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid, remark);
+ AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid, null);
if (null != alarmRecord) {
list.add(alarmRecord.getId().toString());
}
@@ -319,17 +319,17 @@
if (smsRequestTemplate.getPersonVOList().size() > 0) {
for (List<String> list : smsRequestTemplate.getTemplateContent()) {
// 依次拼接巡查责任人，技术责任人姓名联系电话
- noticeHandle.addPatrolTechnologyInfo(list, true);
+// noticeHandle.addPatrolTechnologyInfo(list, true);
// 拼接市县水利部人员姓名及联系方式
// noticeHandle.addCityCountyBusinessPersonInfo(list);
- String remark = StringUtil.format("水位：{}\n汛限水位：{}米\n超汛限水位：{}米\n",
- list.get(9), list.get(12), String.format("%.2f", Double.valueOf(list.get(9).replace("米", "")) - Double.valueOf(list.get(12)))
- );
- list.remove(12);
+// String remark = StringUtil.format("水位：{}\n汛限水位：{}米\n超汛限水位：{}米\n",
+// list.get(9), list.get(12), String.format("%.2f", Double.valueOf(list.get(9).replace("米", "")) - Double.valueOf(list.get(12)))
+// );
+// list.remove(12);
// 保存告警记录信息
- AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid, remark);
+ AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid, null);
if (null != alarmRecord) {
list.add(alarmRecord.getId().toString());
}
@@ -620,18 +620,18 @@
for (List<String> list : smsRequestTemplate.getTemplateContent()) {
- String remark = StringUtil.format("水位：{}\n设计洪水位：{}米\n超设计洪水位：{}米\n",
- list.get(9), list.get(13), String.format("%.2f", Double.valueOf(list.get(9).replace("米", "")) - Double.valueOf(list.get(13)))
- );
- list.remove(13);
+// String remark = StringUtil.format("水位：{}\n设计洪水位：{}米\n超设计洪水位：{}米\n",
+// list.get(9), list.get(13), String.format("%.2f", Double.valueOf(list.get(9).replace("米", "")) - Double.valueOf(list.get(13)))
+// );
+// list.remove(13);
// System.out.println(remark);
// 依次添加行政责任人,主管部门责任人,技术责任人,巡查责任人信息(姓名，联系电话)
- noticeHandle.addWaterMoreDesignPatrolTechnologyInfo(list, "1,2,4,5");
+// noticeHandle.addWaterMoreDesignPatrolTechnologyInfo(list, "1,2,4,5");
// 拼接市县水利部人员姓名及联系方式
noticeHandle.addCityCountyBusinessPersonInfo(list);
// 保存告警记录信息
- AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid, remark);
+ AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid, null);
if (null != alarmRecord) {
list.add(alarmRecord.getId().toString());
}
@@ -720,16 +720,16 @@
for (List<String> list : smsRequestTemplate.getTemplateContent()) {
// 依次添加行政责任人,主管部门责任人,技术责任人,巡查责任人信息(姓名，联系电话)
- noticeHandle.addWaterMoreDesignPatrolTechnologyInfo(list, "1,2,4,5");
+// noticeHandle.addWaterMoreDesignPatrolTechnologyInfo(list, "1,2,4,5");
// 拼接市县水利部人员姓名及联系方式
noticeHandle.addCityCountyBusinessPersonInfo(list);
- String remark = StringUtil.format("水位：{}\n校核洪水位：{}米\n{}米\n",
- list.get(9), list.get(10), list.get(11)
- );
+// String remark = StringUtil.format("水位：{}\n校核洪水位：{}米\n{}米\n",
+// list.get(9), list.get(10), list.get(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());
}
@@ -815,18 +815,18 @@
if (smsRequestTemplate.getPersonVOList().size() > 0) {
for (List<String> list : smsRequestTemplate.getTemplateContent()) {
// 依次添加行巡查责任人,技术责任人信息(姓名)
- noticeHandle.addPatrolTechnologyInfo(list, false);
+// noticeHandle.addPatrolTechnologyInfo(list, false);
// // 依次添加行巡查责任人,技术责任人信息,主管部门责任人(姓名)
// noticeHandle.addPatrolTechnologyInfoNew(list, false);
// 拼接市县水利部人员姓名及联系方式
noticeHandle.addCityCountyBusinessPersonInfo(list);
- String remark = StringUtil.format("近1h水位陡升：{}\n",
- list.get(10)
- );
+// String remark = StringUtil.format("近1h水位陡升：{}\n",
+// list.get(10)
+// );
// 保存告警记录信息
- AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid, remark);
+ AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid, null);
if (null != alarmRecord) {
list.add(alarmRecord.getId().toString());
}
@@ -869,16 +869,16 @@
for (List<String> list : smsRequestTemplate.getTemplateContent()) {
// 依次添加行巡查责任人,技术责任人信息(姓名)
- noticeHandle.addPatrolTechnologyInfo(list, false);
+// noticeHandle.addPatrolTechnologyInfo(list, false);
// // 拼接市县水利部人员姓名及联系方式
noticeHandle.addCityCountyBusinessPersonInfo(list);
- String remark = StringUtil.format("近1h水位陡降：{}\n",
- list.get(10)
- );
+// String remark = StringUtil.format("近1h水位陡降：{}\n",
+// list.get(10)
+// );
// 保存告警记录信息
- AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid, remark);
+ AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid, null);
if (null != alarmRecord) {
list.add(alarmRecord.getId().toString());
}
@@ -921,13 +921,13 @@
for (List<String> list : smsRequestTemplate.getTemplateContent()) {
// 依次添加巡查责任人技术责任人信息姓名
- noticeHandle.addPatrolTechnologyInfo(list, false);
+// noticeHandle.addPatrolTechnologyInfo(list, false);
// 拼接市县水利部人员姓名及联系方式
noticeHandle.addCityCountyBusinessPersonInfo(list);
- String remark = list.get(9);
+// String remark = list.get(9);
// 保存告警记录信息
- AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid, remark);
+ AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid, null);
if (null != alarmRecord) {
list.add(alarmRecord.getId().toString());
}
@@ -970,14 +970,14 @@
for (List<String> list : smsRequestTemplate.getTemplateContent()) {
// 依次添加巡查责任人技术责任人信息姓名
- noticeHandle.addPatrolTechnologyInfo(list, false);
+// noticeHandle.addPatrolTechnologyInfo(list, false);
// 拼接市县水利部人员姓名及联系方式
noticeHandle.addCityCountyBusinessPersonInfo(list);
- String remark = list.get(9);
+// String remark = list.get(9);
// 保存告警记录信息
- AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid, remark);
+ AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid, null);
if (null != alarmRecord) {
list.add(alarmRecord.getId().toString());
}
@@ -1021,16 +1021,16 @@
// 依次添加行政责任人,主管部门责任人,技术责任人,巡查责任人信息(姓名，联系电话)
// noticeHandle.addWaterMoreDesignPatrolTechnologyInfo(list, "1,2,4,5");
// 主管部门责任人,技术责任人,巡查责任人信息 2024-05-29修改
- noticeHandle.addWaterMoreDesignPatrolTechnologyInfoNew(list, "2,4,5");
+// noticeHandle.addWaterMoreDesignPatrolTechnologyInfoNew(list, "2,4,5");
// 拼接市县水利部人员姓名及联系方式
noticeHandle.addCityCountyBusinessPersonInfo(list);
- String remark = StringUtil.format("降雨：{}\n",
- list.get(6) + "毫米"
- );
+// String remark = StringUtil.format("降雨：{}\n",
+// list.get(6) + "毫米"
+// );
// 保存告警记录信息
- AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid, remark);
+ AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid, null);
if (null != alarmRecord) {
list.add(alarmRecord.getId().toString());
}
@@ -2432,7 +2432,7 @@
*
* @param alarmRule 告警规则
* @param alarmRuleDetail 告警规则详情
- * @param ztData 中台数据
+ * @param data 中台数据
* @param columnList 需要展示的数据字段
* @param flag 是否显示日期
* @param adCode 行政区划
--
Gitblit v1.9.3