From ae830f0421032b415ab505e8fbd82d257d01f1d5 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 05 Dec 2023 17:24:31 +0800
Subject: [PATCH] 大坝安全预警任务下发
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/controller/DamSecurityController.java | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 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 63bcdcb..80404d6 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,10 +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.DamMonitor;
-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;
@@ -60,13 +57,24 @@
}
/**
- * 监测预警分布
+ * 监测预警分布（柱状图）
* @param damMonitor
* @return
*/
@GetMapping(value = "/listRegionCountMonitor")
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);
}
@@ -174,7 +182,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