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 |   58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 56 insertions(+), 2 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 6ef5123..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
@@ -1,5 +1,6 @@
 package cn.gistack.sm.damSecurity.service.impl;
 
+import cn.gistack.nky.entity.AlarmGet;
 import cn.gistack.nky.vo.AlarmGetVO;
 import cn.gistack.sm.damSecurity.mapper.DamSecurityMapper;
 import cn.gistack.sm.damSecurity.service.IDamSecurityService;
@@ -7,7 +8,9 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.mysql.cj.protocol.x.ReusableInputStream;
+import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.tool.utils.ObjectUtil;
+import org.springblade.core.tool.utils.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -30,8 +33,14 @@
 	}
 
 	@Override
+	public DamSecurityStatistics getSingleRegionCountOptimize(DamSecurityStatistics damSecurityStatistics) {
+		return damSecurityMapper.getSingleRegionCountOptimize(damSecurityStatistics);
+	}
+
+	@Override
 	public List<DamSecurityStatistics> listRegionCount(DamSecurityStatistics damSecurityStatistics) {
-		return damSecurityMapper.listRegionCount(damSecurityStatistics);
+//		return damSecurityMapper.listRegionCount(damSecurityStatistics);
+		return damSecurityMapper.listRegionCountOptimize(damSecurityStatistics);
 	}
 
 	@Override
@@ -41,12 +50,18 @@
 
 	@Override
 	public IPage<DamStationStatistics> tableResCountPage(DamStationStatistics damStationStatistics, IPage<DamStationStatistics> page) {
-		return page.setRecords(damSecurityMapper.tableResCountPage(damStationStatistics,page));
+//		return page.setRecords(damSecurityMapper.tableResCountPage(damStationStatistics,page));
+		return page.setRecords(damSecurityMapper.tableResCountPageOptimize(damStationStatistics,page));
 	}
 
 	@Override
 	public List<DamStationStatistics> alarmResCount(DamStationStatistics damStationStatistics,String basCode) {
 		return damSecurityMapper.alarmResCount(damStationStatistics,basCode);
+	}
+
+	@Override
+	public List<DamStationStatistics> alarmResCount(DamMonitor damMonitor) {
+		return damSecurityMapper.alarmResCountByZt(damMonitor);
 	}
 
 	@Override
@@ -169,6 +184,9 @@
 	public List<DamStatisticsRes> damResInfoCountOptimize(String adCode) {
 
 		List<DamStatisticsRes> list = new ArrayList<>();
+
+
+
 		DamStatisticsRes sy = damSecurityMapper.damResInfoCountSy(adCode);
 		DamStatisticsRes sl = damSecurityMapper.damResInfoCountSl(adCode);
 		DamStatisticsRes wy = damSecurityMapper.damResInfoCountWy(adCode);
@@ -178,4 +196,40 @@
 		list.add(wy);
 		return list;
 	}
+
+
+
+	@Override
+	public DamStatisticsRes damResInfoCountOptimizeType(String adCode, String type) {
+
+		if (type.equals("sy")){
+			return  damSecurityMapper.damResInfoCountSy(adCode);
+		}else if(type.equals("sl")) {
+			return damSecurityMapper.damResInfoCountSl(adCode);
+		}else if (type.equals("wy")){
+			return damSecurityMapper.damResInfoCountWy(adCode);
+		}
+
+		return null;
+	}
+
+	@Override
+	public List<AlarmGetVO> getLatestResRecord(AlarmGet alarmGet) {
+
+		if (StringUtil.isBlank(alarmGet.getDamId())){
+			throw new ServiceException("水库编码为空");
+		}
+
+		if (StringUtil.isBlank(alarmGet.getType())){
+			throw new ServiceException("监测类型为空");
+		}
+
+		if (alarmGet.getType().equals("3")){
+			//位移，单独取测站名称
+			return damSecurityMapper.getLatestResRecordWy(alarmGet);
+		}else{
+			return damSecurityMapper.getLatestResRecord(alarmGet);
+		}
+	}
+
 }

--
Gitblit v1.9.3