From aa2004ef65a3d8c8e15ec1689fc4f8e1b8d91c59 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Wed, 24 Jan 2024 17:05:41 +0800
Subject: [PATCH] 巡检申报增加水库字段
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/service/impl/DamSecurityServiceImpl.java | 26 ++++++++++++++++++++------
1 files changed, 20 insertions(+), 6 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 207d34a..6ef5123 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
@@ -142,11 +142,11 @@
if (damStatisticsRegion.getStatus().equals("total")){
//点击总数
if (damStatisticsRegion.getType().equals("sy")){
- list = damSecurityMapper.getDamSyRegion(damStatisticsRegion);
+ list = damSecurityMapper.getDamSyRegion(damStatisticsRegion);//已修改逻辑
}else if (damStatisticsRegion.getType().equals("sl")){
- list = damSecurityMapper.getDamSlRegion(damStatisticsRegion);
+ list = damSecurityMapper.getDamSlRegion(damStatisticsRegion);//1
}else if (damStatisticsRegion.getType().equals("wy")){
- list = damSecurityMapper.getDamWyRegion(damStatisticsRegion);
+ list = damSecurityMapper.getDamWyRegion(damStatisticsRegion);//1
}
}else if (damStatisticsRegion.getStatus().equals("error")){
//点异常
@@ -154,14 +154,28 @@
}else if (damStatisticsRegion.getStatus().equals("normal")){
//点正常
if (damStatisticsRegion.getType().equals("sy")){
- list = damSecurityMapper.getDamSyRegionNormal(damStatisticsRegion);
+ list = damSecurityMapper.getDamSyRegionNormal(damStatisticsRegion);//1
}else if (damStatisticsRegion.getType().equals("sl")){
- list = damSecurityMapper.getDamSlRegionNormal(damStatisticsRegion);
+ list = damSecurityMapper.getDamSlRegionNormal(damStatisticsRegion);//1
}else if (damStatisticsRegion.getType().equals("wy")){
- list = damSecurityMapper.getDamWyRegionNormal(damStatisticsRegion);
+ list = damSecurityMapper.getDamWyRegionNormal(damStatisticsRegion);//1
}
}
return list;
}
+
+ @Override
+ 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);
+
+ list.add(sy);
+ list.add(sl);
+ list.add(wy);
+ return list;
+ }
}
--
Gitblit v1.9.3