From 1da24e4ebc87e7cd5a0851030b924898dfb7394e Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Wed, 29 May 2024 17:09:20 +0800
Subject: [PATCH] 保存预警明细
---
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/AsyncNoticeHandle.java | 111 +++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 95 insertions(+), 16 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 f48e811..2d1eff2 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
@@ -99,8 +99,16 @@
// 后面依次拼接市县水利部门人员姓名电话
// 拼接市县水利部人员姓名及联系方式
noticeHandle.addCityCountyBusinessPersonInfo(list);
+
+ String remark = StringUtil.format("水位：{}\n死水位：{}米\n超低于死水位：{}米\n",
+ list.get(9),
+ String.format("%.2f", Double.valueOf(list.get(9).replace("米", "")) - Double.valueOf(list.get(10))),
+ list.get(10)
+ );
+ list.remove(10);
+
// 保存告警记录信息
- AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid);
+ AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid, remark);
if (null != alarmRecord) {
list.add(alarmRecord.getId().toString());
}
@@ -145,8 +153,14 @@
noticeHandle.addPatrolTechnologyInfo(list, false);
// 拼接市县水利部人员姓名及联系方式
noticeHandle.addCityCountyBusinessPersonInfo(list);
+
+ 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);
+
// 保存告警记录信息
- AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid);
+ AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid, remark);
if (null != alarmRecord) {
list.add(alarmRecord.getId().toString());
}
@@ -189,8 +203,14 @@
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);
+
// 保存告警记录信息
- AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid);
+ AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid, remark);
if (null != alarmRecord) {
list.add(alarmRecord.getId().toString());
}
@@ -237,8 +257,14 @@
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);
+
// 保存告警记录信息
- AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid);
+ AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid, remark);
if (null != alarmRecord) {
list.add(alarmRecord.getId().toString());
}
@@ -284,8 +310,14 @@
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);
+
// 保存告警记录信息
- AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid);
+ AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid, remark);
if (null != alarmRecord) {
list.add(alarmRecord.getId().toString());
}
@@ -331,8 +363,14 @@
noticeHandle.addPatrolTechnologyInfo(list, false);
// 拼接市县水利部人员姓名及联系方式
noticeHandle.addCityCountyBusinessPersonInfo(list);
+
+ 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);
+
// 保存告警记录信息
- AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid);
+ AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid, remark);
if (null != alarmRecord) {
list.add(alarmRecord.getId().toString());
}
@@ -376,14 +414,20 @@
for (List<String> list : smsRequestTemplate.getTemplateContent()) {
// 依次拼接巡查责任人，技术责任人姓名联系电话
noticeHandle.addPatrolTechnologyInfo(list, true);
+
+ 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);
+ AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid, remark);
if (null != alarmRecord) {
list.add(alarmRecord.getId().toString());
}
}
// 调用短信服务
- map = smsService.sendSignMsg(smsRequestTemplate);
+// map = smsService.sendSignMsg(smsRequestTemplate);
return map;
}
return map;
@@ -551,12 +595,20 @@
// 拼接后面内容
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);
+ AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid, remark);
if (null != alarmRecord) {
list.add(alarmRecord.getId().toString());
}
@@ -641,12 +693,18 @@
// 拼接后面内容
if (smsRequestTemplate.getPersonVOList().size() > 0) {
for (List<String> list : smsRequestTemplate.getTemplateContent()) {
+
// 依次添加行政责任人,主管部门责任人,技术责任人,巡查责任人信息(姓名，联系电话)
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)
+ );
+
// 保存告警记录信息
- AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid);
+ AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid, remark);
if (null != alarmRecord) {
list.add(alarmRecord.getId().toString());
}
@@ -733,8 +791,13 @@
noticeHandle.addPatrolTechnologyInfo(list, false);
// 拼接市县水利部人员姓名及联系方式
noticeHandle.addCityCountyBusinessPersonInfo(list);
+
+ String remark = StringUtil.format("近1h水位陡升：{}\n",
+ list.get(10)
+ );
+
// 保存告警记录信息
- AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid);
+ AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid, remark);
if (null != alarmRecord) {
list.add(alarmRecord.getId().toString());
}
@@ -774,12 +837,18 @@
// 拼接后面内容
if (smsRequestTemplate.getPersonVOList().size() > 0) {
for (List<String> list : smsRequestTemplate.getTemplateContent()) {
+
// 依次添加行巡查责任人,技术责任人信息(姓名)
noticeHandle.addPatrolTechnologyInfo(list, false);
- // 拼接市县水利部人员姓名及联系方式
+// // 拼接市县水利部人员姓名及联系方式
noticeHandle.addCityCountyBusinessPersonInfo(list);
+
+ String remark = StringUtil.format("近1h水位陡降：{}\n",
+ list.get(10)
+ );
+
// 保存告警记录信息
- AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid);
+ AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid, remark);
if (null != alarmRecord) {
list.add(alarmRecord.getId().toString());
}
@@ -819,12 +888,15 @@
// 拼接后面内容
if (smsRequestTemplate.getPersonVOList().size() > 0) {
for (List<String> list : smsRequestTemplate.getTemplateContent()) {
+
// 依次添加巡查责任人技术责任人信息姓名
noticeHandle.addPatrolTechnologyInfo(list, false);
// 拼接市县水利部人员姓名及联系方式
noticeHandle.addCityCountyBusinessPersonInfo(list);
+
+ String remark = list.get(9);
// 保存告警记录信息
- AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid);
+ AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid, remark);
if (null != alarmRecord) {
list.add(alarmRecord.getId().toString());
}
@@ -864,12 +936,16 @@
// 拼接后面内容
if (smsRequestTemplate.getPersonVOList().size() > 0) {
for (List<String> list : smsRequestTemplate.getTemplateContent()) {
+
// 依次添加巡查责任人技术责任人信息姓名
noticeHandle.addPatrolTechnologyInfo(list, false);
// 拼接市县水利部人员姓名及联系方式
noticeHandle.addCityCountyBusinessPersonInfo(list);
+
+ String remark = list.get(9);
+
// 保存告警记录信息
- AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid);
+ AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid, remark);
if (null != alarmRecord) {
list.add(alarmRecord.getId().toString());
}
@@ -913,8 +989,11 @@
noticeHandle.addWaterMoreDesignPatrolTechnologyInfo(list, "1,2,4,5");
// 拼接市县水利部人员姓名及联系方式
noticeHandle.addCityCountyBusinessPersonInfo(list);
+
+ String remark = list.get(9);
+
// 保存告警记录信息
- AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid);
+ AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid, remark);
if (null != alarmRecord) {
list.add(alarmRecord.getId().toString());
}
--
Gitblit v1.9.3