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 | 129 ++++++++++++++++++++++++++++++++++++++----
1 files changed, 116 insertions(+), 13 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 10d09d0..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;
@@ -204,6 +205,9 @@
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");
}
//如果stcd是空的就设置为-1
@@ -279,7 +283,17 @@
// 加入集合
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);
@@ -575,11 +589,6 @@
return format;
}
-
-
-
-
-
/**
* 保存告警记录信息
*
@@ -590,12 +599,13 @@
*/
public AlarmRecord saveAlarmRecord(List<String> list, AlarmRule alarmRule, String uuid) {
AlarmRecord alarmRecord = alarmRecordService.getOne(new QueryWrapper<AlarmRecord>()
-// .eq("temp_code", uuid)
+ .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);
// 删除测站编号
@@ -627,12 +637,12 @@
public AlarmRecord saveAlarmRecord(List<String> list, AlarmRule alarmRule, String uuid, String remark) {
AlarmRecord alarmRecord = alarmRecordService.getOne(new QueryWrapper<AlarmRecord>()
- .eq("temp_code", uuid)
+ .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);
// 删除测站编号
@@ -733,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
@@ -798,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("-");
+ }
+ }
+ }
+
/**
* 调用中台接口查询数据
@@ -839,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;
+ }
/**
* 调用中台接口查询数据,返回结果不同处理
@@ -908,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));
@@ -992,6 +1089,8 @@
messageRecord.setSource("智能告警");
messageRecord.setStatus(0);
messageRecord.setRecipient(phone);
+ messageRecord.setTemplateId(smsTemplate.getTemplateId());
+ messageRecord.setAlarmRuleId(alarmRule.getId());
StringBuilder builder = new StringBuilder();
@@ -1070,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));
@@ -1142,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 -> {
@@ -1265,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