From 6e4c8d00a3e745fdb910c2325840e3b88f634d21 Mon Sep 17 00:00:00 2001
From: zrj <646384940@qq.com>
Date: Thu, 11 Jul 2024 09:19:59 +0800
Subject: [PATCH] 大雨。暴雨预警参数修改
---
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/AsyncNoticeHandle.java | 92 ++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 84 insertions(+), 8 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 2d1eff2..d9df36b 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
@@ -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());
}
@@ -789,6 +792,8 @@
for (List<String> list : smsRequestTemplate.getTemplateContent()) {
// 依次添加行巡查责任人,技术责任人信息(姓名)
noticeHandle.addPatrolTechnologyInfo(list, false);
+// // 依次添加行巡查责任人,技术责任人信息,主管部门责任人(姓名)
+// noticeHandle.addPatrolTechnologyInfoNew(list, false);
// 拼接市县水利部人员姓名及联系方式
noticeHandle.addCityCountyBusinessPersonInfo(list);
@@ -986,11 +991,15 @@
if (smsRequestTemplate.getPersonVOList().size() > 0) {
for (List<String> list : smsRequestTemplate.getTemplateContent()) {
// 依次添加行政责任人,主管部门责任人,技术责任人,巡查责任人信息(姓名，联系电话)
- noticeHandle.addWaterMoreDesignPatrolTechnologyInfo(list, "1,2,4,5");
+// noticeHandle.addWaterMoreDesignPatrolTechnologyInfo(list, "1,2,4,5");
+ // 主管部门责任人,技术责任人,巡查责任人信息 2024-05-29修改
+ noticeHandle.addWaterMoreDesignPatrolTechnologyInfoNew(list, "2,4,5");
// 拼接市县水利部人员姓名及联系方式
noticeHandle.addCityCountyBusinessPersonInfo(list);
- String remark = list.get(9);
+ String remark = StringUtil.format("降雨：{}\n",
+ list.get(6) + "毫米"
+ );
// 保存告警记录信息
AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid, remark);
@@ -1911,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);
@@ -1995,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);
@@ -2040,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());
}
@@ -2078,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());
}
@@ -2371,4 +2396,55 @@
}
return map;
}
+
+ /**
+ * 策略42 站内信----- 超防洪高水位告警
+ *
+ * @param alarmRule 告警规则
+ * @param alarmRuleDetail 告警规则详情
+ * @param ztData 中台数据
+ * @param columnList 需要展示的数据字段
+ * @param flag 是否显示日期
+ * @param adCode 行政区划
+ * @param isSendStation 是否站内信
+ * @param uuid 随机生成id
+ * @return
+ */
+ public void topLevOfFloAlertHandleStation(AlarmRule alarmRule,
+ AlarmRuleDetail alarmRuleDetail,
+ JSONArray data,
+ List<String> columnList,
+ boolean flag,
+ String adCode,
+ boolean isSendStation,
+ String uuid,
+ String isDay
+ ) {
+ SmsRequestTemplate smsRequestTemplate
+ = noticeHandle.getSendSmsTemplate(data, alarmRule, alarmRuleDetail, columnList, flag, adCode, uuid, isSendStation);
+ // 拼接后面内容
+ if (smsRequestTemplate.getPersonVOList().size() > 0) {
+ 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);
+ System.out.println(remark);
+ // 依次添加行政责任人,主管部门责任人,技术责任人,巡查责任人信息(姓名，联系电话)
+ noticeHandle.addWaterMoreDesignPatrolTechnologyInfo(list, "1,2,4,5");
+ // 拼接市县水利部人员姓名及联系方式
+ noticeHandle.addCityCountyBusinessPersonInfo(list);
+ // 保存告警记录信息
+ AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid,remark);
+ if (null != alarmRecord) {
+ list.add(alarmRecord.getId().toString());
+ }
+ }
+
+ //如果参数是day，表示是每天生成告警，不需要发信息
+ if (isDay.equals("day")) return;
+ // 保存站内信记录信息
+ noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
+ }
+ }
}
--
Gitblit v1.9.3