From c4e2c196aad8af656d94bc47e9f1a80bc504b5d7 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Thu, 14 Mar 2024 18:15:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/house/service/impl/HouseServiceImpl.java | 48 +++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 47 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/house/service/impl/HouseServiceImpl.java b/src/main/java/org/springblade/modules/house/service/impl/HouseServiceImpl.java
index 08c67f9..9a11b3e 100644
--- a/src/main/java/org/springblade/modules/house/service/impl/HouseServiceImpl.java
+++ b/src/main/java/org/springblade/modules/house/service/impl/HouseServiceImpl.java
@@ -30,6 +30,7 @@
import org.springblade.core.mp.support.Condition;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.modules.grid.entity.GridEntity;
import org.springblade.modules.grid.entity.GridRangeEntity;
import org.springblade.modules.grid.service.IGridRangeService;
import org.springblade.modules.grid.service.IGridService;
@@ -48,11 +49,12 @@
import org.springblade.modules.label.entity.LabelEntity;
import org.springblade.modules.label.service.ILabelService;
import org.springblade.modules.label.vo.LabelVO;
+import org.springblade.modules.police.entity.PoliceAffairsGridEntity;
+import org.springblade.modules.police.service.IPoliceAffairsGridService;
import org.springblade.modules.system.entity.Region;
import org.springblade.modules.system.entity.User;
import org.springblade.modules.system.service.IRegionService;
import org.springblade.modules.system.service.IUserService;
-import org.springblade.modules.taskPlaceSelfCheck.vo.TaskPlaceSelfCheckVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -712,4 +714,48 @@
}
return list;
}
+
+ /**
+ * 房屋网格处理
+ * @return
+ */
+ @Override
+ public Object houseGridHandle() {
+ // 查询未处理的数据
+ List<HouseEntity> houseEntityList = baseMapper.getNotBindGridOrJwGridList(1);
+ // 遍历
+ for (HouseEntity houseEntity : houseEntityList) {
+ String point = "'POINT(" + houseEntity.getLng() + " " + houseEntity.getLat() + ")'";
+ List<GridEntity> gridEntityList = SpringUtils.getBean(IGridService.class).spatialAnalysis(point);
+ if (gridEntityList.size()>0){
+ houseEntity.setGridCode(gridEntityList.get(0).getGridCode());
+ houseEntity.setGridId(gridEntityList.get(0).getId());
+ // 更新
+ updateById(houseEntity);
+ }
+ }
+
+ return null;
+ }
+
+ /**
+ * 房屋警格处理
+ * @return
+ */
+ @Override
+ public Object houseJwGridHandle() {
+ // 查询未处理的数据
+ List<HouseEntity> houseEntityList = baseMapper.getNotBindGridOrJwGridList(2);
+ // 遍历
+ for (HouseEntity houseEntity : houseEntityList) {
+ String point = "'POINT(" + houseEntity.getLng() + " " + houseEntity.getLat() + ")'";
+ List<PoliceAffairsGridEntity> policeAffairsGridEntityList = SpringUtils.getBean(IPoliceAffairsGridService.class).spatialAnalysis(point);
+ if (policeAffairsGridEntityList.size()>0){
+ houseEntity.setJwGridCode(policeAffairsGridEntityList.get(0).getJwGridCode());
+ // 更新
+ updateById(houseEntity);
+ }
+ }
+ return null;
+ }
}
--
Gitblit v1.9.3