From 08a962d2925baa255207fdf979e6fee794f1773b Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Fri, 19 Jul 2024 12:25:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/controller/DamSecurityController.java | 138 +++++++++++++++++++++++++++++++++++++++------
1 files changed, 118 insertions(+), 20 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/controller/DamSecurityController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/controller/DamSecurityController.java
index dbfea37..15321f8 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/controller/DamSecurityController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/controller/DamSecurityController.java
@@ -5,9 +5,7 @@
import cn.gistack.nky.vo.AlarmGetVO;
import cn.gistack.nky.vo.PageVO;
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 cn.gistack.sm.damSecurity.vo.*;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -16,6 +14,7 @@
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
@@ -34,20 +33,32 @@
@Autowired
private INkyClient nkyClient;
+// /**
+// * 大坝安全监测状况统计
+// * @param damSecurityStatistics
+// * @return
+// */
+// @ApiOperation(value = "大坝安全统计-大坝安全监测状况统计", notes = "大坝安全统计-大坝安全监测状况统计")
+// @GetMapping(value = "/singleRegionCount")
+// public R singleRegionCount(DamSecurityStatistics damSecurityStatistics) {
+// DamSecurityStatistics data = damSecurityService.getSingleRegionCount(damSecurityStatistics);
+// return R.data(data);
+// }
+
/**
- * 大坝安全监测状况统计
+ * 大坝安全监测状况统计(逻辑已修改)
* @param damSecurityStatistics
* @return
*/
@ApiOperation(value = "大坝安全统计-大坝安全监测状况统计", notes = "大坝安全统计-大坝安全监测状况统计")
@GetMapping(value = "/singleRegionCount")
- public R singleRegionCount(DamSecurityStatistics damSecurityStatistics) {
- DamSecurityStatistics data = damSecurityService.getSingleRegionCount(damSecurityStatistics);
+ public R singleRegionCountOptimize(DamSecurityStatistics damSecurityStatistics) {
+ DamSecurityStatistics data = damSecurityService.getSingleRegionCountOptimize(damSecurityStatistics);
return R.data(data);
}
/**
- * 大坝安全监测区域统计
+ * 大坝安全监测区域统计(逻辑已修改)
* @param damSecurityStatistics
* @return
*/
@@ -59,18 +70,41 @@
}
/**
- * 监测预警分布
- * @param damSecurityStatistics
+ * 监测预警分布（柱状图）
+ * @param damMonitor
* @return
*/
@GetMapping(value = "/listRegionCountMonitor")
- public R listRegionCountMonitor(DamSecurityStatistics damSecurityStatistics){
- List<DamSecurityStatistics> list = damSecurityService.listRegionCountMonitor(damSecurityStatistics);
+ public R listRegionCountMonitor(DamMonitor damMonitor){
+ List<DamMonitor> list = damSecurityService.listRegionCountMonitor(damMonitor);
return R.data(list);
}
/**
- * 大坝安全监测表格
+ * 监测预警分布（饼图）
+ * @param damMonitor
+ * @return
+ */
+ @GetMapping(value = "/levelMonitorPie")
+ public R levelMonitorPie(DamMonitor damMonitor){
+ List<LevelPo> list = damSecurityService.levelMonitorPie(damMonitor);
+ return R.data(list);
+ }
+
+ /**
+ * 监测预警分布表格
+ * @param alarmGet
+ * @param query
+ * @return
+ */
+ @GetMapping(value = "/pageMonitor")
+ public R pageMonitor(AlarmGetVO alarmGet,Query query){
+ IPage<AlarmGetVO> page = damSecurityService.pageMonitor(alarmGet,Condition.getPage(query));
+ return R.data(page);
+ }
+
+ /**
+ * 大坝安全监测表格(逻辑已修改)
* @param damStationStatistics
* @return
*/
@@ -82,7 +116,7 @@
}
/**
- * 大坝安全监测表格导出
+ * 大坝安全监测表格导出（逻辑已修改）
* @param damStationStatistics
* @return
*/
@@ -114,12 +148,14 @@
@ApiOperation(value = "大坝安全统计-大坝安全监测预警详情", notes = "大坝安全统计-大坝安全监测预警详情")
@GetMapping(value = "/alarmDetailPage")
public R alarmDetail(AlarmGetVO alarmGet,Query query){
- PageVO<AlarmGetVO> page = nkyClient.getAlarmDetailPage(query.getCurrent(), query.getSize(), alarmGet);
+ String ascs = StringUtil.isBlank(query.getAscs())?"":query.getAscs();
+ String descs = StringUtil.isBlank(query.getDescs())?"":query.getDescs();
+ PageVO<AlarmGetVO> page = nkyClient.getAlarmDetailPage(query.getCurrent(), query.getSize(), alarmGet,ascs,descs);
return R.data(page);
}
/**
- * 大坝安全监测预警异常统计
+ * 大坝安全监测预警异常统计-南科院
* @param damStationStatistics
* @return
*/
@@ -131,19 +167,58 @@
}
/**
- * 业务一张图 大坝安全监测
+ * 大坝安全监测预警异常统计-中台预警
+ * @param damMonitor
+ * @return
+ */
+ @ApiOperation(value = "大坝安全统计-大坝安全监测预警异常统计", notes = "大坝安全统计-大坝安全监测预警异常统计")
+ @GetMapping(value = "/alarmResCountZt")
+ public R alarmResCountZt(DamMonitor damMonitor){
+ if (StringUtil.isBlank(damMonitor.getStartTime()) || StringUtil.isBlank(damMonitor.getEndTime()))
+ return R.fail("查询时间不能为空");
+ List<DamStationStatistics> list = damSecurityService.alarmResCount(damMonitor);
+ return R.data(list);
+ }
+
+// /**
+// * 业务一张图 大坝安全监测
+// * @param adCode
+// * @return
+// */
+// @ApiOperation(value = "大坝安全统计-大坝安全监测", notes = "大坝安全统计-大坝安全监测")
+// @GetMapping(value = "/damResInfoCount")
+// public R damResInfoCount(String adCode){
+// List<DamStatisticsRes> list = damSecurityService.damResInfoCount(adCode);
+// return R.data(list);
+// }
+
+ /**
+ * 业务一张图 大坝安全监测(优化)
* @param adCode
* @return
*/
@ApiOperation(value = "大坝安全统计-大坝安全监测", notes = "大坝安全统计-大坝安全监测")
@GetMapping(value = "/damResInfoCount")
- public R damResInfoCount(String adCode){
- List<DamStatisticsRes> list = damSecurityService.damResInfoCount(adCode);
+ public R damResInfoCountOptimize(String adCode){
+ List<DamStatisticsRes> list = damSecurityService.damResInfoCountOptimize(adCode);
return R.data(list);
}
/**
- * 业务一张图 大坝安全监测（地图）
+ * 单项---业务一张图 大坝安全监测(优化)
+ * @param adCode
+ * @param type sy sl wy
+ * @return
+ */
+ @ApiOperation(value = "大坝安全统计-大坝安全监测", notes = "大坝安全统计-大坝安全监测")
+ @GetMapping(value = "/damResInfoCountType")
+ public R damResInfoCountOptimizeType(String adCode,String type){
+ DamStatisticsRes damStatisticsRes = damSecurityService.damResInfoCountOptimizeType(adCode,type);
+ return R.data(damStatisticsRes);
+ }
+
+ /**
+ * 业务一张图 大坝安全监测（地图）（逻辑已修改）
* @param obj(adCode :行政区划;type:监测类型;status :状态 1全部;2正常;3异常)
* @return
*/
@@ -154,6 +229,12 @@
return R.data(list);
}
+ @GetMapping(value = "/getDamInfoCountByRegion")//已修改逻辑
+ public R getDamInfoCountByRegion(DamStatisticsRegion damStatisticsRegion){
+ List<DamStatisticsRegion> list = damSecurityService.getDamInfoCountByRegion(damStatisticsRegion);
+ return R.data(list);
+ }
+
/**
* 预警状态修改
* @param alarmGet
@@ -161,8 +242,25 @@
*/
@PostMapping("/update")
@ApiOperation(value = "大坝安全统计-预警状态修改", notes = "大坝安全统计-预警状态修改")
- public R updateAlarmGet(AlarmGet alarmGet){
+ public R updateAlarmGet(AlarmGetVO alarmGet){
return R.data(nkyClient.updateAlarmGet(alarmGet));
}
+ /**
+ * 预警状态修改
+ * @param alarmGet
+ * @return
+ */
+ @PostMapping("/updateStatus")
+ @ApiOperation(value = "大坝安全统计-预警状态修改", notes = "大坝安全统计-预警状态修改")
+ public R updateStatus(AlarmGet alarmGet){
+ return R.data(nkyClient.updateStatus(alarmGet));
+ }
+
+ @GetMapping("/getLatestResRecord")
+ public R getLatestResRecord(AlarmGet alarmGet){
+ List<AlarmGetVO> list = damSecurityService.getLatestResRecord(alarmGet);
+ return R.data(list);
+ }
+
}
--
Gitblit v1.9.3