From 53ef071c512a8c0681e0f629716992e4c6389383 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Sat, 25 May 2024 15:57:09 +0800
Subject: [PATCH] 大坝监测渗压告警增加明细
---
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/AsyncNoticeHandle.java | 67 +++++++++++++++++++++++++++++----
1 files changed, 59 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 bd59ecc..f48e811 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
@@ -1137,6 +1137,11 @@
// 拼接后面内容
if (smsRequestTemplate.getPersonVOList().size() > 0) {
for (List<String> list : smsRequestTemplate.getTemplateContent()) {
+
+ String remark = StringUtil.format("渗压水位：{}\n管底高程：{}\n",
+ list.get(3), String.format("%.2f", Double.valueOf(list.get(11)) + Double.valueOf(list.get(12)))
+ );
+// System.out.println(remark);
// 保存告警记录信息
AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid);
if (null != alarmRecord) {
@@ -1170,6 +1175,11 @@
// 拼接后面内容
if (smsRequestTemplate.getPersonVOList().size() > 0) {
for (List<String> list : smsRequestTemplate.getTemplateContent()) {
+
+ String remark = StringUtil.format("渗压水位：{}\n管底高程：{}\n",
+ list.get(3), String.format("%.2f", Double.valueOf(list.get(11)) + Double.valueOf(list.get(12)))
+ );
+// System.out.println(remark);
// 保存告警记录信息
AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid);
if (null != alarmRecord) {
@@ -1204,14 +1214,18 @@
// 拼接后面内容
if (smsRequestTemplate.getPersonVOList().size() > 0) {
for (List<String> list : smsRequestTemplate.getTemplateContent()) {
+
+ String remark = StringUtil.format("渗压水位：{}\n管口高程：{}\n",
+ list.get(11), list.get(12)
+ );
// 保存告警记录信息
- AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid);
+ AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid, remark);
if (null != alarmRecord) {
list.add(alarmRecord.getId().toString());
}
}
if (isDay.equals("day")) return map;
- map = smsService.sendSignMsg(smsRequestTemplate);
+// map = smsService.sendSignMsg(smsRequestTemplate);
// 调用短信服务
return map;
}
@@ -1237,8 +1251,12 @@
// 拼接后面内容
if (smsRequestTemplate.getPersonVOList().size() > 0) {
for (List<String> list : smsRequestTemplate.getTemplateContent()) {
+
+ String remark = StringUtil.format("渗压水位：{}\n管口高程：{}\n",
+ list.get(11), list.get(12)
+ );
// 保存告警记录信息
- AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid);
+ AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid, remark);
if (null != alarmRecord) {
list.add(alarmRecord.getId().toString());
}
@@ -1304,8 +1322,14 @@
// 拼接后面内容
if (smsRequestTemplate.getPersonVOList().size() > 0) {
for (List<String> list : smsRequestTemplate.getTemplateContent()) {
+
+ String remark = StringUtil.format("渗压水位：{}\n坝顶高程：{}\n",
+ list.get(11), 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());
}
@@ -1372,8 +1396,12 @@
// 拼接后面内容
if (smsRequestTemplate.getPersonVOList().size() > 0) {
for (List<String> list : smsRequestTemplate.getTemplateContent()) {
+
+ String remark = StringUtil.format("渗压水位：{}\n库水位：{}\n",
+ list.get(11), list.get(12)
+ );
// 保存告警记录信息
- AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid);
+ AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid, remark);
if (null != alarmRecord) {
list.add(alarmRecord.getId().toString());
}
@@ -1800,10 +1828,19 @@
for (List<String> list : smsRequestTemplate.getTemplateContent()) {
// 依次添加行巡查责任人,技术责任人信息(姓名)
noticeHandle.addPatrolTechnologyInfo(list, false);
+
// 拼接市县水利部人员姓名及联系方式
noticeHandle.addCityCountyBusinessPersonInfo(list);
+
+ String remark = StringUtil.format("de_val：{}\ndn_val：{}\ndu_value：{}\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());
}
@@ -1878,8 +1915,16 @@
noticeHandle.addPatrolTechnologyInfo(list, false);
// 拼接市县水利部人员姓名及联系方式
noticeHandle.addCityCountyBusinessPersonInfo(list);
+
+ String remark = StringUtil.format("de_val：{}\ndn_val：{}\ndu_value：{}\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());
}
@@ -2113,8 +2158,14 @@
noticeHandle.addPatrolTechnologyInfo(list, false);
// 拼接市县水利部人员姓名及联系方式
noticeHandle.addCityCountyBusinessPersonInfo(list);
+
+ String remark = StringUtil.format("当前：{}\n一日：{}\n二日：{}\n",
+ list.get(11), list.get(12), list.get(13)
+ );
+ list.remove(12);
+ 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());
}
--
Gitblit v1.9.3