From b8e5669a7f8b1e8935920f6b172369a07fae2f26 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 07 Sep 2023 20:12:36 +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 | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 58 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 1a6845b..a89ff5e 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,17 @@
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.HashMap;
import java.util.List;
@Service
@@ -37,7 +44,56 @@
}
@Override
- public List<DamStationStatistics> alarmResCount(DamStationStatistics damStationStatistics) {
- return damSecurityMapper.alarmResCount(damStationStatistics);
+ public List<DamStationStatistics> alarmResCount(DamStationStatistics damStationStatistics,String basCode) {
+ return damSecurityMapper.alarmResCount(damStationStatistics,basCode);
+ }
+
+ @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;
+ }
+
+ @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