From fd2dee0c60271966208c673b718c17ee4e13b0c3 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 30 Jan 2024 11:58:20 +0800
Subject: [PATCH] 大坝安全监测业务一张图接口优化
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/service/impl/DamSecurityServiceImpl.java | 57 +++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 49 insertions(+), 8 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..251a4e3 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
@@ -30,8 +30,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,7 +47,8 @@
@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
@@ -142,11 +149,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 +161,48 @@
}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); //7s
+ DamStatisticsRes sl = damSecurityMapper.damResInfoCountSl(adCode); //3s
+ DamStatisticsRes wy = damSecurityMapper.damResInfoCountWy(adCode);//7s
+
+ list.add(sy);
+ list.add(sl);
+ 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;
+ }
+
}
--
Gitblit v1.9.3