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 | 155 ++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 150 insertions(+), 5 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 52ffc74..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);
// 删除测站编号
@@ -695,6 +710,50 @@
return null;
}
+
+ /**
+ * 调用中台接口查询数据,返回结果不同处理
+ *
+ * @param params
+ * @param url
+ * @return
+ */
+ public JSONArray getZtDataV2(String params, String url) {
+ // 获取环境
+ String activeProfile = SpringContextUtil.getActiveProfile();
+ if (activeProfile.equals("dev")) {
+ url = ZtApiUrlConstant.url_prefix_dev + url;
+ }
+ if (activeProfile.equals("prod")) {
+ url = ZtApiUrlConstant.url_prefix_prod + url;
+ }
+ if (activeProfile.equals("test")) {
+ url = ZtApiUrlConstant.url_prefix_test + url;
+ }
+ //设置请求头
+ HttpHeaders headers = new HttpHeaders();
+ headers.add(ZtConfigConstant.header_key, ZtConfigConstant.header_value);
+ //封装请求头
+ HttpEntity<MultiValueMap<String, Object>> formEntity = new HttpEntity<MultiValueMap<String, Object>>(headers);
+ try {
+ //有请求头，有参数请求
+ ResponseEntity<String> responseEntity =
+ restTemplate.exchange(url + params,
+ HttpMethod.GET,
+ formEntity,
+ String.class);
+ JSONObject jsonObject = JSON.parseObject(responseEntity.getBody());
+
+ JSONObject data = jsonObject.getJSONObject("data");
+ // 返回
+ return JSONArray.parseArray(data.get("data").toString());
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return null;
+ }
+
+
/**
* 保存站内信记录信息
*
@@ -720,7 +779,6 @@
messageRecord.setSender(AuthUtil.getUserId().toString());
messageRecord.setSource("智能告警");
messageRecord.setStatus(0);
-
// 设置告警记录信息
AlarmRecordDetail alarmRecordDetail = new AlarmRecordDetail();
alarmRecordDetail.setReservoirNumber(list.get(0));
@@ -730,6 +788,7 @@
alarmRecordDetail.setStatus(1);
// 删除 最后一个 告警记录id
list.remove(list.size() - 1);
+ messageRecord.setResGuid(list.get(0));
// 删除 0 水库编码
list.remove(0);
@@ -795,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());
@@ -810,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）
//因为只能按编号分组，名称会有重复，所以拿第一条数据的名称就行
@@ -827,7 +887,7 @@
fillList.add(contentListStr);
String sendContent = contentConvert(smsTemplate.getContent(), fillList);
messageRecord.setContent(sendContent);
-
+ messageRecord.setResGuid(String.join(",",resCdList));
messageRecordList.add(messageRecord);
});
@@ -839,6 +899,85 @@
// 返回
return map;
}
+
+
+ /**
+ * 保存站内信记录（水库合并）
+ *
+ * @param smsRequestTemplate
+ * @param alarmRule
+ * @return
+ */
+ public Map<String, Object> saveInStationInfoMergeVideo(SmsRequestTemplate smsRequestTemplate, AlarmRule alarmRule) {
+ // 取出数据
+ SMSSendRequest request = new SMSSendRequest();
+ SmsTemplate smsTemplate = smsRequestTemplate.getSmsTemplate();
+ request.setTemplateId(smsTemplate.getTemplateId());
+ List<List<String>> templateContent = smsRequestTemplate.getTemplateContent();
+
+ List<MessageRecord> messageRecordList = new ArrayList<>();
+ List<Temp> tempList = new ArrayList<>();
+ // 合并数据
+ for (List<String> list : templateContent) {
+ Temp temp = new Temp();
+ temp.setPhone(list.get(1));
+ temp.setReservoirCode(list.get(0));
+ temp.setReservoirName(list.get(2));
+ temp.setCdNm(list.get(3));
+ temp.setAlarmRecordId(list.get(list.size() - 1));
+ // 放入临时集合
+ tempList.add(temp);
+ }
+
+ // 按手机号分组
+ Map<String, List<Temp>> listMap = tempList.stream().collect(Collectors.groupingBy(Temp::getPhone));
+
+
+ listMap.forEach((phone, temps) -> {
+ MessageRecord messageRecord = new MessageRecord();
+
+ messageRecord.setTheme(alarmRule.getRuleName());
+ messageRecord.setSender(AuthUtil.getUserId().toString());
+ messageRecord.setSource("智能告警");
+ messageRecord.setStatus(0);
+ messageRecord.setRecipient(phone);
+
+ 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）
+ //因为只能按编号分组，名称会有重复，所以拿第一条数据的名称就行
+ String resName = contentTemp.get(0).getReservoirName();
+ contentTemp.forEach(info -> {
+ //把测站加进测站集合里
+ cdNmList.add( info.getCdNm());
+ });
+ String cdNameListStr = String.join("、", cdNmList);
+ contentList.add(StringUtil.format("{}({})", resName, cdNameListStr));
+ });
+ String contentListStr = String.join("，", contentList);
+ //需要填充的数据
+ List<String> fillList = new ArrayList<>();
+ fillList.add(contentListStr);
+ String sendContent = contentConvert(smsTemplate.getContent(), fillList);
+ messageRecord.setContent(sendContent);
+ messageRecord.setResGuid(String.join(",",resCdList));
+ messageRecordList.add(messageRecord);
+ });
+
+ // 保存告警记录详情信息
+ if (smsRequestTemplate.getIsSendStation()) {
+ saveMessageRecord(messageRecordList);
+ }
+ Map<String, Object> map = new HashMap<>(2);
+ // 返回
+ return map;
+ }
+
public Map<String, Object> saveInStationInfoMergeNoCd(SmsRequestTemplate smsRequestTemplate, AlarmRule alarmRule) {
@@ -865,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();
@@ -877,6 +1016,7 @@
List<String> contentList = new ArrayList<>();
//因为只能按编号分组，名称会有重复，所以拿第一条数据的名称就行
temps.forEach(info -> {
+ resCdList.add(info.getReservoirCode());
//把水库加进集合
contentList.add(info.getReservoirName());
});
@@ -886,6 +1026,8 @@
fillList.add(contentListStr);
String sendContent = contentConvert(smsTemplate.getContent(), fillList);
messageRecord.setContent(sendContent);
+
+ messageRecord.setResGuid(String.join(",",resCdList));
messageRecordList.add(messageRecord);
});
@@ -1003,4 +1145,7 @@
}
+ public String getNoAlertRes(String ruleName) {
+ return messageClient.getNoAlertRes(ruleName);
+ }
}
--
Gitblit v1.9.3