From 877e64ea7a23472297ba93027210bb1d4c4a8c4f Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Sat, 01 Jul 2023 17:23:12 +0800
Subject: [PATCH] 短信导入发送数据返回提示修改，告警短信发送修改（新增市县水利部人员查询并放入短信中）
---
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/NoticeStrategyImpl.java | 56 ++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 44 insertions(+), 12 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/NoticeStrategyImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/NoticeStrategyImpl.java
index 9dff3fd..f77b057 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/NoticeStrategyImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/NoticeStrategyImpl.java
@@ -218,20 +218,48 @@
private void addPatrolTechnologyInfo(List<String> list) {
// 查询巡查责任人姓名，技术责任人姓名信息
List<PersonVO> personVOList = attResManagePersonClient.getPersonListByResGuid(list.get(0),"4,5");
- String xczrr = "";
- String jszrr = "";
- for (PersonVO personVO : personVOList) {
- if (personVO.getType().equals("5")){
- xczrr = personVO.getName();
+ if (personVOList.size()>0) {
+ String xczrr = "";
+ String jszrr = "";
+ for (PersonVO personVO : personVOList) {
+ if (personVO.getType().equals("5")) {
+ xczrr = personVO.getName();
+ }
+ if (personVO.getType().equals("4")) {
+ jszrr = personVO.getName();
+ }
}
- if (personVO.getType().equals("4")){
- jszrr = personVO.getName();
- }
+ // 巡查责任人姓名
+ list.add(xczrr);
+ // 技术责任人姓名
+ list.add(jszrr);
+ }else {
+ // 巡查责任人姓名
+ list.add("?");
+ // 技术责任人姓名
+ list.add("?");
}
- // 巡查责任人姓名
- list.add(xczrr);
- // 技术责任人姓名
- list.add(jszrr);
+ }
+
+
+ /**
+ * 拼接市县水利部人员姓名及联系方式
+ * @param list
+ */
+ private void addCityCountyBusinessPersonInfo(List<String> list) {
+ // 根据水库编号查询市县水利部人员姓名及联系方式
+ List<PersonVO> personVOList = attResManagePersonClient.getCityCountyPersonListByResGuid(list.get(0));
+ if (personVOList.size()>0){
+ // 如果没有找到人员？
+ StringBuilder builder = new StringBuilder();
+ for (PersonVO personVO : personVOList) {
+ builder.append(personVO.getName()).append(":").append(personVO.getPhone()).append(",");
+ }
+ // 拼接水利部人员信息
+ list.add(builder.substring(0,builder.length()-1));
+ }else {
+ list.add("?");
+ }
}
/**
@@ -414,10 +442,13 @@
for (List<String> list : smsRequestTemplate.getTemplateContent()) {
// 依次拼接巡查责任人，技术责任人姓名
addPatrolTechnologyInfo(list);
+ // 拼接市县水利部人员姓名及联系方式
+ addCityCountyBusinessPersonInfo(list);
// 保存告警记录信息
AlarmRecord alarmRecord = saveAlarmRecord(list,alarmRule);
if (null != alarmRecord) {
list.add(alarmRecord.getId().toString());
+// list.add("999");
}
}
// 调用短信服务
@@ -429,6 +460,7 @@
return "水位初次超汛限告警";
}
+
/**
* 策略7: 水位小幅超汛限告警
*
--
Gitblit v1.9.3