From 30f6564d4a3b74ee498ca9408fc1a80bd342ffe5 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Wed, 31 Jan 2024 21:32:23 +0800
Subject: [PATCH] 场所同步，详情查询修改
---
src/main/java/org/springblade/modules/grid/service/impl/GridServiceImpl.java | 71 +++++++++++++++++++++++++++--------
1 files changed, 54 insertions(+), 17 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 aa38cc3..ec91d5f 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
@@ -19,6 +19,7 @@
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.cache.SysCache;
import org.springblade.common.utils.NodeTreeUtil;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.modules.doorplateAddress.entity.DoorplateAddressEntity;
@@ -65,7 +66,9 @@
@Override
public IPage<GridVO> selectGridPage(IPage<GridVO> page, GridVO grid) {
- return page.setRecords(baseMapper.selectGridPage(page, grid));
+ List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
+ Integer isAdministrator = AuthUtil.isAdministrator()==true?1:2;
+ return page.setRecords(baseMapper.selectGridPage(page, grid,regionChildCodesList,isAdministrator));
}
/**
@@ -74,18 +77,18 @@
* @param isCovered
*/
@Override
+ @Transactional(rollbackFor = Exception.class)
public void importGrid(List<GridExcel> data, Boolean isCovered) {
List<GridEntity> list = new ArrayList<>();
// 遍历
for (GridExcel gridExcel : data) {
// 取出名称分隔
- String[] split = gridExcel.getGridName().split("居民委员会");
+ String[] split = gridExcel.getGridName().split("第");
GridEntity gridEntity = new GridEntity();
- String communityName = split[0] + "居民委员会";
- gridEntity.setCommunityName(communityName);
// 通过社区名称查询对应的社区编号
QueryWrapper<Region> wrapper = new QueryWrapper<>();
- wrapper.eq("name",split[0]);
+ wrapper.like("name",split[0]);
+ System.out.println("社区名称 = " + split[0]);
Region region = regionService.getOne(wrapper);
if (null!=region){
gridEntity.setCommunityCode(region.getCode());
@@ -93,12 +96,12 @@
// 比对网格是否存在，如果已存在则更新，否则则新增
QueryWrapper<GridEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("is_deleted",0)
- .eq("grid_name",split[1])
+ .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.setGridName("第" + split[1]);
one.setGeom(gridExcel.getGeom());
one.setUpdateUser(AuthUtil.getUserId());
one.setUpdateTime(new Date());
@@ -107,7 +110,7 @@
}else {
// 设置网格数据
gridEntity.setGridCode(gridExcel.getGridCode());
- gridEntity.setGridName(split[1]);
+ gridEntity.setGridName("第" + split[1]);
gridEntity.setGeom(gridExcel.getGeom());
gridEntity.setCreateUser(AuthUtil.getUserId());
gridEntity.setCreateTime(new Date());
@@ -126,8 +129,8 @@
* @return
*/
@Override
- public GridVO getGridDetailByHouseCode(String houseCode) {
- return baseMapper.getGridDetailByHouseCode(houseCode);
+ public GridVO getPlaceGridDetailByHouseCode(String houseCode) {
+ return baseMapper.getPlaceGridDetailByHouseCode(houseCode);
}
/**
@@ -206,7 +209,8 @@
QueryWrapper<Region> regionWrapper = new QueryWrapper<>();
regionWrapper.eq("code",grid.getCommunityCode());
Region region = regionService.getOne(regionWrapper);
- // 查询父机构
+ // 查询父机构（社区机构）
+ System.out.println("社区名称 = " + region.getName());
QueryWrapper<Dept> wrapper = new QueryWrapper<>();
wrapper.eq("dept_name",region.getName())
.eq("is_deleted",0);
@@ -215,22 +219,24 @@
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){
+ .eq("parent_id",dept.getId());
+ List<Dept> deptChild = deptService.list(wrapperChild);
+ if (deptChild.size()==0){
Dept deptInfo = new Dept();
deptInfo.setParentId(dept.getId());
deptInfo.setFullName(grid.getGridName());
deptInfo.setDeptName(grid.getGridName());
deptInfo.setDeptCategory(1);
deptInfo.setTenantId("000000");
+ deptInfo.setRegionCode(grid.getGridCode());
+ deptInfo.setAncestors(dept.getAncestors() + "," +dept.getId());
// 新增
deptService.save(deptInfo);
// 查询网格是否已存在（社区编号-网格名称），已存在更新，不存在插入新的
QueryWrapper<GridEntity> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("grid_name",grid.getGridName())
- .eq("is_deleted",0)
- .eq("community_code",grid.getCommunityCode());
+ queryWrapper.eq("grid_code",grid.getGridCode())
+ .eq("is_deleted",0);
+ System.out.println("网格编号 = " + grid.getGridCode());
GridEntity one = getOne(queryWrapper);
if (null!=one){
grid.setId(one.getId());
@@ -294,4 +300,35 @@
public Object getGridList(GridVO grid) {
return baseMapper.getGridList(grid);
}
+
+ /**
+ * 查询小区网格绑定
+ * @param aoiCode 小区aoiCode
+ * @return
+ */
+ @Override
+ public List<GridVO> getGridListByAoiCode(String aoiCode) {
+ return baseMapper.getGridListByAoiCode(aoiCode);
+ }
+
+ /**
+ * 查询对应网格人对应的网格
+ * @param userId
+ * @return
+ */
+ @Override
+ public GridEntity getGridByUserId(Long userId) {
+ return baseMapper.getGridByUserId(userId);
+ }
+
+ /**
+ * 根据网格名称，社区名称查询对应的网格
+ * @param gridName
+ * @param communityName
+ * @return
+ */
+ @Override
+ public GridEntity getGridByNames(String gridName, String communityName) {
+ return baseMapper.getGridByNames(gridName,communityName);
+ }
}
--
Gitblit v1.9.3