From cb431488245c36e6ec70b30b414ebf76604133bc Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 06 Jul 2023 14:33:25 +0800
Subject: [PATCH] 水位初次超汛限修改，新增测站编号保存
---
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/NoticeHandle.java | 28 ++++++++++++++++++----------
1 files changed, 18 insertions(+), 10 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 a3da676..1de2997 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
@@ -131,6 +131,8 @@
private void jointData(JSONArray jsonArray, List<String> columnsList, AlarmRule alarmRule, Boolean flag, List<PersonVO> personLists, List<List<String>> lists, int i) {
// 根据水库编号，所在区域查询需要发送的人员手机号及设置
String res_cd = jsonArray.getJSONObject(i).getString("res_cd");
+ // 取出测站编码
+ String stcd = jsonArray.getJSONObject(i).getString("stcd");
// 判断时间是否存在
String tm = jsonArray.getJSONObject(i).getString("tm");
String day = "";
@@ -146,7 +148,7 @@
flag = false;
}
// 获取告警人员信息
- getAlarmPersonList(jsonArray, columnsList, alarmRule, flag, personLists, lists, i, res_cd, day, hour, minute);
+ getAlarmPersonList(jsonArray, columnsList, alarmRule, flag, personLists, lists, i, res_cd, day, hour, minute,stcd);
}
/**
@@ -158,10 +160,11 @@
* @param personLists
* @param lists
* @param i
- * @param res_cd
- * @param day
- * @param hour
- * @param minute
+ * @param res_cd 水库编码
+ * @param day 日期
+ * @param hour 小时
+ * @param minute 分钟
+ * @param stcd 测站编码
*/
private void getAlarmPersonList(JSONArray jsonArray,
List<String> columnsList,
@@ -173,12 +176,14 @@
String res_cd,
String day,
String hour,
- String minute) {
+ String minute,
+ String stcd) {
// 查询告警人员信息
List<PersonVO> personVOList = getPersonListByResGuid(res_cd, alarmRule);
if (personVOList.size() > 0) {
for (PersonVO personVO : personVOList) {
List<String> list = new ArrayList<>();
+ list.add(stcd);
list.add(res_cd);
list.add(personVO.getPhone());
if (flag) {
@@ -220,12 +225,15 @@
AlarmRecord alarm = new AlarmRecord();
// 设置相关信息
alarm.setAlarmRuleId(alarmRule.getId().toString());
-
- alarm.setReservoirNumber(list.get(0));
+ // 分别设置测站编号和水库编码
+ alarm.setAlarmSurveyStationCode(list.get(0));
+ alarm.setReservoirNumber(list.get(1));
alarm.setAlarmCondition(alarmRule.getRuleRemark());
alarm.setTempCode(uuid);
// 新增
boolean save = alarmRecordService.save(alarm);
+ // 删除测站编号
+ list.remove(0);
if (save) {
return alarm;
}
@@ -276,8 +284,8 @@
// 查询巡查责任人姓名，技术责任人姓名信息
List<PersonVO> personVOList = attResManagePersonClient.getPersonListByResGuid(list.get(0),"4,5");
if (personVOList.size()>0) {
- String xczrr = "";
- String jszrr = "";
+ String xczrr = "-";
+ String jszrr = "-";
for (PersonVO personVO : personVOList) {
if (personVO.getType().equals("5")) {
xczrr = personVO.getName();
--
Gitblit v1.9.3