From 08a962d2925baa255207fdf979e6fee794f1773b Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Fri, 19 Jul 2024 12:25:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/service/IDamSecurityService.java | 46 +++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 43 insertions(+), 3 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..db45070 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
@@ -1,9 +1,11 @@
package cn.gistack.sm.damSecurity.service;
-import cn.gistack.sm.damSecurity.vo.DamSecurityStatistics;
-import cn.gistack.sm.damSecurity.vo.DamStationStatistics;
+import cn.gistack.nky.entity.AlarmGet;
+import cn.gistack.nky.vo.AlarmGetVO;
+import cn.gistack.sm.damSecurity.vo.*;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import java.util.HashMap;
import java.util.List;
public interface IDamSecurityService {
@@ -35,5 +37,43 @@
* @param damStationStatistics
* @return
*/
- List<DamStationStatistics> alarmResCount(DamStationStatistics damStationStatistics);
+ List<DamStationStatistics> alarmResCount(DamStationStatistics damStationStatistics,String basCode);
+
+ List<DamStationStatistics> alarmResCount(DamMonitor damMonitor);
+
+ /**
+ * 业务一张图大坝安全监测
+ * @param adCode 行政区划
+ * @return
+ */
+ List<DamStatisticsRes> damResInfoCount(String adCode);
+
+ /**
+ * 大坝安全监测地图集合
+ * @param obj
+ * @return
+ */
+ List<DamStationStatistics> damResInfoCountMap(HashMap<String,String> obj);
+
+ List<DamMonitor> listRegionCountMonitor(DamMonitor damMonitor);
+
+ /**
+ * 监测预警列表
+ * @param alarmGet
+ * @param page
+ * @return
+ */
+ IPage<AlarmGetVO> pageMonitor(AlarmGetVO alarmGet, IPage<AlarmGetVO> page);
+
+ List<LevelPo> levelMonitorPie(DamMonitor damMonitor);
+
+ List<DamStatisticsRegion> getDamInfoCountByRegion(DamStatisticsRegion damStatisticsRegion);
+
+ List<DamStatisticsRes> damResInfoCountOptimize(String adCode);
+
+ DamSecurityStatistics getSingleRegionCountOptimize(DamSecurityStatistics damSecurityStatistics);
+
+ DamStatisticsRes damResInfoCountOptimizeType(String adCode, String type);
+
+ List<AlarmGetVO> getLatestResRecord(AlarmGet alarmGet);
}
--
Gitblit v1.9.3