From 1fee64c10ffa5961f6970378d66a56e9b9f095f3 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 11 Aug 2023 10:48:25 +0800
Subject: [PATCH] hst查询接口;大坝地图接口

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/service/impl/DamSecurityServiceImpl.java |   58 ++++++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 40 insertions(+), 18 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 ddbf0c3..6b5d3d0 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
@@ -14,6 +14,7 @@
 import java.net.URLDecoder;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 
 @Service
@@ -52,25 +53,46 @@
 
 		List<DamStatisticsRes> list = damSecurityMapper.damResInfoCount(adCode);
 
-		list.forEach(damStatisticsRes -> {
-			List<DamStationStatistics> errorList = damSecurityMapper.getResErrorList(damStatisticsRes,adCode);
-			damStatisticsRes.setErrorList(errorList);
-		});
+//		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);
+//		});
 
-		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;
+	}
+
+	@Override
+	public List<DamStationStatistics> damResInfoCountMap(HashMap<String,String>  obj) {
+		String type = obj.get("type");
+		String adCode = obj.get("adCode");
+		String status = obj.get("status");
+
+
+		List<DamStationStatistics> list = new ArrayList<>();
+		if (type.equals("sy")){
+			list = damSecurityMapper.getSyList(adCode,status);
+		}else if (type.equals("sl")){
+			list = damSecurityMapper.getSlList(adCode,status);
+		}else if (type.equals("wy")){
+			list = damSecurityMapper.getWyList(adCode,status);
+		}else {
+			return null;
+		}
 
 		return list;
 	}

--
Gitblit v1.9.3