From 80de84c1ba30d550d9b6b5834c833451dd58afe3 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Wed, 31 Jan 2024 23:28:14 +0800
Subject: [PATCH] 场所网格绑定修改
---
src/main/java/org/springblade/modules/grid/service/impl/GridServiceImpl.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/springblade/modules/grid/service/impl/GridServiceImpl.java b/src/main/java/org/springblade/modules/grid/service/impl/GridServiceImpl.java
index ec91d5f..b79702d 100644
--- a/src/main/java/org/springblade/modules/grid/service/impl/GridServiceImpl.java
+++ b/src/main/java/org/springblade/modules/grid/service/impl/GridServiceImpl.java
@@ -148,19 +148,20 @@
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public Object spatialAnalysis() {
+ public Object spatialAnalysis(DoorplateAddressEntity addressEntity) {
// 按社区
String name = null;
// String name = "茶山路社区居民委员会";
//查询社区信息
- List<DoorplateAddressEntity> doorplateAddressEntities = doorplateAddressService.getAllDoorplateAddress(name);
+ List<DoorplateAddressEntity> doorplateAddressEntities = doorplateAddressService.getAllDoorplateAddress(addressEntity);
//遍历
for (DoorplateAddressEntity doorplateAddressEntity : doorplateAddressEntities) {
//点坐标解析
- String point = "'POINT(" + doorplateAddressEntity.getX84() + " " + doorplateAddressEntity.getY84() +")'";
+ String point = "'POINT(" + doorplateAddressEntity.getX() + " " + doorplateAddressEntity.getY() +")'";
// String point = "'POINT(" + villageInfoExcel.getLatitude() + " " + villageInfoExcel.getLongitude() +")'";
- GridEntity gridEntity = baseMapper.spatialAnalysis(point);
- if (null!=gridEntity){
+ List<GridEntity> gridEntityList = baseMapper.spatialAnalysis(point);
+ if (gridEntityList.size()>0) {
+ GridEntity gridEntity = gridEntityList.get(0);
QueryWrapper<GridRangeEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("grid_id",gridEntity.getId()).eq("house_code",doorplateAddressEntity.getAddressCode());
GridRangeEntity one = gridRangeService.getOne(queryWrapper);
@@ -172,6 +173,10 @@
gridRangeEntity.setDistrictName(doorplateAddressEntity.getAoiName());
// 保存
gridRangeService.save(gridRangeEntity);
+ }else {
+ one.setGridId(gridEntity.getId());
+ // 更新
+ gridRangeService.updateById(one);
}
}
}
--
Gitblit v1.9.3