From 74af90f34a5fd9d81776f9793c85c95d1d2df718 Mon Sep 17 00:00:00 2001
From: gong <328255720@qq.com>
Date: Mon, 17 Jun 2024 17:29:36 +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 | 6 ++++++
1 files changed, 6 insertions(+), 0 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 e25b1c1..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;
@@ -24,6 +25,8 @@
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);
@@ -70,4 +73,7 @@
DamStatisticsRes damResInfoCountWy(@Param("adCode") String adCode);
+ List<AlarmGetVO> getLatestResRecord(@Param("alarmGet")AlarmGet alarmGet);
+
+ List<AlarmGetVO> getLatestResRecordWy(@Param("alarmGet") AlarmGet alarmGet);
}
--
Gitblit v1.9.3