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 | 11 +++++++++++
1 files changed, 11 insertions(+), 0 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 e4e4e95..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,5 +1,6 @@
package cn.gistack.sm.damSecurity.service;
+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;
@@ -38,6 +39,8 @@
*/
List<DamStationStatistics> alarmResCount(DamStationStatistics damStationStatistics,String basCode);
+ List<DamStationStatistics> alarmResCount(DamMonitor damMonitor);
+
/**
* 业务一张图大坝安全监测
* @param adCode 行政区划
@@ -65,4 +68,12 @@
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