From 659d3e60c6fe5e5bcd8c4cbb3dd8077e29f13a38 Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Mon, 13 May 2024 18:54:27 +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/NoticeHandle.java | 136 +++++++++++++++++++++++++++++++++++++++++---
1 files changed, 125 insertions(+), 11 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/NoticeHandle.java b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/NoticeHandle.java
index ebab155..398788f 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/NoticeHandle.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/NoticeHandle.java
@@ -173,7 +173,6 @@
// jointData(jsonArray, columnsList, alarmRuleDetail, flag, personLists, lists, i,uuid,set);
jointDataV2(jsonArray, columnsList, alarmRuleDetail, roles, flag, personLists, lists, i, uuid, set);
}
- log.info("告警人员信息：{}", personLists.toString());
}
// 设置信息
smsRequestTemplate.setPersonVOList(personLists);
@@ -189,14 +188,27 @@
String county_nm = jsonObject.getString("county_nm");
String city_nm = jsonObject.getString("city_nm");
log.info("当前为第{}个水库，行政区划:{}-{}-{}，水库编码：{}，水库名称：{}", i + 1, city_nm, county_nm, town_nm, res_cd, res_nm);
+ // 取出测站编码
+// String stcd = jsonArray.getJSONObject(i).getString("stcd");
+// if (StringUtil.isBlank(stcd)) {
+// stcd = jsonArray.getJSONObject(i).getString("cd");
+// }
+// //如果stcd是空的就设置为-1
+// if (StringUtil.isBlank(stcd)){
+// stcd = "-1";
+// }
+
String tempStr = uuid + res_cd;
// 去重水库操作，如果有重复的水库则不操作
if (!set.contains(tempStr)) {
set.add(tempStr);
- // 取出测站编码
String stcd = jsonArray.getJSONObject(i).getString("stcd");
if (StringUtil.isBlank(stcd)) {
stcd = jsonArray.getJSONObject(i).getString("cd");
+ }
+ //如果stcd是空的就设置为-1
+ if (StringUtil.isBlank(stcd)){
+ stcd = "-1";
}
// 判断时间是否存在
String tm = jsonArray.getJSONObject(i).getString("tm");
@@ -223,12 +235,14 @@
}
// 获取告警人员信息
// getAlarmPersonList(jsonArray, columnsList, alarmRuleDetail,flag, personLists, lists, i, res_cd, day, hour, minute, stcd);
- getAlarmPersonListV2(jsonArray, columnsList, alarmRuleDetail, roles, flag, personLists, lists, i, res_cd, day, hour, minute, stcd);
+ JSONObject jsonData = jsonArray.getJSONObject(i);
+ //这里把jsonObject传过去
+ getAlarmPersonListV2(jsonArray, columnsList, alarmRuleDetail, roles, flag, personLists, lists, i, res_cd, day, hour, minute, stcd,jsonData);
}
}
- private void getAlarmPersonListV2(JSONArray jsonArray, List<String> columnsList, AlarmRuleDetail alarmRuleDetail, List<String> roles, Boolean flag, List<PersonVO> personLists, List<List<String>> lists, int i, String res_cd, String day, String hour, String minute, String stcd) {
+ private void getAlarmPersonListV2(JSONArray jsonArray, List<String> columnsList, AlarmRuleDetail alarmRuleDetail, List<String> roles, Boolean flag, List<PersonVO> personLists, List<List<String>> lists, int i, String res_cd, String day, String hour, String minute, String stcd,JSONObject jsonData) {
// 查询告警人员信息
// List<PersonVO> personVOList = getPersonListByResGuid(res_cd, alarmRuleDetail.getAlarmPerson());
List<PersonVO> personVOList = getPersonListByResGuidV2(res_cd, roles);
@@ -238,6 +252,12 @@
list.add(stcd);
list.add(res_cd);
list.add(personVO.getPhone());
+
+ //拿测点值
+ String val = "";
+ JSONObject jsonObject = jsonArray.getJSONObject(i);
+ val = jsonObject.getString("monitorData");
+ list.add(val);
if (flag) {
// 如果是电话告警，需要把日期拼到一起
if (alarmRuleDetail.getAlarmMode().equals("电话")) {
@@ -255,6 +275,7 @@
String format = "";
// 内容处理
format = addAlarmContent(jsonArray, i, split, format);
+// format = addAlarmContentV2(jsonData,split,format);
// 加入集合
list.add(format);
}
@@ -480,6 +501,85 @@
return format;
}
+
+
+ /**
+ * 告警内容拼接处理
+ *
+ * @param split key 值
+ * @param format 值结果
+ * @return
+ */
+ private String addAlarmContentV2(JSONObject jsonObject, String[] split, String format) {
+ for (String s : split) {
+ // 超汛限水位
+ if (s.equals("over_z")) {
+ String is_danger_res = "is_danger_res";
+ if (null != jsonObject.getString(is_danger_res) && jsonObject.getString(is_danger_res).equals("true")) {
+ format = format + "控制运用水位" + jsonObject.getString(s);
+ } else if (null != jsonObject.getString(is_danger_res) && jsonObject.getString(is_danger_res).equals("false")) {
+ format = format + "汛限水位" + jsonObject.getString(s);
+ } else {
+ format = format + jsonObject.getString(s);
+ }
+ } else if (s.equals("rz")) {
+ // 水位
+ String rz = "rz";
+ if (null == jsonObject.getString(rz)) {
+ format = format + "无数据";
+ } else {
+ format = format + jsonObject.getString(s) + "米";
+ }
+ } else if (s.equals("alarm_val")) {
+ // 小时雨量
+ String alarm_type = "alarm_type";
+ if (null != jsonObject.getString(alarm_type) && !jsonObject.getString(alarm_type).equals("")) {
+ format = format + jsonObject.getString(alarm_type) + "小时坝前点雨量" + jsonObject.getString(s);
+ } else {
+ format = format + jsonObject.getString(s);
+ }
+ } else if (s.equals("diff_dam")) {
+ String over_chec_fl_stag = "over_chec_fl_stag";
+ // 如果是超校核的需要判断超值
+ if (null != jsonObject.getString(over_chec_fl_stag) && !jsonObject.getString(over_chec_fl_stag).equals("")) {
+ // 校核，是否漫过坝顶（正数代表未漫过坝顶，负数则反之）
+ String diff_dam = jsonObject.getString(s);
+ double parseDouble = Double.parseDouble(diff_dam);
+ if (parseDouble > 0) {
+ format = format + "距离大坝坝顶仅" + jsonObject.getString(s);
+ } else {
+ format = format + "已漫过坝顶" + (-parseDouble);
+ }
+ } else {
+ format = format + jsonObject.getString(s);
+ }
+ } else if (s.equals("ms_flag")) {
+ // 水位
+ String ms_flag = "ms_flag";
+ if (null != jsonObject.getString(ms_flag) && jsonObject.getString(ms_flag).equals("sy")) {
+ format = format + "渗压";
+ } else if (null != jsonObject.getString(ms_flag) && jsonObject.getString(ms_flag).equals("sl")) {
+ format = format + "渗流";
+ } else if (null != jsonObject.getString(ms_flag) && jsonObject.getString(ms_flag).equals("by")) {
+ format = format + "白蚁";
+ } else if (null != jsonObject.getString(ms_flag) && jsonObject.getString(ms_flag).equals("bx")) {
+ format = format + "变形";
+ } else {
+ format = format + jsonObject.getString(s);
+ }
+ } else {
+ format = format + jsonObject.getString(s);
+ }
+ }
+ // 返回
+ return format;
+ }
+
+
+
+
+
+
/**
* 保存告警记录信息
*
@@ -493,8 +593,11 @@
.eq("temp_code", uuid)
.eq("alarm_rule_id", alarmRule.getId())
.eq("reservoir_number", list.get(1))
+ .eq("alarm_survey_station_code",list.get(0))
);
if (null != alarmRecord) {
+ //删除测值
+ list.remove(3);
// 删除测站编号
list.remove(0);
return alarmRecord;
@@ -507,6 +610,9 @@
alarm.setReservoirNumber(list.get(1));
alarm.setAlarmCondition(alarmRule.getRuleRemark());
alarm.setTempCode(uuid);
+ alarm.setMonitorData(list.get(3));
+ //删除测值
+ list.remove(3);
// 新增
boolean save = alarmRecordService.save(alarm);
// 删除测站编号
@@ -764,7 +870,6 @@
messageRecord.setSender(AuthUtil.getUserId().toString());
messageRecord.setSource("智能告警");
messageRecord.setStatus(0);
-
// 设置告警记录信息
AlarmRecordDetail alarmRecordDetail = new AlarmRecordDetail();
alarmRecordDetail.setReservoirNumber(list.get(0));
@@ -774,6 +879,7 @@
alarmRecordDetail.setStatus(1);
// 删除 最后一个 告警记录id
list.remove(list.size() - 1);
+ messageRecord.setResGuid(list.get(0));
// 删除 0 水库编码
list.remove(0);
@@ -839,8 +945,8 @@
// 按手机号分组
Map<String, List<Temp>> listMap = tempList.stream().collect(Collectors.groupingBy(Temp::getPhone));
-
listMap.forEach((phone, temps) -> {
+ List<String> resCdList = new ArrayList<>();
MessageRecord messageRecord = new MessageRecord();
messageRecord.setTheme(alarmRule.getRuleName());
@@ -854,6 +960,7 @@
Map<String, List<Temp>> resCollect = temps.stream().collect(Collectors.groupingBy(Temp::getReservoirCode));
List<String> contentList = new ArrayList<>();
resCollect.forEach((resCode, contentTemp) -> {
+ resCdList.add(resCode);
List<String> cdNmList = new ArrayList<>();
//凤凰水库（测点12170062992），大新众水库（测点12170063012、测点12170062998）
//因为只能按编号分组，名称会有重复，所以拿第一条数据的名称就行
@@ -871,7 +978,7 @@
fillList.add(contentListStr);
String sendContent = contentConvert(smsTemplate.getContent(), fillList);
messageRecord.setContent(sendContent);
-
+ messageRecord.setResGuid(String.join(",",resCdList));
messageRecordList.add(messageRecord);
});
@@ -926,11 +1033,12 @@
messageRecord.setStatus(0);
messageRecord.setRecipient(phone);
-
- StringBuilder builder = new StringBuilder();
+ List<String> resCdList = new ArrayList<>();
Map<String, List<Temp>> resCollect = temps.stream().collect(Collectors.groupingBy(Temp::getReservoirCode));
List<String> contentList = new ArrayList<>();
resCollect.forEach((resCode, contentTemp) -> {
+ resCdList.add(resCode);
+
List<String> cdNmList = new ArrayList<>();
//凤凰水库（测点12170062992），大新众水库（测点12170063012、测点12170062998）
//因为只能按编号分组，名称会有重复，所以拿第一条数据的名称就行
@@ -948,7 +1056,7 @@
fillList.add(contentListStr);
String sendContent = contentConvert(smsTemplate.getContent(), fillList);
messageRecord.setContent(sendContent);
-
+ messageRecord.setResGuid(String.join(",",resCdList));
messageRecordList.add(messageRecord);
});
@@ -987,7 +1095,7 @@
// 按手机号分组
Map<String, List<Temp>> listMap = tempList.stream().collect(Collectors.groupingBy(Temp::getPhone));
-
+ List<String> resCdList = new ArrayList<>();
listMap.forEach((phone, temps) -> {
MessageRecord messageRecord = new MessageRecord();
@@ -999,6 +1107,7 @@
List<String> contentList = new ArrayList<>();
//因为只能按编号分组，名称会有重复，所以拿第一条数据的名称就行
temps.forEach(info -> {
+ resCdList.add(info.getReservoirCode());
//把水库加进集合
contentList.add(info.getReservoirName());
});
@@ -1008,6 +1117,8 @@
fillList.add(contentListStr);
String sendContent = contentConvert(smsTemplate.getContent(), fillList);
messageRecord.setContent(sendContent);
+
+ messageRecord.setResGuid(String.join(",",resCdList));
messageRecordList.add(messageRecord);
});
@@ -1125,4 +1236,7 @@
}
+ public String getNoAlertRes(String ruleName) {
+ return messageClient.getNoAlertRes(ruleName);
+ }
}
--
Gitblit v1.9.3