场所同步，详情查询修改

zhongrj

2024-01-31 30f6564d4a3b74ee498ca9408fc1a80bd342ffe5

 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,11 +66,9 @@

   @Override
   public IPage<GridVO> selectGridPage(IPage<GridVO> page, GridVO grid) {
      Dept dept = deptService.getById(AuthUtil.getDeptId());
      if (null!=dept){
         grid.setRegionCode(dept.getRegionCode());
      }
      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));
   }

   /**
@@ -130,8 +129,8 @@
    * @return
    */
   @Override
   public GridVO getGridDetailByHouseCode(String houseCode) {
      return baseMapper.getGridDetailByHouseCode(houseCode);
   public GridVO getPlaceGridDetailByHouseCode(String houseCode) {
      return baseMapper.getPlaceGridDetailByHouseCode(houseCode);
   }

   /**
@@ -210,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);
@@ -219,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());
@@ -308,4 +310,25 @@
   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);
   }
}