From d35386e9b1a5d87aa32b4367a745ba550b06ba12 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Sat, 02 Mar 2024 11:52:40 +0800
Subject: [PATCH] 房屋查询过滤

---
 src/test/java/org/springblade/test/BladeTest.java |   39 +++++++++++++++++++++------------------
 1 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/src/test/java/org/springblade/test/BladeTest.java b/src/test/java/org/springblade/test/BladeTest.java
index cb60248..0098ce5 100644
--- a/src/test/java/org/springblade/test/BladeTest.java
+++ b/src/test/java/org/springblade/test/BladeTest.java
@@ -1,11 +1,13 @@
 package org.springblade.test;
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import org.apache.logging.log4j.util.Strings;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.springblade.common.utils.SpringUtils;
 import org.springblade.core.test.BladeBootTest;
 import org.springblade.core.test.BladeSpringExtension;
+import org.springblade.core.tool.utils.SpringUtil;
 import org.springblade.core.tool.utils.StringUtil;
 import org.springblade.flow.engine.entity.FlowModel;
 import org.springblade.flow.engine.service.FlowEngineService;
@@ -15,6 +17,8 @@
 import org.springblade.modules.house.service.IHouseService;
 import org.springblade.modules.place.entity.PlaceEntity;
 import org.springblade.modules.place.service.IPlaceService;
+import org.springblade.modules.police.entity.PoliceAffairsGridEntity;
+import org.springblade.modules.police.service.IPoliceAffairsGridService;
 import org.springblade.modules.task.entity.TaskReportForRepairsEntity;
 import org.springblade.modules.task.service.ITaskReportForRepairsService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -40,7 +44,7 @@
 	private IDoorplateAddressService iDoorplateAddressService;
 
 	@Autowired
-	private ITaskReportForRepairsService iTaskReportForRepairsService;
+	private IHouseService iHouseService;
 
 //	@Test
 	public void test() {
@@ -59,25 +63,24 @@
 
 //	@Test
 	public void test2() {
-		List<TaskReportForRepairsEntity> list = iTaskReportForRepairsService.list();
-		IHouseService bean = SpringUtils.getBean(IHouseService.class);
-		IPlaceService bean2 = SpringUtils.getBean(IPlaceService.class);
-
-		for (TaskReportForRepairsEntity taskReportForRepairsEntity : list) {
-			HouseEntity houseEntity = bean.getOne(Wrappers.<HouseEntity>lambdaQuery()
-				.eq(HouseEntity::getHouseCode, taskReportForRepairsEntity.getAddressCode()));
-			if (houseEntity != null) {
-//				taskReportForRepairsEntity.setGridCode(houseEntity.getGridCode());
-				iTaskReportForRepairsService.updateById(taskReportForRepairsEntity);
-			}else {
-				PlaceEntity placeEntity = bean2.getOne(Wrappers.<PlaceEntity>lambdaQuery()
-					.eq(PlaceEntity::getHouseCode, taskReportForRepairsEntity.getAddressCode()).last("limit 1"));
-//				taskReportForRepairsEntity.setGridCode(placeEntity.getGridCode());
-				iTaskReportForRepairsService.updateById(taskReportForRepairsEntity);
+		// 查询 警务网格为空的数据
+		List<HouseEntity> list = iHouseService.list(Wrappers.<HouseEntity>lambdaQuery().eq(HouseEntity::getIsDeleted,0));
+		// 遍历
+		for (HouseEntity houseEntity : list) {
+			if (!Strings.isBlank(houseEntity.getLng())) {
+				// 空间分析
+				//点坐标解析
+				String point = "'POINT(" + houseEntity.getLng() + " " + houseEntity.getLat() + ")'";
+				List<PoliceAffairsGridEntity> policeAffairsGridEntities
+					= SpringUtil.getBean(IPoliceAffairsGridService.class).spatialAnalysis(point);
+				if (policeAffairsGridEntities.size() > 0) {
+					PoliceAffairsGridEntity policeAffairsGridEntity = policeAffairsGridEntities.get(0);
+					houseEntity.setJwGridCode(policeAffairsGridEntity.getJwGridCode());
+					// 更新
+					iHouseService.updateById(houseEntity);
+				}
 			}
 		}
-
-
 	}
 
 	@Test

--
Gitblit v1.9.3