From 5b1aa6d3fd9c43ae87366148bfd3574e561efebb Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 23 Jan 2024 15:45:15 +0800
Subject: [PATCH] 大坝监测预警接口逻辑修改

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/controller/DamSecurityController.java |   26 +++++++++++++++++++-------
 1 files changed, 19 insertions(+), 7 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 f255202..53d858e 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
@@ -32,20 +32,32 @@
 	@Autowired
 	private  INkyClient nkyClient;
 
+//	/**
+//	 * 大坝安全监测状况统计
+//	 * @param damSecurityStatistics
+//	 * @return
+//	 */
+//	@ApiOperation(value = "大坝安全统计-大坝安全监测状况统计", notes = "大坝安全统计-大坝安全监测状况统计")
+//	@GetMapping(value = "/singleRegionCount")
+//	public R singleRegionCount(DamSecurityStatistics damSecurityStatistics) {
+//		DamSecurityStatistics data =  damSecurityService.getSingleRegionCount(damSecurityStatistics);
+//		return R.data(data);
+//	}
+
 	/**
-	 * 大坝安全监测状况统计
+	 * 大坝安全监测状况统计(逻辑已修改)
 	 * @param damSecurityStatistics
 	 * @return
 	 */
 	@ApiOperation(value = "大坝安全统计-大坝安全监测状况统计", notes = "大坝安全统计-大坝安全监测状况统计")
 	@GetMapping(value = "/singleRegionCount")
-	public R singleRegionCount(DamSecurityStatistics damSecurityStatistics) {
-		DamSecurityStatistics data =  damSecurityService.getSingleRegionCount(damSecurityStatistics);
+	public R singleRegionCountOptimize(DamSecurityStatistics damSecurityStatistics) {
+		DamSecurityStatistics data =  damSecurityService.getSingleRegionCountOptimize(damSecurityStatistics);
 		return R.data(data);
 	}
 
 	/**
-	 * 大坝安全监测区域统计
+	 * 大坝安全监测区域统计(逻辑已修改)
 	 * @param damSecurityStatistics
 	 * @return
 	 */
@@ -91,7 +103,7 @@
 	}
 
 	/**
-	 * 大坝安全监测表格
+	 * 大坝安全监测表格(逻辑已修改)
 	 * @param damStationStatistics
 	 * @return
 	 */
@@ -103,7 +115,7 @@
 	}
 
 	/**
-	 * 大坝安全监测表格导出
+	 * 大坝安全监测表格导出(逻辑已修改)
 	 * @param damStationStatistics
 	 * @return
 	 */
@@ -176,7 +188,7 @@
 	}
 
 	/**
-	 * 业务一张图 大坝安全监测(地图)
+	 * 业务一张图 大坝安全监测(地图)(逻辑已修改)
 	 * @param obj(adCode :行政区划;type:监测类型;status :状态 1全部;2正常;3异常)
 	 * @return
 	 */

--
Gitblit v1.9.3