From b8e5669a7f8b1e8935920f6b172369a07fae2f26 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 07 Sep 2023 20:12:36 +0800
Subject: [PATCH] Merge branch 'jtdev' of https://hbsl-code.gistack.cn/hbwri/manager into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/controller/DamSecurityController.java | 34 +++++++++++++++++++++++++++++-----
1 files changed, 29 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..0e4fe09 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
@@ -113,8 +114,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 +131,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