From 6b8971db2990a8bcb4c67ba0d07df2368a00a45e Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 28 Dec 2023 19:57:42 +0800
Subject: [PATCH] 大坝一张图接口
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/controller/DamSecurityController.java | 43 +++++++++++++++++++++++++++++++++++--------
1 files changed, 35 insertions(+), 8 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..b4d4684 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;
@@ -59,14 +57,37 @@
}
/**
- * 监测预警分布
- * @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);
}
/**
@@ -154,6 +175,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,7 +188,7 @@
*/
@PostMapping("/update")
@ApiOperation(value = "大坝安全统计-预警状态修改", notes = "大坝安全统计-预警状态修改")
- public R updateAlarmGet(AlarmGet alarmGet){
+ public R updateAlarmGet(AlarmGetVO alarmGet){
return R.data(nkyClient.updateAlarmGet(alarmGet));
}
--
Gitblit v1.9.3