From f2d0713c2b20a6c751399e2468996eafb8812988 Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Thu, 18 Apr 2024 10:37:13 +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 |    9 +++++++++
 1 files changed, 9 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..96b8c13 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;
@@ -65,4 +66,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