From acab32ddf72346f54e7eec802fb6081ab1e0788d Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Mon, 31 Jul 2023 10:56:08 +0800
Subject: [PATCH] 短信,站内信告警调整(新增近1h水位陡降,陡升,水位超校核洪水位告警,水位接近设计洪水位告警,水位大幅超汛限告警,水位小幅超汛限告警),公用方法调整

---
 skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/NoticeStrategyImpl.java |  359 +++++++++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 259 insertions(+), 100 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 3b71781..aea0555 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
@@ -1,38 +1,16 @@
 package cn.gistack.alerts.notice.service.impl;
 
-import cn.gistack.alerts.alarmRule.entity.AlarmRecord;
 import cn.gistack.alerts.alarmRule.entity.AlarmRule;
-import cn.gistack.alerts.alarmRule.service.AlarmRecordService;
+import cn.gistack.alerts.alarmRule.entity.AlarmRuleDetail;
+import cn.gistack.alerts.alarmRule.service.AlarmRuleDetailService;
 import cn.gistack.alerts.alarmRule.service.AlarmRuleService;
-import cn.gistack.alerts.notice.constant.ZtConfigConstant;
-import cn.gistack.alerts.sms.service.ISmsTemplateService;
-import cn.gistack.common.utils.SpringContextUtil;
-import cn.gistack.alerts.notice.constant.PtInfoConstant;
 import cn.gistack.alerts.notice.constant.ZtApiDataColumnConstant;
 import cn.gistack.alerts.notice.constant.ZtApiUrlConstant;
