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/mapper/DamSecurityMapper.java | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/mapper/DamSecurityMapper.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/mapper/DamSecurityMapper.java
index a60d0bc..588045e 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/mapper/DamSecurityMapper.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/mapper/DamSecurityMapper.java
@@ -1,5 +1,6 @@
package cn.gistack.sm.damSecurity.mapper;
+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;
@@ -11,14 +12,21 @@
public interface DamSecurityMapper {
DamSecurityStatistics getSingleRegionCount(@Param("dam") DamSecurityStatistics damSecurityStatistics);
+ DamSecurityStatistics getSingleRegionCountOptimize(@Param("dam") DamSecurityStatistics damSecurityStatistics);
List<DamSecurityStatistics> listRegionCount(@Param("dam") DamSecurityStatistics damSecurityStatistics);
+ List<DamSecurityStatistics> listRegionCountOptimize(@Param("dam") DamSecurityStatistics damSecurityStatistics);
+
List<DamStationStatistics> tableResCount(@Param("dam") DamStationStatistics damStationStatistics);
List<DamStationStatistics> tableResCountPage(@Param("dam")DamStationStatistics damStationStatistics, IPage<DamStationStatistics> page);
+ List<DamStationStatistics> tableResCountPageOptimize(@Param("dam") DamStationStatistics damStationStatistics, IPage<DamStationStatistics> page);
+
List<DamStationStatistics> alarmResCount(@Param("dam") DamStationStatistics damStationStatistics,@Param("basCodes") String basCodes);
+
+ List<DamStationStatistics> alarmResCountByZt(@Param("dam") DamMonitor damMonitor);
List<DamStatisticsRes> damResInfoCount(@Param("adCode") String adCode);
@@ -44,8 +52,6 @@
List<AlarmGetVO> pageMonitorWy(IPage<AlarmGetVO> page, @Param("vo") AlarmGetVO alarmGet);
- List<LevelPo> levelMonitorPie(@Param("dam") DamMonitor damMonitor);
-
List<DamStatisticsRegion> getDamSyRegion(@Param("dam") DamStatisticsRegion damStatisticsRegion);
List<DamStatisticsRegion> getDamSlRegion(@Param("dam") DamStatisticsRegion damStatisticsRegion);
@@ -59,4 +65,15 @@
List<DamStatisticsRegion> getDamSlRegionNormal(@Param("dam") DamStatisticsRegion damStatisticsRegion);
List<DamStatisticsRegion> getDamWyRegionNormal(@Param("dam") DamStatisticsRegion damStatisticsRegion);
+
+ DamStatisticsRes damResInfoCountSy(@Param("adCode") String adCode);
+
+ DamStatisticsRes damResInfoCountSl(@Param("adCode") String adCode);
+
+ DamStatisticsRes damResInfoCountWy(@Param("adCode") String adCode);
+
+
+ List<AlarmGetVO> getLatestResRecord(@Param("alarmGet")AlarmGet alarmGet);
+
+ List<AlarmGetVO> getLatestResRecordWy(@Param("alarmGet") AlarmGet alarmGet);
}
--
Gitblit v1.9.3