From 4fa63d4db1e87adabe5b40a4d5fb4e8b10276def Mon Sep 17 00:00:00 2001
From: zrj <646384940@qq.com>
Date: Thu, 22 Aug 2024 09:07:24 +0800
Subject: [PATCH] 错误修正
---
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/NoticeHandle.java | 246 +++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 239 insertions(+), 7 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 dc36f99..cbbebf5 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
@@ -37,6 +37,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.google.common.collect.Lists;
import lombok.extern.slf4j.Slf4j;
+import org.apache.logging.log4j.util.Strings;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.DateUtil;
@@ -188,12 +189,24 @@
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("rain_stcd");
+ }
if (StringUtil.isBlank(stcd)) {
stcd = jsonArray.getJSONObject(i).getString("cd");
}
@@ -226,12 +239,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);
@@ -264,10 +279,21 @@
String format = "";
// 内容处理
format = addAlarmContent(jsonArray, i, split, format);
+// format = addAlarmContentV2(jsonData,split,format);
// 加入集合
list.add(format);
}
- lists.add(list);
+ //处理重复发送手机号
+ boolean isAdd = true;
+ for (List<String> listStr : lists) {
+ if (listStr.contains(res_cd) && listStr.contains(personVO.getPhone())) {
+ isAdd = false;
+ break;
+ }
+ }
+
+ if (isAdd)
+ lists.add(list);
}
}
personLists.addAll(personVOList);
@@ -489,6 +515,80 @@
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;
+ }
+
/**
* 保存告警记录信息
*
@@ -502,9 +602,10 @@
.eq("temp_code", uuid)
.eq("alarm_rule_id", alarmRule.getId())
.eq("reservoir_number", list.get(1))
- .eq("alarm_survey_station_code",list.get(0))
+// .eq("alarm_survey_station_code",list.get(0))
);
- if (null != alarmRecord) {
+
+ if (null!=alarmRecord) {
//删除测值
list.remove(3);
// 删除测站编号
@@ -520,6 +621,44 @@
alarm.setAlarmCondition(alarmRule.getRuleRemark());
alarm.setTempCode(uuid);
alarm.setMonitorData(list.get(3));
+ //删除测值
+ list.remove(3);
+ // 新增
+ boolean save = alarmRecordService.save(alarm);
+ // 删除测站编号
+ list.remove(0);
+ if (save) {
+ return alarm;
+ }
+ }
+ // 返回
+ return null;
+ }
+
+ public AlarmRecord saveAlarmRecord(List<String> list, AlarmRule alarmRule, String uuid, String remark) {
+ AlarmRecord alarmRecord = alarmRecordService.getOne(new QueryWrapper<AlarmRecord>()
+ .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;
+ } else {
+ AlarmRecord alarm = new AlarmRecord();
+ // 设置相关信息
+ alarm.setAlarmRuleId(alarmRule.getId().toString());
+ // 分别设置测站编号和水库编码
+ alarm.setAlarmSurveyStationCode(list.get(0));
+ alarm.setReservoirNumber(list.get(1));
+ alarm.setAlarmCondition(alarmRule.getRuleRemark());
+ alarm.setTempCode(uuid);
+ alarm.setMonitorData(list.get(3));
+ alarm.setRemark(remark);
//删除测值
list.remove(3);
// 新增
@@ -604,6 +743,44 @@
}
/**
+ * 依次添加巡查责任人，技术责任人信息，主管部门责任人
+ *
+ * @param list
+ * @param isPhone 是否保护电话
+ */
+ public void addPatrolTechnologyInfoNew(List<String> list, Boolean isPhone) {
+ // 根据水库id查询巡查责任人姓名，技术责任人姓名信息
+ List<PersonVO> personVOList = attResManagePersonClient.getPersonListByResGuid(list.get(1), "4,5,2");
+ if (personVOList.size() > 0) {
+ String xczrr = "-";
+ String jszrr = "-";
+ String jgzrr = "-";
+ for (PersonVO personVO : personVOList) {
+ if (personVO.getType().equals("5")) {
+ xczrr = isPhone ? personVO.getName() + ":" + personVO.getPhone() : personVO.getName();
+ }
+ if (personVO.getType().equals("4")) {
+ jszrr = isPhone ? personVO.getName() + ":" + personVO.getPhone() : personVO.getName();
+ }
+ if (personVO.getType().equals("2")) {
+ jgzrr = isPhone ? personVO.getName() + ":" + personVO.getPhone() : personVO.getName();
+ }
+ }
+ // 巡查责任人姓名
+ list.add(xczrr);
+ // 技术责任人姓名
+ list.add(jszrr);
+ list.add(jgzrr);
+ } else {
+ // 巡查责任人姓名
+ list.add("-");
+ // 技术责任人姓名
+ list.add("-");
+ list.add("-");
+ }
+ }
+
+ /**
* 拼接市县水利部人员姓名及联系方式
*
* @param list
@@ -669,6 +846,46 @@
}
}
+ /**
+ * 依次添加行政责任人,主管部门责任人,技术责任人,巡查责任人信息
+ *
+ * @param list
+ * @param personTypes
+ */
+ public void addWaterMoreDesignPatrolTechnologyInfoNew(List<String> list, String personTypes) {
+ String[] split = personTypes.split(",");
+ // 查询巡查责任人姓名，技术责任人姓名信息
+ List<PersonVO> personVOList = attResManagePersonClient.getPersonListByResGuid(list.get(1), personTypes);
+ if (personVOList.size() > 0) {
+ String zgzrr = "-";
+ String jszrr = "-";
+ String xczrr = "-";
+ for (PersonVO personVO : personVOList) {
+ String str = null != personVO.getPhone() ? ":" + personVO.getPhone() : "-";
+ if (personVO.getType().equals(split[0])) {
+ zgzrr = personVO.getName() + str;
+ }
+ if (personVO.getType().equals(split[1])) {
+ jszrr = personVO.getName() + str;
+ }
+ if (personVO.getType().equals(split[2])) {
+ xczrr = personVO.getName() + str;
+ }
+ }
+
+ // 主管
+ list.add(zgzrr);
+ // 技术责任人姓名
+ list.add(jszrr);
+ // 巡查责任人姓名
+ list.add(xczrr);
+ } else {
+ for (String type : split) {
+ list.add("-");
+ }
+ }
+ }
+
/**
* 调用中台接口查询数据
@@ -710,6 +927,13 @@
return null;
}
+ public Map<String, String> jsonObjectToMap(JSONObject jsonObject) {
+ Map<String, String> map = new HashMap<>();
+ for (String key : jsonObject.keySet()) {
+ map.put(key, jsonObject.get(key).toString());
+ }
+ return map;
+ }
/**
* 调用中台接口查询数据,返回结果不同处理
@@ -779,6 +1003,8 @@
messageRecord.setSender(AuthUtil.getUserId().toString());
messageRecord.setSource("智能告警");
messageRecord.setStatus(0);
+ messageRecord.setAlarmRuleId(alarmRule.getId());
+ messageRecord.setTemplateId(smsTemplate.getTemplateId());
// 设置告警记录信息
AlarmRecordDetail alarmRecordDetail = new AlarmRecordDetail();
alarmRecordDetail.setReservoirNumber(list.get(0));
@@ -863,6 +1089,8 @@
messageRecord.setSource("智能告警");
messageRecord.setStatus(0);
messageRecord.setRecipient(phone);
+ messageRecord.setTemplateId(smsTemplate.getTemplateId());
+ messageRecord.setAlarmRuleId(alarmRule.getId());
StringBuilder builder = new StringBuilder();
@@ -941,6 +1169,8 @@
messageRecord.setSource("智能告警");
messageRecord.setStatus(0);
messageRecord.setRecipient(phone);
+ messageRecord.setTemplateId(smsTemplate.getTemplateId());
+ messageRecord.setAlarmRuleId(alarmRule.getId());
List<String> resCdList = new ArrayList<>();
Map<String, List<Temp>> resCollect = temps.stream().collect(Collectors.groupingBy(Temp::getReservoirCode));
@@ -1013,6 +1243,8 @@
messageRecord.setSource("智能告警");
messageRecord.setStatus(0);
messageRecord.setRecipient(phone);
+ messageRecord.setTemplateId(smsTemplate.getTemplateId());
+ messageRecord.setAlarmRuleId(alarmRule.getId());
List<String> contentList = new ArrayList<>();
//因为只能按编号分组，名称会有重复，所以拿第一条数据的名称就行
temps.forEach(info -> {
@@ -1136,7 +1368,7 @@
}
map.put("list", mapList);
map.put("scenesId", smsRequestTemplate.getSmsTemplate().getTemplateId());
- String taskName = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy年MM月dd日HH:mm:ss")) + smsRequestTemplate.getAlarmRule().getRuleName() + "智能外呼";
+ String taskName = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy年MM月dd日HH:mm:ss")) +"-"+ smsRequestTemplate.getAlarmRule().getRuleName() + "-智能外呼";
map.put("taskName", taskName);
String taskScheduleTime = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
map.put("taskScheduleTime", taskScheduleTime);
--
Gitblit v1.9.3