From 6aeeb1fbdea6b0f9c36678efd49bd90d2ca2a6dc Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Wed, 24 Apr 2024 15:41:25 +0800
Subject: [PATCH] 数据重复修改
---
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/NoticeHandle.java | 39 +++++++++++++++++++++++++++++++--------
1 files changed, 31 insertions(+), 8 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..dc36f99 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);
@@ -197,6 +196,10 @@
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");
@@ -238,6 +241,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("电话")) {
@@ -493,8 +502,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 +519,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 +779,6 @@
messageRecord.setSender(AuthUtil.getUserId().toString());
messageRecord.setSource("智能告警");
messageRecord.setStatus(0);
-
// 设置告警记录信息
AlarmRecordDetail alarmRecordDetail = new AlarmRecordDetail();
alarmRecordDetail.setReservoirNumber(list.get(0));
@@ -774,6 +788,7 @@
alarmRecordDetail.setStatus(1);
// 删除 最后一个 告警记录id
list.remove(list.size() - 1);
+ messageRecord.setResGuid(list.get(0));
// 删除 0 水库编码
list.remove(0);
@@ -839,8 +854,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 +869,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 +887,7 @@
fillList.add(contentListStr);
String sendContent = contentConvert(smsTemplate.getContent(), fillList);
messageRecord.setContent(sendContent);
-
+ messageRecord.setResGuid(String.join(",",resCdList));
messageRecordList.add(messageRecord);
});
@@ -926,11 +942,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 +965,7 @@
fillList.add(contentListStr);
String sendContent = contentConvert(smsTemplate.getContent(), fillList);
messageRecord.setContent(sendContent);
-
+ messageRecord.setResGuid(String.join(",",resCdList));
messageRecordList.add(messageRecord);
});
@@ -987,7 +1004,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 +1016,7 @@
List<String> contentList = new ArrayList<>();
//因为只能按编号分组，名称会有重复，所以拿第一条数据的名称就行
temps.forEach(info -> {
+ resCdList.add(info.getReservoirCode());
//把水库加进集合
contentList.add(info.getReservoirName());
});
@@ -1008,6 +1026,8 @@
fillList.add(contentListStr);
String sendContent = contentConvert(smsTemplate.getContent(), fillList);
messageRecord.setContent(sendContent);
+
+ messageRecord.setResGuid(String.join(",",resCdList));
messageRecordList.add(messageRecord);
});
@@ -1125,4 +1145,7 @@
}
+ public String getNoAlertRes(String ruleName) {
+ return messageClient.getNoAlertRes(ruleName);
+ }
}
--
Gitblit v1.9.3