From 1b5800c788e8c9277a23f76666abc1b757d56b42 Mon Sep 17 00:00:00 2001
From: zrj <646384940@qq.com>
Date: Fri, 14 Jun 2024 15:53:25 +0800
Subject: [PATCH] 线上 es 全文检索升级到8.14.1 版本导致数据更新异常调整(不抛出异常),实际数据已经被操作

---
 src/main/java/org/springblade/modules/grid/controller/GridController.java |   16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/springblade/modules/grid/controller/GridController.java b/src/main/java/org/springblade/modules/grid/controller/GridController.java
index af398e7..b93abe5 100644
--- a/src/main/java/org/springblade/modules/grid/controller/GridController.java
+++ b/src/main/java/org/springblade/modules/grid/controller/GridController.java
@@ -28,6 +28,7 @@
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.modules.doorplateAddress.entity.DoorplateAddressEntity;
 import org.springblade.modules.grid.excel.GridExcel;
 import org.springblade.modules.grid.excel.GridImporter;
 import org.springblade.modules.system.excel.UserExcel;
@@ -156,8 +157,8 @@
 	 * 空间分析
 	 */
 	@GetMapping("/spatialAnalysis")
-	public R spatialAnalysis() {
-		return R.data(gridService.spatialAnalysis());
+	public R spatialAnalysis(DoorplateAddressEntity addressEntity) {
+		return R.data(gridService.spatialAnalysis(addressEntity));
 	}
 
 	/**
@@ -186,4 +187,15 @@
 	public R gridInfoByHouseCode( @RequestParam("houseCode") String houseCode) {
 		return R.data(gridService.gridInfoByHouseCode(houseCode));
 	}
+
+
+	/**
+	 * 网格集合查询
+	 * @param grid
+	 * @return
+	 */
+	@GetMapping("/getGridList")
+	public R getGridList(GridVO grid) {
+		return R.data(gridService.getGridList(grid));
+	}
 }

--
Gitblit v1.9.3