From d687660b4d602e5aeb02f0a125a47a8f36009d40 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 23 Oct 2023 10:56:09 +0800
Subject: [PATCH] 大坝安全监测-总览-安全预警接口
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/controller/DamSecurityController.java | 45 ++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 40 insertions(+), 5 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 16dc81c..dbfea37 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
@@ -1,5 +1,6 @@
package cn.gistack.sm.damSecurity.controller;
+import cn.gistack.nky.entity.AlarmGet;
import cn.gistack.nky.fegin.INkyClient;
import cn.gistack.nky.vo.AlarmGetVO;
import cn.gistack.nky.vo.PageVO;
@@ -16,10 +17,10 @@
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
+import java.util.HashMap;
import java.util.List;
@Slf4j
@@ -54,6 +55,17 @@
@GetMapping(value = "/listRegionCount")
public R listRegionCount(DamSecurityStatistics damSecurityStatistics) {
List<DamSecurityStatistics> list = damSecurityService.listRegionCount(damSecurityStatistics);
+ return R.data(list);
+ }
+
+ /**
+ * 监测预警分布
+ * @param damSecurityStatistics
+ * @return
+ */
+ @GetMapping(value = "/listRegionCountMonitor")
+ public R listRegionCountMonitor(DamSecurityStatistics damSecurityStatistics){
+ List<DamSecurityStatistics> list = damSecurityService.listRegionCountMonitor(damSecurityStatistics);
return R.data(list);
}
@@ -113,8 +125,8 @@
*/
@ApiOperation(value = "大坝安全统计-大坝安全监测预警异常统计", notes = "大坝安全统计-大坝安全监测预警异常统计")
@GetMapping(value = "/alarmResCount")
- public R alarmResCount(DamStationStatistics damStationStatistics){
- List<DamStationStatistics> list = damSecurityService.alarmResCount(damStationStatistics);
+ public R alarmResCount(DamStationStatistics damStationStatistics,String basCodes){
+ List<DamStationStatistics> list = damSecurityService.alarmResCount(damStationStatistics,basCodes);
return R.data(list);
}
@@ -130,4 +142,27 @@
return R.data(list);
}
+ /**
+ * 业务一张图 大坝安全监测（地图）
+ * @param obj(adCode :行政区划;type:监测类型;status :状态 1全部;2正常;3异常)
+ * @return
+ */
+ @ApiOperation(value = "大坝安全统计-大坝安全监测（地图）", notes = "大坝安全统计-大坝安全监测（地图）")
+ @GetMapping(value = "/damResInfoCountMap")
+ public R damResInfoCountMap(@ApiIgnore @RequestParam HashMap<String, String> obj){
+ List<DamStationStatistics> list = damSecurityService.damResInfoCountMap(obj);
+ return R.data(list);
+ }
+
+ /**
+ * 预警状态修改
+ * @param alarmGet
+ * @return
+ */
+ @PostMapping("/update")
+ @ApiOperation(value = "大坝安全统计-预警状态修改", notes = "大坝安全统计-预警状态修改")
+ public R updateAlarmGet(AlarmGet alarmGet){
+ return R.data(nkyClient.updateAlarmGet(alarmGet));
+ }
+
}
--
Gitblit v1.9.3