From 7572552bcebd353050f95a1965526e2fadb31f67 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Tue, 08 Aug 2023 16:56:31 +0800
Subject: [PATCH] Merge branch 'jtdev' of https://hbsl-code.gistack.cn/hbwri/manager into jtdev

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/service/impl/DamSecurityServiceImpl.java |   21 +++++++++++++++++++++
 1 files changed, 21 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 baf182a..b8c6304 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
@@ -3,9 +3,15 @@
 import cn.gistack.sm.damSecurity.mapper.DamSecurityMapper;
 import cn.gistack.sm.damSecurity.service.IDamSecurityService;
 import cn.gistack.sm.damSecurity.vo.DamSecurityStatistics;
+import cn.gistack.sm.damSecurity.vo.DamStationStatistics;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.tool.utils.ObjectUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
 import java.util.List;
 
 @Service
@@ -23,4 +29,19 @@
 	public List<DamSecurityStatistics> listRegionCount(DamSecurityStatistics damSecurityStatistics) {
 		return damSecurityMapper.listRegionCount(damSecurityStatistics);
 	}
+
+	@Override
+	public List<DamStationStatistics> tableResCount(DamStationStatistics damStationStatistics) {
+		return damSecurityMapper.tableResCount(damStationStatistics);
+	}
+
+	@Override
+	public IPage<DamStationStatistics> tableResCountPage(DamStationStatistics damStationStatistics, IPage<DamStationStatistics> page) {
+		return page.setRecords(damSecurityMapper.tableResCountPage(damStationStatistics,page));
+	}
+
+	@Override
+	public List<DamStationStatistics> alarmResCount(DamStationStatistics damStationStatistics) {
+		return damSecurityMapper.alarmResCount(damStationStatistics);
+	}
 }

--
Gitblit v1.9.3