From b8e5669a7f8b1e8935920f6b172369a07fae2f26 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 07 Sep 2023 20:12:36 +0800
Subject: [PATCH] Merge branch 'jtdev' of https://hbsl-code.gistack.cn/hbwri/manager into jtdev

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/service/IDamSecurityService.java |   18 +++++++++++++++++-
 1 files changed, 17 insertions(+), 1 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/service/IDamSecurityService.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/service/IDamSecurityService.java
index 8f38d25..8371344 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/service/IDamSecurityService.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/service/IDamSecurityService.java
@@ -2,8 +2,10 @@
 
 import cn.gistack.sm.damSecurity.vo.DamSecurityStatistics;
 import cn.gistack.sm.damSecurity.vo.DamStationStatistics;
+import cn.gistack.sm.damSecurity.vo.DamStatisticsRes;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
+import java.util.HashMap;
 import java.util.List;
 
 public interface IDamSecurityService {
@@ -35,5 +37,19 @@
 	 * @param damStationStatistics
 	 * @return
 	 */
-    List<DamStationStatistics> alarmResCount(DamStationStatistics damStationStatistics);
+    List<DamStationStatistics> alarmResCount(DamStationStatistics damStationStatistics,String basCode);
+
+	/**
+	 * 业务一张图大坝安全监测
+	 * @param adCode 行政区划
+	 * @return
+	 */
+    List<DamStatisticsRes> damResInfoCount(String adCode);
+
+	/**
+	 * 大坝安全监测地图集合
+	 * @param obj
+	 * @return
+	 */
+    List<DamStationStatistics> damResInfoCountMap(HashMap<String,String>  obj);
 }

--
Gitblit v1.9.3