From 2f5f60384a5f469787edbe333aaa265fae58bf2d Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Tue, 28 Nov 2023 17:21:27 +0800
Subject: [PATCH] 网格，网格员相关修改
---
src/main/java/org/springblade/modules/grid/service/impl/GridServiceImpl.java | 112 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 109 insertions(+), 3 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..a8b38e9 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
@@ -18,6 +18,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
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;
@@ -31,7 +32,11 @@
import org.springblade.modules.grid.service.IGridService;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.modules.place.vo.PlaceVO;
+import org.springblade.modules.system.entity.Dept;
+import org.springblade.modules.system.entity.Region;
import org.springblade.modules.system.entity.User;
+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;
@@ -52,10 +57,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,7 +86,15 @@
// 取出名称分隔
String[] split = gridExcel.getGridName().split("居民委员会");
GridEntity gridEntity = new GridEntity();
- gridEntity.setCommunityName(split[0] + "居民委员会");
+ 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());
+ }
gridEntity.setGridName(split[1]);
gridEntity.setGeom(gridExcel.getGeom());
gridEntity.setCreateUser(AuthUtil.getUserId());
@@ -115,8 +134,8 @@
@Transactional(rollbackFor = Exception.class)
public Object spatialAnalysis() {
// 按社区
-// String name = "万达社区居民委员会";
- String name = "茶山路社区居民委员会";
+ String name = "万达社区居民委员会";
+// String name = "茶山路社区居民委员会";
//查询社区信息
List<DoorplateAddressEntity> doorplateAddressEntities = doorplateAddressService.getAllDoorplateAddress(name);
//遍历
@@ -152,4 +171,91 @@
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());
+ }
}
--
Gitblit v1.9.3