From f2d0713c2b20a6c751399e2468996eafb8812988 Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Thu, 18 Apr 2024 10:37:13 +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 | 24 +++++++++++++++++++++++-
1 files changed, 23 insertions(+), 1 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 53d858e..406a0dd 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
@@ -14,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;
@@ -147,7 +148,9 @@
@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);
}
@@ -188,6 +191,19 @@
}
/**
+ * 单项---业务一张图 大坝安全监测(优化)
+ * @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
@@ -227,4 +243,10 @@
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