From 5b1aa6d3fd9c43ae87366148bfd3574e561efebb Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 23 Jan 2024 15:45:15 +0800
Subject: [PATCH] 大坝监测预警接口逻辑修改
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/service/impl/DamSecurityServiceImpl.java | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 55 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 ddd2690..b285188 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,7 +4,9 @@
import cn.gistack.sm.damSecurity.mapper.DamSecurityMapper;
import cn.gistack.sm.damSecurity.service.IDamSecurityService;
import cn.gistack.sm.damSecurity.vo.*;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mysql.cj.protocol.x.ReusableInputStream;
import org.springblade.core.tool.utils.ObjectUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -28,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
@@ -39,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
@@ -133,4 +142,48 @@
return damSecurityMapper.getRegionList(damMonitor);
}
+ @Override
+ public List<DamStatisticsRegion> getDamInfoCountByRegion(DamStatisticsRegion damStatisticsRegion) {
+ List<DamStatisticsRegion> list = new ArrayList<>();
+
+ if (damStatisticsRegion.getStatus().equals("total")){
+ //点击总数
+ if (damStatisticsRegion.getType().equals("sy")){
+ list = damSecurityMapper.getDamSyRegion(damStatisticsRegion);//已修改逻辑
+ }else if (damStatisticsRegion.getType().equals("sl")){
+ list = damSecurityMapper.getDamSlRegion(damStatisticsRegion);//1
+ }else if (damStatisticsRegion.getType().equals("wy")){
+ list = damSecurityMapper.getDamWyRegion(damStatisticsRegion);//1
+ }
+ }else if (damStatisticsRegion.getStatus().equals("error")){
+ //点异常
+ list = damSecurityMapper.getErrorDamRegion(damStatisticsRegion);
+ }else if (damStatisticsRegion.getStatus().equals("normal")){
+ //点正常
+ if (damStatisticsRegion.getType().equals("sy")){
+ list = damSecurityMapper.getDamSyRegionNormal(damStatisticsRegion);//1
+ }else if (damStatisticsRegion.getType().equals("sl")){
+ list = damSecurityMapper.getDamSlRegionNormal(damStatisticsRegion);//1
+ }else if (damStatisticsRegion.getType().equals("wy")){
+ 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