From 491df5b1e0bb868f7c7c971445699e67b562a6b3 Mon Sep 17 00:00:00 2001
From: shenyijian <1178253012@qq.com>
Date: Mon, 17 Jun 2024 18:58:51 +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 | 16 +++++++++++++++-
1 files changed, 15 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 406a0dd..15321f8 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
@@ -155,7 +155,7 @@
}
/**
- * 大坝安全监测预警异常统计
+ * 大坝安全监测预警异常统计-南科院
* @param damStationStatistics
* @return
*/
@@ -166,6 +166,20 @@
return R.data(list);
}
+ /**
+ * 大坝安全监测预警异常统计-中台预警
+ * @param damMonitor
+ * @return
+ */
+ @ApiOperation(value = "大坝安全统计-大坝安全监测预警异常统计", notes = "大坝安全统计-大坝安全监测预警异常统计")
+ @GetMapping(value = "/alarmResCountZt")
+ public R alarmResCountZt(DamMonitor damMonitor){
+ if (StringUtil.isBlank(damMonitor.getStartTime()) || StringUtil.isBlank(damMonitor.getEndTime()))
+ return R.fail("查询时间不能为空");
+ List<DamStationStatistics> list = damSecurityService.alarmResCount(damMonitor);
+ return R.data(list);
+ }
+
// /**
// * 业务一张图 大坝安全监测
// * @param adCode
--
Gitblit v1.9.3