From 6e4c8d00a3e745fdb910c2325840e3b88f634d21 Mon Sep 17 00:00:00 2001
From: zrj <646384940@qq.com>
Date: Thu, 11 Jul 2024 09:19:59 +0800
Subject: [PATCH] 大雨。暴雨预警参数修改
---
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/NoticeHandle.java | 41 +++++++++++++++++++++++++++++------------
1 files changed, 29 insertions(+), 12 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 ab2b1f2..273d338 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;
}
-
-
-
-
-
/**
* 保存告警记录信息
*
@@ -593,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);
// 删除测站编号
@@ -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);
// 删除测站编号
@@ -917,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;
+ }
/**
* 调用中台接口查询数据,返回结果不同处理
@@ -1343,7 +1360,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