-import cn.gistack.alerts.notice.enums.PersonEnum;
-import cn.gistack.alerts.notice.util.FormatUtil;
-import cn.gistack.sm.sjztmd.vo.PersonVO;
-import cn.gistack.sm.sjztmd.feign.IAttResManagePersonClient;
-import cn.gistack.alerts.sms.entity.SmsTemplate;
-import cn.gistack.alerts.sms.service.SmsService;
-import cn.gistack.alerts.sms.vo.SmsRequestTemplate;
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;
-import org.springframework.util.MultiValueMap;
-import org.springframework.web.client.RestTemplate;
-import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 import java.util.UUID;
 
 /**
@@ -45,10 +23,10 @@
 public class NoticeStrategyImpl {
 
 	@Autowired
-	private SmsService smsService;
+	private AlarmRuleService alarmRuleService;
 
 	@Autowired
-	private AlarmRuleService alarmRuleService;
+	private AlarmRuleDetailService alarmRuleDetailService;
 
 	@Autowired
 	private NoticeHandle noticeHandle;
@@ -79,14 +57,24 @@
 	 * @return
 	 */
 	public String waterInfoNotHandle(String arg1, String arg2) {
-		String templateId = "2431012216668";
-//		String adCode = "421181000000";
+		//String adCode = "421181000000";
 		String adCode = null;
-		String uuid = templateId + UUID.randomUUID().toString();
 		// 查询当前策略对应的告警规则信息
 		AlarmRule alarmRule = alarmRuleService.getOne(new QueryWrapper<AlarmRule>().eq("rule_name", arg1));
+		// 调用中台服务接口查询数据
+		JSONArray ztData = noticeHandle.getZtData("", ZtApiUrlConstant.no_z_last_api_all);
+		// 获取告警规则详情,判断告警类型(短信,电话,站内信)
 		if (null!=alarmRule) {
-			asyncNoticeHandle.waterInfoNotHandle(alarmRule,templateId,uuid,adCode,false);
+			// 查询告警详情信息
+			List<AlarmRuleDetail> alarmRuleDetailList = alarmRuleDetailService.list(new QueryWrapper<AlarmRuleDetail>().eq("alarm_rule_id", alarmRule.getId()));
+			if (alarmRuleDetailList.size()>0){
+				// 遍历
+				for (AlarmRuleDetail alarmRuleDetail : alarmRuleDetailList) {
+					if (alarmRuleDetail.getAlarmMode().equals("短信")) {
+						asyncNoticeHandle.waterInfoNotHandle(alarmRule, alarmRuleDetail, ztData,ZtApiDataColumnConstant.waterInfoNotList,false, adCode, false);
+					}
+				}
+			}
 		}
 		// 返回
 		return "水位信息接收不到";
@@ -100,14 +88,24 @@
 	 * @return
 	 */
 	public String waterDataExcHandle(String arg1, String arg2) {
-		String templateId = "2431012248591";
 		//String adCode = "421181000000";
 		String adCode = null;
-		String uuid = templateId + UUID.randomUUID().toString();
 		// 查询当前策略对应的告警规则信息
 		AlarmRule alarmRule = alarmRuleService.getOne(new QueryWrapper<AlarmRule>().eq("rule_name", arg1));
+		// 调用中台服务接口查询数据
+		JSONArray ztData = noticeHandle.getZtData("", ZtApiUrlConstant.res_z_not_normal_api);
+		// 获取告警规则详情,判断告警类型(短信,电话,站内信)
 		if (null!=alarmRule) {
-			asyncNoticeHandle.waterDataExcHandle(alarmRule,templateId,uuid,adCode,false);
+			// 查询告警详情信息
+			List<AlarmRuleDetail> alarmRuleDetailList = alarmRuleDetailService.list(new QueryWrapper<AlarmRuleDetail>().eq("alarm_rule_id", alarmRule.getId()));
+			if (alarmRuleDetailList.size()>0){
+				// 遍历
+				for (AlarmRuleDetail alarmRuleDetail : alarmRuleDetailList) {
+					if (alarmRuleDetail.getAlarmMode().equals("短信")) {
+						asyncNoticeHandle.waterInfoNotHandle(alarmRule, alarmRuleDetail, ztData,ZtApiDataColumnConstant.waterDataExcList,false, adCode, false);
+					}
+				}
+			}
 		}
 		// 返回
 		return "水位数据异常";
@@ -121,14 +119,24 @@
 	 * @return
 	 */
 	public String waterLessDeadHandle(String arg1, String arg2) {
-		String adCode = "420607000000";
+		String adCode = "420881000000";
 //		String adCode = null;
-		String templateId = "2431012248594";
-		String uuid = templateId + UUID.randomUUID().toString();
 		// 查询当前策略对应的告警规则信息
 		AlarmRule alarmRule = alarmRuleService.getOne(new QueryWrapper<AlarmRule>().eq("rule_name", arg1));
+		// 调用中台服务接口查询数据
+		JSONArray ztData = noticeHandle.getZtData("", ZtApiUrlConstant.res_diff_dead_z_api);
+		// 获取告警规则详情,判断告警类型(短信,电话,站内信)
 		if (null!=alarmRule) {
-			asyncNoticeHandle.waterLessDeadHandle(templateId,uuid,alarmRule,adCode,false);
+			// 查询告警详情信息
+			List<AlarmRuleDetail> alarmRuleDetailList = alarmRuleDetailService.list(new QueryWrapper<AlarmRuleDetail>().eq("alarm_rule_id", alarmRule.getId()));
+			if (alarmRuleDetailList.size()>0){
+				// 遍历
+				for (AlarmRuleDetail alarmRuleDetail : alarmRuleDetailList) {
+					if (alarmRuleDetail.getAlarmMode().equals("短信")) {
+						asyncNoticeHandle.waterLessDeadHandle(alarmRule, alarmRuleDetail, ztData,ZtApiDataColumnConstant.waterLessDeadList,true, adCode, false);
+					}
+				}
+			}
 		}
 		// 返回
 		return "水位超低于死水位";
@@ -157,12 +165,22 @@
 	 */
 	public String waterComeOverHandle(String arg1, String arg2) {
 		String adCode = null;
-		String templateId = "znxsw10000001";
-		String uuid = templateId + UUID.randomUUID().toString();
 		// 查询当前策略对应的告警规则信息
 		AlarmRule alarmRule = alarmRuleService.getOne(new QueryWrapper<AlarmRule>().eq("rule_name", arg1));
+		// 调用中台服务接口查询数据
+		JSONArray ztData = noticeHandle.getZtData("", ZtApiUrlConstant.res_z_is_warn_over_flse_api);
+		// 获取告警规则详情,判断告警类型(短信,电话,站内信)
 		if (null!=alarmRule) {
-			asyncNoticeHandle.waterComeOverHandle(templateId,uuid,alarmRule, adCode,true);
+			// 查询告警详情信息
+			List<AlarmRuleDetail> alarmRuleDetailList = alarmRuleDetailService.list(new QueryWrapper<AlarmRuleDetail>().eq("alarm_rule_id", alarmRule.getId()));
+			if (alarmRuleDetailList.size()>0){
+				// 遍历
+				for (AlarmRuleDetail alarmRuleDetail : alarmRuleDetailList) {
+					if (alarmRuleDetail.getAlarmMode().equals("站内信")) {
+						asyncNoticeHandle.waterComeOverHandle(alarmRule, alarmRuleDetail, ztData,ZtApiDataColumnConstant.waterComeOverList,true, adCode, true);
+					}
+				}
+			}
 		}
 		return "水位接近汛限告警";
 	}
@@ -170,7 +188,7 @@
 
 
 	/**
-	 * 策略6: 水位初次超汛限告警
+	 * 策略6: 水位初次超汛限告警(当前测试发送站内信)
 	 *
 	 * @param arg1
 	 * @param arg2
@@ -178,15 +196,22 @@
 	 */
 	public String waterFirstOverHandle(String arg1, String arg2) {
 		String adCode = "421303000000";
-		String templateId = "2431012216671";
-		String uuid = templateId + UUID.randomUUID().toString();
 		// 查询当前策略对应的告警规则信息
 		AlarmRule alarmRule = alarmRuleService.getOne(new QueryWrapper<AlarmRule>().eq("rule_name", arg1));
+		// 调用中台服务接口查询数据
+		JSONArray ztData = noticeHandle.getZtData("", ZtApiUrlConstant.over_z_res_api);
+		// 获取告警规则详情,判断告警类型(短信,电话,站内信)
 		if (null!=alarmRule) {
-			// 短信发送
-			asyncNoticeHandle.waterFirstOverHandle(templateId, uuid, alarmRule,adCode,true);
-			// 返回
-			return "水位初次超汛限告警";
+			// 查询告警详情信息
+			List<AlarmRuleDetail> alarmRuleDetailList = alarmRuleDetailService.list(new QueryWrapper<AlarmRuleDetail>().eq("alarm_rule_id", alarmRule.getId()));
+			if (alarmRuleDetailList.size()>0){
+				// 遍历
+				for (AlarmRuleDetail alarmRuleDetail : alarmRuleDetailList) {
+					if (alarmRuleDetail.getAlarmMode().equals("短信")) {
+						asyncNoticeHandle.waterFirstOverHandle(alarmRule, alarmRuleDetail, ztData,ZtApiDataColumnConstant.waterFirstOverList,true, adCode, true);
+					}
+				}
+			}
 		}
 		// 返回
 		return "水位初次超汛限告警";
@@ -203,22 +228,24 @@
 	public String waterSmallScaleOverHandle(String arg1, String arg2) {
 //		String adCode = "421303000000";
 		String adCode = null;
-		String templateId1 = "2431012216674";
-		String templateId2 = "2431012248617";
-		String uuid1 = templateId1 + UUID.randomUUID().toString();
-		String uuid2 = templateId2 + UUID.randomUUID().toString();
-		String[] split = arg1.split(",");
+		String uuid = UUID.randomUUID().toString();
 		// 查询当前策略对应的告警规则信息
-		AlarmRule alarmRule1 = alarmRuleService.getOne(new QueryWrapper<AlarmRule>().eq("rule_name", split[0]));
-		AlarmRule alarmRule2 = alarmRuleService.getOne(new QueryWrapper<AlarmRule>().eq("rule_name", split[1]));
-		// 发两个不同的模板
-		if (null!=alarmRule1) {
-			// 短信发送
-			asyncNoticeHandle.waterSmallScaleOverHandle1(templateId1, uuid1, alarmRule1,adCode,true);
-		}
-		if (null!=alarmRule2) {
-			// 短信发送
-			asyncNoticeHandle.waterSmallScaleOverHandle2(templateId2, uuid2, alarmRule2,adCode,true);
+		AlarmRule alarmRule = alarmRuleService.getOne(new QueryWrapper<AlarmRule>().eq("rule_name", arg1));
+		// 调用中台服务接口查询数据
+		JSONArray ztData = noticeHandle.getZtData("", ZtApiUrlConstant.res_over_z_small_over_api);
+		// 获取告警规则详情,判断告警类型(短信,电话,站内信)
+		if (null!=alarmRule) {
+			// 查询告警详情信息
+			List<AlarmRuleDetail> alarmRuleDetailList = alarmRuleDetailService.list(new QueryWrapper<AlarmRuleDetail>().eq("alarm_rule_id", alarmRule.getId()));
+			if (alarmRuleDetailList.size()>0){
+				// 遍历
+				if (alarmRuleDetailList.get(0).getAlarmMode().equals("短信")) {
+					asyncNoticeHandle.waterSmallScaleOverHandle1(alarmRule, alarmRuleDetailList.get(0), ztData,ZtApiDataColumnConstant.waterSmallScaleOverList,true, adCode, false,uuid);
+				}
+				if (alarmRuleDetailList.get(1).getAlarmMode().equals("短信")) {
+					asyncNoticeHandle.waterSmallScaleOverHandle2(alarmRule, alarmRuleDetailList.get(1), ztData,ZtApiDataColumnConstant.waterSmallScaleOverList,true, adCode, false,uuid);
+				}
+			}
 		}
 		// 返回
 		return "水位小幅超汛限告警";
@@ -234,22 +261,24 @@
 	public String waterBigScaleOverHandle(String arg1, String arg2) {
 		//String adCode = "421303000000";
 		String adCode = null;
-		String templateId1 = "2431012248620";
-		String templateId2 = "2431012248623";
-		String uuid1 = templateId1 + UUID.randomUUID().toString();
-		String uuid2 = templateId2 + UUID.randomUUID().toString();
-		String[] split = arg1.split(",");
+		String uuid = UUID.randomUUID().toString();
 		// 查询当前策略对应的告警规则信息
-		AlarmRule alarmRule1 = alarmRuleService.getOne(new QueryWrapper<AlarmRule>().eq("rule_name", split[0]));
-		AlarmRule alarmRule2 = alarmRuleService.getOne(new QueryWrapper<AlarmRule>().eq("rule_name", split[1]));
-		// 发两个不同的模板
-		if (null!=alarmRule1) {
-			// 短信发送
-			asyncNoticeHandle.waterBigScaleOverHandle1(templateId1, uuid1, alarmRule1,adCode,true);
-		}
-		if (null!=alarmRule2) {
-			// 短信发送
-			asyncNoticeHandle.waterBigScaleOverHandle2(templateId2, uuid2, alarmRule2,adCode,true);
+		AlarmRule alarmRule = alarmRuleService.getOne(new QueryWrapper<AlarmRule>().eq("rule_name", arg1));
+		// 调用中台服务接口查询数据
+		JSONArray ztData = noticeHandle.getZtData("", ZtApiUrlConstant.res_over_z_big_over_api);
+		// 获取告警规则详情,判断告警类型(短信,电话,站内信)
+		if (null!=alarmRule) {
+			// 查询告警详情信息
+			List<AlarmRuleDetail> alarmRuleDetailList = alarmRuleDetailService.list(new QueryWrapper<AlarmRuleDetail>().eq("alarm_rule_id", alarmRule.getId()));
+			if (alarmRuleDetailList.size()>0){
+				// 遍历
+				if (alarmRuleDetailList.get(0).getAlarmMode().equals("短信")) {
+					asyncNoticeHandle.waterBigScaleOverHandle1(alarmRule, alarmRuleDetailList.get(0), ztData,ZtApiDataColumnConstant.waterBigScaleOverList1,true, adCode, false,uuid);
+				}
+				if (alarmRuleDetailList.get(1).getAlarmMode().equals("短信")) {
+					asyncNoticeHandle.waterBigScaleOverHandle2(alarmRule, alarmRuleDetailList.get(1), ztData,ZtApiDataColumnConstant.waterBigScaleOverList2,true, adCode, false,uuid);
+				}
+			}
 		}
 		// 返回
 		return "水位大幅超汛限告警";
@@ -263,8 +292,32 @@
 	 * @return
 	 */
 	public String waterComeDesignHandle(String arg1, String arg2) {
-		// 业务逻辑处理 2...
-		return "";
+		String adCode = null;
+		String uuid = UUID.randomUUID().toString();
+		// 查询当前策略对应的告警规则信息
+		AlarmRule alarmRule = alarmRuleService.getOne(new QueryWrapper<AlarmRule>().eq("rule_name", arg1));
+		// 调用中台服务接口查询数据
+		JSONArray ztData = noticeHandle.getZtData("", ZtApiUrlConstant.res_over_des_is_warn_api);
+		// 获取告警规则详情,判断告警类型(短信,电话,站内信)
+		if (null!=alarmRule) {
+			// 查询告警详情信息
+			List<AlarmRuleDetail> alarmRuleDetailList = alarmRuleDetailService.list(new QueryWrapper<AlarmRuleDetail>().eq("alarm_rule_id", alarmRule.getId()));
+			if (alarmRuleDetailList.size()>0){
+				// 遍历
+				for (AlarmRuleDetail alarmRuleDetail : alarmRuleDetailList) {
+					if (alarmRuleDetail.getAlarmMode().equals("短信")) {
+						asyncNoticeHandle.waterComeDesignHandleBySms(alarmRule, alarmRuleDetail, ztData,ZtApiDataColumnConstant.waterComeDesignList1,true, adCode, false,uuid);
+					}
+//					if (alarmRuleDetail.getAlarmMode().equals("电话")) {
+//						asyncNoticeHandle.waterComeDesignHandleCall(alarmRule, alarmRuleDetail, ztData,ZtApiDataColumnConstant.waterComeDesignList2,true, adCode, false,uuid);
+//					}
+					if (alarmRuleDetail.getAlarmMode().equals("站内信")) {
+						asyncNoticeHandle.waterComeDesignHandleStation(alarmRule, alarmRuleDetail, ztData,ZtApiDataColumnConstant.waterComeDesignList3,true, adCode, true,uuid);
+					}
+				}
+			}
+		}
+		return "水位接近设计洪水位告警";
 	}
 
 	/**
@@ -275,15 +328,27 @@
 	 * @return
 	 */
 	public String waterMoreDesignHandle(String arg1, String arg2) {
-		String templateId = "2431012248604";
-		String uuid = templateId + UUID.randomUUID().toString();
+		String adCode = null;
+		String uuid = UUID.randomUUID().toString();
 		// 查询当前策略对应的告警规则信息
 		AlarmRule alarmRule = alarmRuleService.getOne(new QueryWrapper<AlarmRule>().eq("rule_name", arg1));
+		// 调用中台服务接口查询数据
+		JSONArray ztData = noticeHandle.getZtData("", ZtApiUrlConstant.over_des_rz_warn_api);
+		// 获取告警规则详情,判断告警类型(短信,电话,站内信)
 		if (null!=alarmRule) {
-			// 异步处理,暂时解决超时重置问题
-			Map<String, Object> map = asyncNoticeHandle.waterMoreDesignHandle(templateId, uuid, alarmRule);
-			// 返回
-			return "水位超设计洪水位告警";
+			// 查询告警详情信息
+			List<AlarmRuleDetail> alarmRuleDetailList = alarmRuleDetailService.list(new QueryWrapper<AlarmRuleDetail>().eq("alarm_rule_id", alarmRule.getId()));
+			if (alarmRuleDetailList.size()>0){
+				// 遍历
+				for (AlarmRuleDetail alarmRuleDetail : alarmRuleDetailList) {
+					if (alarmRuleDetail.getAlarmMode().equals("短信")) {
+						asyncNoticeHandle.waterMoreDesignHandle(alarmRule, alarmRuleDetail, ztData,ZtApiDataColumnConstant.waterMoreDesignList,true, adCode, false,uuid);
+					}
+//					if (alarmRuleDetail.getAlarmMode().equals("电话")) {
+//						asyncNoticeHandle.waterMoreDesignHandleCall(alarmRule, alarmRuleDetail, ztData,ZtApiDataColumnConstant.waterMoreDesignList,true, adCode, false,uuid);
+//					}
+				}
+			}
 		}
 		// 返回
 		return "水位超设计洪水位告警";
@@ -297,8 +362,30 @@
 	 * @return
 	 */
 	public String waterMoreCheckHandle(String arg1, String arg2) {
-		// 业务逻辑处理 2...
-		return "";
+		String adCode = null;
+		String uuid = UUID.randomUUID().toString();
+		// 查询当前策略对应的告警规则信息
+		AlarmRule alarmRule = alarmRuleService.getOne(new QueryWrapper<AlarmRule>().eq("rule_name", arg1));
+		// 调用中台服务接口查询数据
+		JSONArray ztData = noticeHandle.getZtData("", ZtApiUrlConstant.res_over_chec_api);
+		// 获取告警规则详情,判断告警类型(短信,电话,站内信)
+		if (null!=alarmRule) {
+			// 查询告警详情信息
+			List<AlarmRuleDetail> alarmRuleDetailList = alarmRuleDetailService.list(new QueryWrapper<AlarmRuleDetail>().eq("alarm_rule_id", alarmRule.getId()));
+			if (alarmRuleDetailList.size()>0){
+				// 遍历
+				for (AlarmRuleDetail alarmRuleDetail : alarmRuleDetailList) {
+					if (alarmRuleDetail.getAlarmMode().equals("短信")) {
+						asyncNoticeHandle.waterMoreCheckHandle(alarmRule, alarmRuleDetail, ztData,ZtApiDataColumnConstant.waterMoreCheckList,true, adCode, false,uuid);
+					}
+//					if (alarmRuleDetail.getAlarmMode().equals("电话")) {
+//						asyncNoticeHandle.waterMoreCheckHandleCall(alarmRule, alarmRuleDetail, ztData,ZtApiDataColumnConstant.waterMoreCheckList,true, adCode, false,uuid);
+//					}
+				}
+			}
+		}
+		// 返回
+		return "水位超校核洪水位告警";
 	}
 
 	/**
@@ -309,8 +396,27 @@
 	 * @return
 	 */
 	public String waterComeOneHourUpHandle(String arg1, String arg2) {
-		// 业务逻辑处理 2...
-		return "";
+		String adCode = null;
+		String uuid = UUID.randomUUID().toString();
+		// 查询当前策略对应的告警规则信息
+		AlarmRule alarmRule = alarmRuleService.getOne(new QueryWrapper<AlarmRule>().eq("rule_name", arg1));
+		// 调用中台服务接口查询数据
+		JSONArray ztData = noticeHandle.getZtData("", ZtApiUrlConstant.res_z_diff_up_api);
+		// 获取告警规则详情,判断告警类型(短信,电话,站内信)
+		if (null!=alarmRule) {
+			// 查询告警详情信息
+			List<AlarmRuleDetail> alarmRuleDetailList = alarmRuleDetailService.list(new QueryWrapper<AlarmRuleDetail>().eq("alarm_rule_id", alarmRule.getId()));
+			if (alarmRuleDetailList.size()>0){
+				// 遍历
+				for (AlarmRuleDetail alarmRuleDetail : alarmRuleDetailList) {
+					if (alarmRuleDetail.getAlarmMode().equals("短信")) {
+						asyncNoticeHandle.waterComeOneHourUpHandle(alarmRule, alarmRuleDetail, ztData,ZtApiDataColumnConstant.waterComeOneHourUpList,true, adCode, false,uuid);
+					}
+				}
+			}
+		}
+		// 返回
+		return "近1h水位陡升";
 	}
 
 	/**
@@ -321,8 +427,27 @@
 	 * @return
 	 */
 	public String waterComeOneHourDownHandle(String arg1, String arg2) {
-		// 业务逻辑处理 2...
-		return "";
+		String adCode = null;
+		String uuid = UUID.randomUUID().toString();
+		// 查询当前策略对应的告警规则信息
+		AlarmRule alarmRule = alarmRuleService.getOne(new QueryWrapper<AlarmRule>().eq("rule_name", arg1));
+		// 调用中台服务接口查询数据
+		JSONArray ztData = noticeHandle.getZtData("", ZtApiUrlConstant.res_z_diff_down_api);
+		// 获取告警规则详情,判断告警类型(短信,电话,站内信)
+		if (null!=alarmRule) {
+			// 查询告警详情信息
+			List<AlarmRuleDetail> alarmRuleDetailList = alarmRuleDetailService.list(new QueryWrapper<AlarmRuleDetail>().eq("alarm_rule_id", alarmRule.getId()));
+			if (alarmRuleDetailList.size()>0){
+				// 遍历
+				for (AlarmRuleDetail alarmRuleDetail : alarmRuleDetailList) {
+					if (alarmRuleDetail.getAlarmMode().equals("短信")) {
+						asyncNoticeHandle.waterComeOneHourDownHandle(alarmRule, alarmRuleDetail, ztData,ZtApiDataColumnConstant.waterComeOneHourDownList,true, adCode, false,uuid);
+					}
+				}
+			}
+		}
+		// 返回
+		return "近1h水位陡降";
 	}
 
 	/**
@@ -347,12 +472,22 @@
 	public String alreadyHeavyRainHandle(String arg1, String arg2) {
 		//String adCode = "420607000000";
 		String adCode = null;
-		String templateId = "2431012248569";
-		String uuid = templateId + UUID.randomUUID().toString();
 		// 查询当前策略对应的告警规则信息
 		AlarmRule alarmRule = alarmRuleService.getOne(new QueryWrapper<AlarmRule>().eq("rule_name", arg1));
+		// 调用中台服务接口查询数据
+		JSONArray ztData = noticeHandle.getZtData("", ZtApiUrlConstant.alarm_rain_dy_api);
+		// 获取告警规则详情,判断告警类型(短信,电话,站内信)
 		if (null!=alarmRule) {
-			asyncNoticeHandle.alreadyHeavyRainHandle(templateId,uuid,alarmRule,adCode,false);
+			// 查询告警详情信息
+			List<AlarmRuleDetail> alarmRuleDetailList = alarmRuleDetailService.list(new QueryWrapper<AlarmRuleDetail>().eq("alarm_rule_id", alarmRule.getId()));
+			if (alarmRuleDetailList.size()>0){
+				// 遍历
+				for (AlarmRuleDetail alarmRuleDetail : alarmRuleDetailList) {
+					if (alarmRuleDetail.getAlarmMode().equals("短信")) {
+						asyncNoticeHandle.alreadyHeavyRainHandle(alarmRule, alarmRuleDetail, ztData,ZtApiDataColumnConstant.alreadyHeavyRainList,true, adCode, false);
+					}
+				}
+			}
 		}
 		// 返回
 		return "已降大雨告警";
@@ -368,12 +503,22 @@
 	public String alreadyRainstormHandle(String arg1, String arg2) {
 		//String adCode = "420607000000";
 		String adCode = null;
-		String templateId = "2431012216683";
-		String uuid = templateId + UUID.randomUUID().toString();
 		// 查询当前策略对应的告警规则信息
 		AlarmRule alarmRule = alarmRuleService.getOne(new QueryWrapper<AlarmRule>().eq("rule_name", arg1));
+		// 调用中台服务接口查询数据
+		JSONArray ztData = noticeHandle.getZtData("", ZtApiUrlConstant.alarm_rain_by_api);
+		// 获取告警规则详情,判断告警类型(短信,电话,站内信)
 		if (null!=alarmRule) {
-			asyncNoticeHandle.alreadyRainstormHandle(templateId,uuid,alarmRule,adCode,false);
+			// 查询告警详情信息
+			List<AlarmRuleDetail> alarmRuleDetailList = alarmRuleDetailService.list(new QueryWrapper<AlarmRuleDetail>().eq("alarm_rule_id", alarmRule.getId()));
+			if (alarmRuleDetailList.size()>0){
+				// 遍历
+				for (AlarmRuleDetail alarmRuleDetail : alarmRuleDetailList) {
+					if (alarmRuleDetail.getAlarmMode().equals("短信")) {
+						asyncNoticeHandle.alreadyRainstormHandle(alarmRule, alarmRuleDetail, ztData,ZtApiDataColumnConstant.alreadyRainstormList,true, adCode, false);
+					}
+				}
+			}
 		}
 		// 返回
 		return "已降暴雨告警";
@@ -400,13 +545,27 @@
 	 */
 	public String sixHourRainHandle(String arg1, String arg2) {
 		//String adCode = "420607000000";
+		String uuid = UUID.randomUUID().toString();
 		String adCode = null;
-		String templateId = "2431012216686";
-		String uuid = templateId + UUID.randomUUID().toString();
 		// 查询当前策略对应的告警规则信息
 		AlarmRule alarmRule = alarmRuleService.getOne(new QueryWrapper<AlarmRule>().eq("rule_name", arg1));
+		// 调用中台服务接口查询数据
+		JSONArray ztData = noticeHandle.getZtData("", ZtApiUrlConstant.alarm_rain_6_over_api);
+		// 获取告警规则详情,判断告警类型(短信,电话,站内信)
 		if (null!=alarmRule) {
-			asyncNoticeHandle.sixHourRainHandle(templateId,uuid,alarmRule,adCode,false);
+			// 查询告警详情信息
+			List<AlarmRuleDetail> alarmRuleDetailList = alarmRuleDetailService.list(new QueryWrapper<AlarmRuleDetail>().eq("alarm_rule_id", alarmRule.getId()));
+			if (alarmRuleDetailList.size()>0){
+				// 遍历
+				for (AlarmRuleDetail alarmRuleDetail : alarmRuleDetailList) {
+					if (alarmRuleDetail.getAlarmMode().equals("短信")) {
+						asyncNoticeHandle.sixHourRainHandle(alarmRule, alarmRuleDetail, ztData,ZtApiDataColumnConstant.sixHourRainList,true, adCode, false,uuid);
+					}
+//					if (alarmRuleDetail.getAlarmMode().equals("电话")) {
+//						asyncNoticeHandle.sixHourRainHandleByCall(alarmRule, alarmRuleDetail, ztData,ZtApiDataColumnConstant.sixHourRainList,true, adCode, false,uuid);
+//					}
+				}
+			}
 		}
 		// 返回
 		return "6小时降雨告警";

--
Gitblit v1.9.3