From e2fda8f4f705f6636fcf51e4c11a78a2b1f5f3b5 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Thu, 07 Mar 2024 13:54:00 +0800
Subject: [PATCH] 雨水情告警增加行政区划过滤

---
 skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/service/impl/AlarmRecordServiceImpl.java |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/service/impl/AlarmRecordServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/service/impl/AlarmRecordServiceImpl.java
index 7ec99cf..b20e36f 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/service/impl/AlarmRecordServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/service/impl/AlarmRecordServiceImpl.java
@@ -74,6 +74,17 @@
 		return list;
 	}
 
+	@Override
+	public Object statisticAlarmRecordByAlarmRuleType(AlarmRecordVO alarmRecord) {
+		if (!Strings.isBlank(alarmRecord.getAdCode())){
+			alarmRecord.setAdCode(alarmRecord.getAdCode().replaceAll("0+$", ""));
+		}
+		// 查询统计数据
+		List<StatisticAlarmRecord> list = baseMapper.statisticAlarmRecordByAlarmRuleType(alarmRecord);
+		// 返回数据
+		return list;
+	}
+
 	/**
 	 * 按行政区统计告警
 	 * @param alarmRecord
@@ -87,6 +98,11 @@
 		}
 		// 查询所有的市级行政区
 		List<String> adNameList = baseMapper.getAdNameList(alarmRecord.getAdCode());
+
+		if (alarmRecord.getAdLevel().equals("4")) {
+			adNameList = baseMapper.getAdNameListByAdCode(alarmRecord.getAdCode());
+		}
+
 		// 查询符合条件的告警类型
 		List<AlarmRule> alarmRuleList = baseMapper.listAlarmRule(alarmRecord);
 		// 查询统计数据

--
Gitblit v1.9.3