From acf4a8171ae814e0d7fb061d163f95640dc39abc Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 10 Aug 2023 17:50:37 +0800
Subject: [PATCH] hst调用修改,大坝安全监测接口

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/service/impl/DamSecurityServiceImpl.java |   34 ++++++++++++++++++++++++++++++++++
 1 files changed, 34 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 1a6845b..ddbf0c3 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
@@ -4,10 +4,16 @@
 import cn.gistack.sm.damSecurity.service.IDamSecurityService;
 import cn.gistack.sm.damSecurity.vo.DamSecurityStatistics;
 import cn.gistack.sm.damSecurity.vo.DamStationStatistics;
+import cn.gistack.sm.damSecurity.vo.DamStatisticsRes;
 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.ArrayList;
 import java.util.List;
 
 @Service
@@ -40,4 +46,32 @@
 	public List<DamStationStatistics> alarmResCount(DamStationStatistics damStationStatistics) {
 		return damSecurityMapper.alarmResCount(damStationStatistics);
 	}
+
+	@Override
+	public List<DamStatisticsRes> damResInfoCount(String adCode) {
+
+		List<DamStatisticsRes> list = damSecurityMapper.damResInfoCount(adCode);
+
+		list.forEach(damStatisticsRes -> {
+			List<DamStationStatistics> errorList = damSecurityMapper.getResErrorList(damStatisticsRes,adCode);
+			damStatisticsRes.setErrorList(errorList);
+		});
+
+		list.forEach(damStatisticsRes -> {
+			List<DamStationStatistics> normalList = new ArrayList<>();
+			if (damStatisticsRes.getType().equals("1")){
+				//渗压
+				normalList = damSecurityMapper.getResSyNormalList(adCode);
+			}else if (damStatisticsRes.getType().equals("2")){
+				//渗流
+				normalList = damSecurityMapper.getResSlNormalList(adCode);
+			}else if (damStatisticsRes.getType().equals("3")){
+				//位移
+				 normalList = damSecurityMapper.getResWyNormalList(adCode);
+			}
+			damStatisticsRes.setNormalList(normalList);
+		});
+
+		return list;
+	}
 }

--
Gitblit v1.9.3