From 7eee9e04b31e1d8fdcbce8bc48bc839aa975441f Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Mon, 13 Nov 2023 13:53:24 +0800
Subject: [PATCH] 水库信息同步视频站修改

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/AttResBaseController.java |   17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/AttResBaseController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/AttResBaseController.java
index 0e14391..2a18171 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/AttResBaseController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/AttResBaseController.java
@@ -53,13 +53,6 @@
 	@ApiOperation(value = "中台水库-查询该行政区下的水库", notes = "中台水库-查询该行政区下的水库")
 	@GetMapping(value = "/getListByRegion")
 	public R getListByRegion(@ApiIgnore @RequestParam Map<String, Object> obj,Query query) {
-		String code = obj.get("code").toString();
-		if (code.substring(0,4).indexOf("00") > -1) {
-			obj.put("code",code.substring(0,2));
-		} else if (code.substring(0,6).indexOf("00") > -1) {
-			obj.put("code",code.substring(0,4));
-		}
-//		List<AttResBase> list = attResBaseService.getListByRegion(obj);
 		IPage<AttResBase> pageList = attResBaseService.getListByRegion(Condition.getPage(query),obj);
 		return R.data(pageList);
 	}
@@ -98,4 +91,14 @@
 		return R.data(attResBaseService.updateResBaseByGuid(attResBase));
 	}
 
+	/**
+	 * 根据水库编码获取行政区数据
+	 * @param guid
+	 * @return
+	 */
+	@GetMapping(value = "/getWaterRegionInfoByResGuid")
+	public R getWaterRegionInfoByResGuid(String guid) {
+		return R.data(attResBaseService.getWaterRegionInfoByResGuid(guid));
+	}
+
 }

--
Gitblit v1.9.3