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/service/impl/DamSecurityServiceImpl.java |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/service/impl/DamSecurityServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/service/impl/DamSecurityServiceImpl.java
index 6e2197f..70808a6 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/service/impl/DamSecurityServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/service/impl/DamSecurityServiceImpl.java
@@ -60,6 +60,11 @@
 	}
 
 	@Override
+	public List<DamStationStatistics> alarmResCount(DamMonitor damMonitor) {
+		return damSecurityMapper.alarmResCountByZt(damMonitor);
+	}
+
+	@Override
 	public List<DamStatisticsRes> damResInfoCount(String adCode) {
 
 		List<DamStatisticsRes> list = damSecurityMapper.damResInfoCount(adCode);

--
Gitblit v1.9.3