From 55d677758efadb6d42e6d4e595cecc2c50c20d5a Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Sat, 23 Dec 2023 17:19:12 +0800
Subject: [PATCH] bug修复
---
src/main/java/org/springblade/modules/grid/service/impl/GridServiceImpl.java | 192 +++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 172 insertions(+), 20 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 acbe123..ee4c709 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
@@ -17,30 +17,30 @@
package org.springblade.modules.grid.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springblade.common.utils.NodeTreeUtil;
import org.springblade.core.secure.utils.AuthUtil;
-import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.modules.doorplateAddress.entity.DoorplateAddressEntity;
import org.springblade.modules.doorplateAddress.service.IDoorplateAddressService;
import org.springblade.modules.grid.entity.GridEntity;
import org.springblade.modules.grid.entity.GridRangeEntity;
+import org.springblade.modules.grid.entity.GridmanEntity;
import org.springblade.modules.grid.excel.GridExcel;
-import org.springblade.modules.grid.service.IGridRangeService;
-import org.springblade.modules.grid.vo.GridVO;
import org.springblade.modules.grid.mapper.GridMapper;
+import org.springblade.modules.grid.service.IGridRangeService;
import org.springblade.modules.grid.service.IGridService;
-import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.modules.grid.vo.GridVO;
import org.springblade.modules.place.vo.PlaceVO;
-import org.springblade.modules.system.entity.User;
+import org.springblade.modules.system.entity.Dept;
+import org.springblade.modules.system.entity.Region;
+import org.springblade.modules.system.service.IDeptService;
+import org.springblade.modules.system.service.IRegionService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springframework.transaction.annotation.Transactional;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
/**
* 网格表 服务实现类
@@ -52,10 +52,16 @@
public class GridServiceImpl extends ServiceImpl<GridMapper, GridEntity> implements IGridService {
@Autowired
+ private IRegionService regionService;
+
+ @Autowired
private IDoorplateAddressService doorplateAddressService;
@Autowired
private IGridRangeService gridRangeService;
+
+ @Autowired
+ private IDeptService deptService;
@Override
public IPage<GridVO> selectGridPage(IPage<GridVO> page, GridVO grid) {
@@ -75,14 +81,40 @@
// 取出名称分隔
String[] split = gridExcel.getGridName().split("居民委员会");
GridEntity gridEntity = new GridEntity();
- gridEntity.setCommunityName(split[0] + "居民委员会");
- gridEntity.setGridName(split[1]);
- gridEntity.setGeom(gridExcel.getGeom());
- gridEntity.setCreateUser(AuthUtil.getUserId());
- gridEntity.setCreateTime(new Date());
- gridEntity.setUpdateUser(AuthUtil.getUserId());
- gridEntity.setUpdateTime(new Date());
- list.add(gridEntity);
+ String communityName = split[0] + "居民委员会";
+ gridEntity.setCommunityName(communityName);
+ // 通过社区名称查询对应的社区编号
+ QueryWrapper<Region> wrapper = new QueryWrapper<>();
+ wrapper.eq("name",split[0]);
+ Region region = regionService.getOne(wrapper);
+ if (null!=region){
+ gridEntity.setCommunityCode(region.getCode());
+ }
+ // 比对网格是否存在，如果已存在则更新，否则则新增
+ QueryWrapper<GridEntity> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("is_deleted",0)
+ .eq("grid_name",split[1])
+ .eq("community_code",region.getCode());
+ GridEntity one = getOne(queryWrapper);
+ if (null!=one){
+ one.setGridCode(gridExcel.getGridCode());
+ one.setGridName(split[1]);
+ one.setGeom(gridExcel.getGeom());
+ one.setUpdateUser(AuthUtil.getUserId());
+ one.setUpdateTime(new Date());
+ // 更新
+ updateById(one);
+ }else {
+ // 设置网格数据
+ gridEntity.setGridCode(gridExcel.getGridCode());
+ gridEntity.setGridName(split[1]);
+ gridEntity.setGeom(gridExcel.getGeom());
+ gridEntity.setCreateUser(AuthUtil.getUserId());
+ gridEntity.setCreateTime(new Date());
+ gridEntity.setUpdateUser(AuthUtil.getUserId());
+ gridEntity.setUpdateTime(new Date());
+ list.add(gridEntity);
+ }
}
// 批量导入
saveBatch(list);
@@ -115,8 +147,8 @@
@Transactional(rollbackFor = Exception.class)
public Object spatialAnalysis() {
// 按社区
-// String name = "万达社区居民委员会";
- String name = "茶山路社区居民委员会";
+ String name = null;
+// String name = "茶山路社区居民委员会";
//查询社区信息
List<DoorplateAddressEntity> doorplateAddressEntities = doorplateAddressService.getAllDoorplateAddress(name);
//遍历
@@ -152,4 +184,124 @@
public GridVO getGridDetailByParam(PlaceVO place) {
return baseMapper.getGridDetailByParam(place);
}
+
+ /**
+ * 网格表 自定义详情
+ * @param grid
+ * @return
+ */
+ @Override
+ public GridVO getGridDetail(GridVO grid) {
+ return baseMapper.getGridDetail(grid);
+ }
+
+ /**
+ * 网格表 自定义新增或修改
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public boolean saveOrUpdateGrid(GridEntity grid) {
+ boolean flag = false;
+ // 先查询当前网格社区对应的机构id
+ QueryWrapper<Region> regionWrapper = new QueryWrapper<>();
+ regionWrapper.eq("code",grid.getCommunityCode());
+ Region region = regionService.getOne(regionWrapper);
+ // 查询父机构
+ QueryWrapper<Dept> wrapper = new QueryWrapper<>();
+ wrapper.eq("dept_name",region.getName())
+ .eq("is_deleted",0);
+ Dept dept = deptService.getOne(wrapper);
+ // 查询当前网格在机构中是否存在，存在不做操作，否则则新增
+ QueryWrapper<Dept> wrapperChild = new QueryWrapper<>();
+ wrapperChild.eq("dept_name",grid.getGridName())
+ .eq("is_deleted",0)
+ .eq("id",dept.getId());
+ Dept deptChild = deptService.getOne(wrapperChild);
+ if (null==deptChild){
+ Dept deptInfo = new Dept();
+ deptInfo.setParentId(dept.getId());
+ deptInfo.setFullName(grid.getGridName());
+ deptInfo.setDeptName(grid.getGridName());
+ deptInfo.setDeptCategory(1);
+ deptInfo.setTenantId("000000");
+ // 新增
+ deptService.save(deptInfo);
+ // 查询网格是否已存在（社区编号-网格名称），已存在更新，不存在插入新的
+ QueryWrapper<GridEntity> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("grid_name",grid.getGridName())
+ .eq("is_deleted",0)
+ .eq("community_code",grid.getCommunityCode());
+ GridEntity one = getOne(queryWrapper);
+ if (null!=one){
+ grid.setId(one.getId());
+ grid.setDeptId(deptInfo.getId());
+ if (null!= grid.getGeom() && grid.getGeom().equals("")){
+ grid.setGeom(null);
+ }
+ // 更新
+ flag = updateById(grid);
+ }else {
+ grid.setDeptId(deptInfo.getId());
+ grid.setGeom(null);
+ // 插入
+ flag = save(grid);
+ }
+ }
+ return flag;
+ }
+
+ /**
+ * 网格数据同步处理
+ */
+ @Override
+ public Object asyncGridDept() {
+ List<GridEntity> list = baseMapper.selectGridAll();
+ for (GridEntity gridEntity : list) {
+ saveOrUpdateGrid(gridEntity);
+ }
+ return null;
+ }
+
+ /**
+ * 网格树
+ *
+ * @param grid
+ * @return
+ */
+ @Override
+ public Object getGridTree(GridVO grid) {
+ return NodeTreeUtil.getStringNodeTree(baseMapper.getGridTree());
+ }
+
+
+ @Override
+ public Object gridInfoByHouseCode(String houseCode) {
+ Map<String, Object> objectObjectHashMap = new HashMap<>();
+ List<GridmanEntity> gridmanEntities = baseMapper.gridInfo(houseCode);
+ Integer id = gridmanEntities.get(0).getId();
+ objectObjectHashMap.put("grid", gridmanEntities);
+ List<DoorplateAddressEntity> result = baseMapper.gridAoiName(id);
+ objectObjectHashMap.put("doorplateAddress", result);
+ return objectObjectHashMap;
+ }
+
+ /**
+ * 网格集合查询
+ * @param grid
+ * @return
+ */
+ @Override
+ public Object getGridList(GridVO grid) {
+ return baseMapper.getGridList(grid);
+ }
+
+ /**
+ * 查询小区网格绑定
+ * @param aoiCode 小区aoiCode
+ * @return
+ */
+ @Override
+ public List<GridVO> getGridListByAoiCode(String aoiCode) {
+ return baseMapper.getGridListByAoiCode(aoiCode);
+ }
}
--
Gitblit v1.9.3