From 6498864704d82d0046634062a7177ec7e4127eb9 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 27 Jul 2023 16:22:39 +0800
Subject: [PATCH] 新增小幅，大幅超汛限告警短信发送
---
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/NoticeHandle.java | 13 ++++++-------
1 files changed, 6 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 c5f5dd4..fc26ad4 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
@@ -351,10 +351,10 @@
}
/**
- * 依次添加巡查责任人，技术责任人信息
+ * 依次添加巡查责任人，技术责任人信息（只有姓名）
* @param list
*/
- public void addPatrolTechnologyInfo(List<String> list) {
+ public void addPatrolTechnologyInfo(List<String> list,Boolean isPhone) {
// 查询巡查责任人姓名，技术责任人姓名信息
List<PersonVO> personVOList = attResManagePersonClient.getPersonListByResGuid(list.get(1),"4,5");
if (personVOList.size()>0) {
@@ -362,10 +362,10 @@
String jszrr = "-";
for (PersonVO personVO : personVOList) {
if (personVO.getType().equals("5")) {
- xczrr = personVO.getName();
+ xczrr = isPhone?personVO.getName()+":"+personVO.getPhone() : personVO.getName();
}
if (personVO.getType().equals("4")) {
- jszrr = personVO.getName();
+ jszrr = isPhone?personVO.getName()+":"+personVO.getPhone() : personVO.getName();
}
}
// 巡查责任人姓名
@@ -379,7 +379,6 @@
list.add("-");
}
}
-
/**
* 拼接市县水利部人员姓名及联系方式
@@ -543,7 +542,7 @@
}
// 保存告警记录详情信息
if (smsRequestTemplate.getIsSendStation()) {
-// saveMessageRecord(messageRecordList);
+ saveMessageRecord(messageRecordList);
}
Map<String, Object> map = new HashMap<>(2);
// 返回
@@ -566,7 +565,7 @@
// addSendMsgTest(messageRecordList1);
//给app推送消息
// pushService.pushMessageList(messageRecordList1);
- pushService.pushMessageList(messageRecordList);
+// pushService.pushMessageList(messageRecordList);
// 保存记录
messageClient.saveMessageRecord(messageRecordList);
--
Gitblit v1.9.3