From 08a962d2925baa255207fdf979e6fee794f1773b Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Fri, 19 Jul 2024 12:25:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/AsyncNoticeHandle.java | 430 ++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 341 insertions(+), 89 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 bb68d80..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
@@ -11,6 +11,7 @@
import cn.gistack.resource.vo.AlertTextualResearchAttachVO;
import cn.gistack.sm.intelligentCall.feign.OutCallClient;
import com.alibaba.fastjson.JSONArray;
+import org.springblade.core.tool.utils.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Component;
@@ -98,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());
}
@@ -144,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());
}
@@ -188,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());
}
@@ -236,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());
}
@@ -283,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());
}
@@ -330,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());
}
@@ -375,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;
@@ -463,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());
}
@@ -550,12 +598,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());
}
@@ -640,12 +696,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());
}
@@ -730,10 +792,17 @@
for (List<String> list : smsRequestTemplate.getTemplateContent()) {
// 依次添加行巡查责任人,技术责任人信息(姓名)
noticeHandle.addPatrolTechnologyInfo(list, false);
+// // 依次添加行巡查责任人,技术责任人信息,主管部门责任人(姓名)
+// noticeHandle.addPatrolTechnologyInfoNew(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());
}
@@ -773,12 +842,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());
}
@@ -818,12 +893,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());
}
@@ -863,12 +941,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());
}
@@ -909,11 +991,18 @@
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 = 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());
}
@@ -1005,9 +1094,9 @@
}
//如果参数是day，表示是每天生成告警，不需要发信息
if (isDay.equals("day")) return map;
- map = smsService.sendSignMsgMergeCd(smsRequestTemplate);
- // 调用短信服务
- return map;
+ map = smsService.sendSignMsgMergeCd(smsRequestTemplate);
+ // 调用短信服务
+ return map;
}
return map;
@@ -1034,8 +1123,8 @@
//如果参数是day，表示是每天生成告警，不需要发信息
if (isDay.equals("day")) return;
- // 保存站内信记录信息
- noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
+ // 保存站内信记录信息
+ noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
}
}
@@ -1058,8 +1147,8 @@
}
//如果参数是day，表示是每天生成告警，不需要发信息
if (isDay.equals("day")) return;
- // 需要合并水库保存站内信记录信息
- noticeHandle.saveInStationInfoMerge(smsRequestTemplate, alarmRule);
+ // 需要合并水库保存站内信记录信息
+ noticeHandle.saveInStationInfoMerge(smsRequestTemplate, alarmRule);
}
}
@@ -1082,9 +1171,9 @@
}
//如果参数是day，表示是每天生成告警，不需要发信息
if (isDay.equals("day")) return map;
- map = smsService.sendSignMsgMergeCd(smsRequestTemplate);
- // 调用短信服务
- return map;
+ map = smsService.sendSignMsgMergeCd(smsRequestTemplate);
+ // 调用短信服务
+ return map;
}
return map;
@@ -1092,7 +1181,7 @@
//渗压资料缺失
- public Map<String, Object> damSafetySyDataMissingHandle(AlarmRule alarmRule, AlarmRuleDetail alarmRuleDetail, JSONArray data, List<String> columnList, boolean flag, String adCode, boolean isSendStation, String uuid,String isDay) {
+ public Map<String, Object> damSafetySyDataMissingHandle(AlarmRule alarmRule, AlarmRuleDetail alarmRuleDetail, JSONArray data, List<String> columnList, boolean flag, String adCode, boolean isSendStation, String uuid, String isDay) {
Map<String, Object> map = new HashMap<>();
// 只发短信，将发短信信息组装好
@@ -1107,7 +1196,7 @@
list.add(alarmRecord.getId().toString());
}
}
- if (isDay.equals("day"))return map;
+ if (isDay.equals("day")) return map;
map = smsService.sendSignMsg(smsRequestTemplate);
// 调用短信服务
return map;
@@ -1128,7 +1217,7 @@
* @param uuid 随机生成id
* @return
*/
- public Map<String, Object> damSafetySyLessThenPipeHandleSms(AlarmRule alarmRule, AlarmRuleDetail alarmRuleDetail, JSONArray data, List<String> columnList, boolean flag, String adCode, boolean isSendStation, String uuid,String isDay) {
+ public Map<String, Object> damSafetySyLessThenPipeHandleSms(AlarmRule alarmRule, AlarmRuleDetail alarmRuleDetail, JSONArray data, List<String> columnList, boolean flag, String adCode, boolean isSendStation, String uuid, String isDay) {
Map<String, Object> map = new HashMap<>();
// 只发短信，将发短信信息组装好
SmsRequestTemplate smsRequestTemplate
@@ -1136,13 +1225,18 @@
// 拼接后面内容
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) {
list.add(alarmRecord.getId().toString());
}
}
- if (isDay.equals("day"))return map;
+ if (isDay.equals("day")) return map;
map = smsService.sendSignMsg(smsRequestTemplate);
// 调用短信服务
return map;
@@ -1163,19 +1257,24 @@
* @param uuid 随机生成id
* @return
*/
- public void damSafetySyLessThenPipeHandleStation(AlarmRule alarmRule, AlarmRuleDetail alarmRuleDetail, JSONArray data, List<String> columnList, boolean flag, String adCode, boolean isSendStation, String uuid,String isDay) {
+ public void damSafetySyLessThenPipeHandleStation(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",
+ 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) {
list.add(alarmRecord.getId().toString());
}
}
- if (isDay.equals("day"))return;
+ if (isDay.equals("day")) return;
// 保存站内信记录信息
noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
}
@@ -1195,7 +1294,7 @@
* @param uuid 随机生成id
* @return
*/
- public Map<String, Object> damSafetySyHigherThenNozzleHandleSms(AlarmRule alarmRule, AlarmRuleDetail alarmRuleDetail, JSONArray data, List<String> columnList, boolean flag, String adCode, boolean isSendStation, String uuid,String isDay) {
+ public Map<String, Object> damSafetySyHigherThenNozzleHandleSms(AlarmRule alarmRule, AlarmRuleDetail alarmRuleDetail, JSONArray data, List<String> columnList, boolean flag, String adCode, boolean isSendStation, String uuid, String isDay) {
Map<String, Object> map = new HashMap<>();
// 只发短信，将发短信信息组装好
SmsRequestTemplate smsRequestTemplate
@@ -1203,14 +1302,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);
+ if (isDay.equals("day")) return map;
+// map = smsService.sendSignMsg(smsRequestTemplate);
// 调用短信服务
return map;
}
@@ -1230,19 +1333,23 @@
* @param uuid 随机生成id
* @return
*/
- public void damSafetySyHigherThenNozzleHandleStation(AlarmRule alarmRule, AlarmRuleDetail alarmRuleDetail, JSONArray data, List<String> columnList, boolean flag, String adCode, boolean isSendStation, String uuid,String isDay) {
+ public void damSafetySyHigherThenNozzleHandleStation(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",
+ 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;
+ if (isDay.equals("day")) return;
// 保存站内信记录信息
noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
}
@@ -1261,7 +1368,7 @@
* @param uuid 随机生成id
* @return
*/
- public Map<String, Object> damSafetySyHigherThenBdElevationHandleSms(AlarmRule alarmRule, AlarmRuleDetail alarmRuleDetail, JSONArray data, List<String> columnList, boolean flag, String adCode, boolean isSendStation, String uuid,String isDay) {
+ public Map<String, Object> damSafetySyHigherThenBdElevationHandleSms(AlarmRule alarmRule, AlarmRuleDetail alarmRuleDetail, JSONArray data, List<String> columnList, boolean flag, String adCode, boolean isSendStation, String uuid, String isDay) {
Map<String, Object> map = new HashMap<>();
// 只发短信，将发短信信息组装好
SmsRequestTemplate smsRequestTemplate
@@ -1275,7 +1382,7 @@
list.add(alarmRecord.getId().toString());
}
}
- if (isDay.equals("day"))return map;
+ if (isDay.equals("day")) return map;
map = smsService.sendSignMsg(smsRequestTemplate);
// 调用短信服务
return map;
@@ -1297,19 +1404,25 @@
* @param uuid 随机生成id
* @return
*/
- public void damSafetySyHigherThenBdElevationHandleStation(AlarmRule alarmRule, AlarmRuleDetail alarmRuleDetail, JSONArray data, List<String> columnList, boolean flag, String adCode, boolean isSendStation, String uuid,String isDay) {
+ public void damSafetySyHigherThenBdElevationHandleStation(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",
+ 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());
}
}
- if (isDay.equals("day"))return;
+ if (isDay.equals("day")) return;
// 保存站内信记录信息
noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
}
@@ -1329,7 +1442,7 @@
* @param uuid 随机生成id
* @return
*/
- public Map<String, Object> damSafetySyHigherThenWaterLevelHandleSms(AlarmRule alarmRule, AlarmRuleDetail alarmRuleDetail, JSONArray data, List<String> columnList, boolean flag, String adCode, boolean isSendStation, String uuid,String isDay) {
+ public Map<String, Object> damSafetySyHigherThenWaterLevelHandleSms(AlarmRule alarmRule, AlarmRuleDetail alarmRuleDetail, JSONArray data, List<String> columnList, boolean flag, String adCode, boolean isSendStation, String uuid, String isDay) {
Map<String, Object> map = new HashMap<>();
// 只发短信，将发短信信息组装好
SmsRequestTemplate smsRequestTemplate
@@ -1343,7 +1456,7 @@
list.add(alarmRecord.getId().toString());
}
}
- if (isDay.equals("day"))return map;
+ if (isDay.equals("day")) return map;
map = smsService.sendSignMsg(smsRequestTemplate);
// 调用短信服务
return map;
@@ -1365,19 +1478,23 @@
* @param uuid 随机生成id
* @return
*/
- public void damSafetySyHigherThenWaterLevelHandleStation(AlarmRule alarmRule, AlarmRuleDetail alarmRuleDetail, JSONArray data, List<String> columnList, boolean flag, String adCode, boolean isSendStation, String uuid,String isDay) {
+ public void damSafetySyHigherThenWaterLevelHandleStation(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",
+ 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;
+ if (isDay.equals("day")) return;
// 保存站内信记录信息
noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
}
@@ -1397,7 +1514,7 @@
* @param uuid 随机生成id
* @return
*/
- public Map<String, Object> damSafetySyYellowChangeHandleSms(AlarmRule alarmRule, AlarmRuleDetail alarmRuleDetail, JSONArray data, List<String> columnList, boolean flag, String adCode, boolean isSendStation, String uuid,String isDay) {
+ public Map<String, Object> damSafetySyYellowChangeHandleSms(AlarmRule alarmRule, AlarmRuleDetail alarmRuleDetail, JSONArray data, List<String> columnList, boolean flag, String adCode, boolean isSendStation, String uuid, String isDay) {
Map<String, Object> map = new HashMap<>();
// 只发短信，将发短信信息组装好
SmsRequestTemplate smsRequestTemplate
@@ -1411,7 +1528,7 @@
list.add(alarmRecord.getId().toString());
}
}
- if (isDay.equals("day"))return map;
+ if (isDay.equals("day")) return map;
map = smsService.sendSignMsg(smsRequestTemplate);
// 调用短信服务
return map;
@@ -1433,19 +1550,25 @@
* @param uuid 随机生成id
* @return
*/
- public void damSafetySyYellowChangeHandleStation(AlarmRule alarmRule, AlarmRuleDetail alarmRuleDetail, JSONArray data, List<String> columnList, boolean flag, String adCode, boolean isSendStation, String uuid,String isDay) {
+ public void damSafetySyYellowChangeHandleStation(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十日测值：{}\n三十日测值：{}\n" +
+ "二日变幅：{}\n五日变幅：{}\n十日变幅：{}\n三十日变幅：{}\n",
+ list.get(13), list.get(14), list.get(15), list.get(16), list.get(17),
+ list.get(18), list.get(19), list.get(20), list.get(21)
+ );
+// System.out.println(remark);
// 保存告警记录信息
- 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;
+ if (isDay.equals("day")) return;
// 保存站内信记录信息
noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
}
@@ -1465,7 +1588,7 @@
* @param uuid 随机生成id
* @return
*/
- public Map<String, Object> damSafetySyOrangeChangeHandleSms(AlarmRule alarmRule, AlarmRuleDetail alarmRuleDetail, JSONArray data, List<String> columnList, boolean flag, String adCode, boolean isSendStation, String uuid,String isDay) {
+ public Map<String, Object> damSafetySyOrangeChangeHandleSms(AlarmRule alarmRule, AlarmRuleDetail alarmRuleDetail, JSONArray data, List<String> columnList, boolean flag, String adCode, boolean isSendStation, String uuid, String isDay) {
Map<String, Object> map = new HashMap<>();
// 只发短信，将发短信信息组装好
SmsRequestTemplate smsRequestTemplate
@@ -1490,7 +1613,7 @@
list.add(alarmRecord.getId().toString());
}
}
- if (isDay.equals("day"))return map;
+ if (isDay.equals("day")) return map;
map = smsService.sendSignMsg(smsRequestTemplate);
// 调用短信服务
return map;
@@ -1512,7 +1635,7 @@
* @param uuid 随机生成id
* @return
*/
- public void damSafetySyOrangeChangeHandleStation(AlarmRule alarmRule, AlarmRuleDetail alarmRuleDetail, JSONArray data, List<String> columnList, boolean flag, String adCode, boolean isSendStation, String uuid,String isDay) {
+ public void damSafetySyOrangeChangeHandleStation(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);
// 拼接后面内容
@@ -1529,13 +1652,29 @@
noticeHandle.addPatrolTechnologyInfo(list, false);
// 拼接市县水利部人员姓名及联系方式
noticeHandle.addCityCountyBusinessPersonInfo(list);
+
+ String remark = StringUtil.format("一日测值：{}\n二日测值：{}\n五日测值：{}\n十日测值：{}\n三十日测值：{}\n" +
+ "二日变幅：{}\n五日变幅：{}\n十日变幅：{}\n三十日变幅：{}\n",
+ list.get(14), list.get(15), list.get(16), list.get(17), list.get(18),
+ list.get(19), list.get(20), list.get(21), list.get(22)
+ );
+ list.remove(14);
+ list.remove(15);
+ list.remove(16);
+ list.remove(17);
+ list.remove(18);
+ list.remove(19);
+ list.remove(20);
+ list.remove(21);
+ list.remove(22);
+// System.out.println(remark);
// 保存告警记录信息
- 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;
+ if (isDay.equals("day")) return;
// 保存站内信记录信息
noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
}
@@ -1555,7 +1694,7 @@
* @param uuid 随机生成id
* @return
*/
- public Map<String, Object> damSafetySyRedChangeHandleSms(AlarmRule alarmRule, AlarmRuleDetail alarmRuleDetail, JSONArray data, List<String> columnList, boolean flag, String adCode, boolean isSendStation, String uuid,String isDay) {
+ public Map<String, Object> damSafetySyRedChangeHandleSms(AlarmRule alarmRule, AlarmRuleDetail alarmRuleDetail, JSONArray data, List<String> columnList, boolean flag, String adCode, boolean isSendStation, String uuid, String isDay) {
Map<String, Object> map = new HashMap<>();
// 只发短信，将发短信信息组装好
SmsRequestTemplate smsRequestTemplate
@@ -1573,7 +1712,7 @@
list.add(alarmRecord.getId().toString());
}
}
- if (isDay.equals("day"))return map;
+ if (isDay.equals("day")) return map;
map = smsService.sendSignMsg(smsRequestTemplate);
// 调用短信服务
return map;
@@ -1595,7 +1734,7 @@
* @param uuid 随机生成id
* @return
*/
- public void damSafetySyRedChangeHandleStation(AlarmRule alarmRule, AlarmRuleDetail alarmRuleDetail, JSONArray data, List<String> columnList, boolean flag, String adCode, boolean isSendStation, String uuid,String isDay) {
+ public void damSafetySyRedChangeHandleStation(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);
// 拼接后面内容
@@ -1605,13 +1744,28 @@
noticeHandle.addPatrolTechnologyInfo(list, false);
// 拼接市县水利部人员姓名及联系方式
noticeHandle.addCityCountyBusinessPersonInfo(list);
+
+ String remark = StringUtil.format("一日测值：{}\n二日测值：{}\n五日测值：{}\n十日测值：{}\n三十日测值：{}\n" +
+ "二日变幅：{}\n五日变幅：{}\n十日变幅：{}\n三十日变幅：{}\n",
+ list.get(14), list.get(15), list.get(16), list.get(17), list.get(18),
+ list.get(19), list.get(20), list.get(21), list.get(22)
+ );
+ list.remove(14);
+ list.remove(15);
+ list.remove(16);
+ list.remove(17);
+ list.remove(18);
+ list.remove(19);
+ list.remove(20);
+ list.remove(21);
+ list.remove(22);
// 保存告警记录信息
- 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;
+ if (isDay.equals("day")) return;
// 保存站内信记录信息
noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
}
@@ -1630,7 +1784,7 @@
* @param uuid 随机生成id
* @return
*/
- public Map<String, Object> damSafetySyRz1hChangeHandleSms(AlarmRule alarmRule, AlarmRuleDetail alarmRuleDetail, JSONArray data, List<String> columnList, boolean flag, String adCode, boolean isSendStation, String uuid,String isDay) {
+ public Map<String, Object> damSafetySyRz1hChangeHandleSms(AlarmRule alarmRule, AlarmRuleDetail alarmRuleDetail, JSONArray data, List<String> columnList, boolean flag, String adCode, boolean isSendStation, String uuid, String isDay) {
Map<String, Object> map = new HashMap<>();
// 只发短信，将发短信信息组装好
SmsRequestTemplate smsRequestTemplate
@@ -1642,13 +1796,14 @@
noticeHandle.addPatrolTechnologyInfo(list, false);
// 拼接市县水利部人员姓名及联系方式
noticeHandle.addCityCountyBusinessPersonInfo(list);
+
// 保存告警记录信息
AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid);
if (null != alarmRecord) {
list.add(alarmRecord.getId().toString());
}
}
- if (isDay.equals("day"))return map;
+ if (isDay.equals("day")) return map;
map = smsService.sendSignMsg(smsRequestTemplate);
// 调用短信服务
return map;
@@ -1670,7 +1825,7 @@
* @param uuid 随机生成id
* @return
*/
- public void damSafetySyRz1hChangeHandleStation(AlarmRule alarmRule, AlarmRuleDetail alarmRuleDetail, JSONArray data, List<String> columnList, boolean flag, String adCode, boolean isSendStation, String uuid,String isDay) {
+ public void damSafetySyRz1hChangeHandleStation(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);
// 拼接后面内容
@@ -1680,13 +1835,20 @@
noticeHandle.addPatrolTechnologyInfo(list, false);
// 拼接市县水利部人员姓名及联系方式
noticeHandle.addCityCountyBusinessPersonInfo(list);
+
+ String remark = StringUtil.format("当前测值：{}\n近1H测值：{}\n{}：{}\n",
+ list.get(11), list.get(14), list.get(12), list.get(13)
+ );
+ // 不拼接短信内容需要删除
+ list.remove(14);
+ System.out.println(remark);
// 保存告警记录信息
- 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;
+ if (isDay.equals("day")) return;
// 保存站内信记录信息
noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
}
@@ -1706,7 +1868,7 @@
* @param uuid 随机生成id
* @return
*/
- public Map<String, Object> damSafetyWyOver2Less5HandleSms(AlarmRule alarmRule, AlarmRuleDetail alarmRuleDetail, JSONArray data, List<String> columnList, boolean flag, String adCode, boolean isSendStation, String uuid,String isDay) {
+ public Map<String, Object> damSafetyWyOver2Less5HandleSms(AlarmRule alarmRule, AlarmRuleDetail alarmRuleDetail, JSONArray data, List<String> columnList, boolean flag, String adCode, boolean isSendStation, String uuid, String isDay) {
Map<String, Object> map = new HashMap<>();
// 只发短信，将发短信信息组装好
SmsRequestTemplate smsRequestTemplate
@@ -1724,7 +1886,7 @@
list.add(alarmRecord.getId().toString());
}
}
- if (isDay.equals("day"))return map;
+ if (isDay.equals("day")) return map;
map = smsService.sendSignMsg(smsRequestTemplate);
// 调用短信服务
return map;
@@ -1746,7 +1908,7 @@
* @param uuid 随机生成id
* @return
*/
- public void damSafetyWyOver2Less5HandleStation(AlarmRule alarmRule, AlarmRuleDetail alarmRuleDetail, JSONArray data, List<String> columnList, boolean flag, String adCode, boolean isSendStation, String uuid,String isDay) {
+ public void damSafetyWyOver2Less5HandleStation(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);
// 拼接后面内容
@@ -1754,15 +1916,24 @@
for (List<String> list : smsRequestTemplate.getTemplateContent()) {
// 依次添加行巡查责任人,技术责任人信息(姓名)
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());
}
}
- if (isDay.equals("day"))return;
+ if (isDay.equals("day")) return;
// 保存站内信记录信息
noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
}
@@ -1782,7 +1953,7 @@
* @param uuid 随机生成id
* @return
*/
- public Map<String, Object> damSafetyWyOver5Less10HandleSms(AlarmRule alarmRule, AlarmRuleDetail alarmRuleDetail, JSONArray data, List<String> columnList, boolean flag, String adCode, boolean isSendStation, String uuid,String isDay) {
+ public Map<String, Object> damSafetyWyOver5Less10HandleSms(AlarmRule alarmRule, AlarmRuleDetail alarmRuleDetail, JSONArray data, List<String> columnList, boolean flag, String adCode, boolean isSendStation, String uuid, String isDay) {
Map<String, Object> map = new HashMap<>();
// 只发短信，将发短信信息组装好
SmsRequestTemplate smsRequestTemplate
@@ -1800,7 +1971,7 @@
list.add(alarmRecord.getId().toString());
}
}
- if (isDay.equals("day"))return map;
+ if (isDay.equals("day")) return map;
map = smsService.sendSignMsg(smsRequestTemplate);
// 调用短信服务
return map;
@@ -1822,7 +1993,7 @@
* @param uuid 随机生成id
* @return
*/
- public void damSafetyWyOver5Less10HandleStation(AlarmRule alarmRule, AlarmRuleDetail alarmRuleDetail, JSONArray data, List<String> columnList, boolean flag, String adCode, boolean isSendStation, String uuid,String isDay) {
+ public void damSafetyWyOver5Less10HandleStation(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);
// 拼接后面内容
@@ -1832,13 +2003,21 @@
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());
}
}
- if (isDay.equals("day"))return;
+ if (isDay.equals("day")) return;
// 保存站内信记录信息
noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
}
@@ -1858,7 +2037,7 @@
* @param uuid 随机生成id
* @return
*/
- public Map<String, Object> damSafetyWyOver10HandleSms(AlarmRule alarmRule, AlarmRuleDetail alarmRuleDetail, JSONArray data, List<String> columnList, boolean flag, String adCode, boolean isSendStation, String uuid,String isDay) {
+ public Map<String, Object> damSafetyWyOver10HandleSms(AlarmRule alarmRule, AlarmRuleDetail alarmRuleDetail, JSONArray data, List<String> columnList, boolean flag, String adCode, boolean isSendStation, String uuid, String isDay) {
Map<String, Object> map = new HashMap<>();
// 只发短信，将发短信信息组装好
SmsRequestTemplate smsRequestTemplate
@@ -1870,13 +2049,21 @@
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());
}
}
- if (isDay.equals("day"))return map;
+ if (isDay.equals("day")) return map;
map = smsService.sendSignMsg(smsRequestTemplate);
// 调用短信服务
return map;
@@ -1898,7 +2085,7 @@
* @param uuid 随机生成id
* @return
*/
- public void damSafetyWyOver10HandleStation(AlarmRule alarmRule, AlarmRuleDetail alarmRuleDetail, JSONArray data, List<String> columnList, boolean flag, String adCode, boolean isSendStation, String uuid,String isDay) {
+ public void damSafetyWyOver10HandleStation(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);
// 拼接后面内容
@@ -1908,13 +2095,21 @@
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());
}
}
- if (isDay.equals("day"))return;
+ if (isDay.equals("day")) return;
// 保存站内信记录信息
noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
}
@@ -2067,8 +2262,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());
}
@@ -2195,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