代码优化

linwe

2024-07-15 8f5aeec641d916806553ef9772d55e17e93db150

 src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java

@@ -30,6 +30,7 @@
import org.springblade.common.utils.NodeTreeUtil;
import org.springblade.common.utils.SpringUtils;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.core.tool.utils.ObjectUtil;
import org.springblade.modules.category.dto.CategoryDTO;
import org.springblade.modules.category.service.ICategoryService;
@@ -38,6 +39,7 @@
import org.springblade.modules.district.entity.DistrictEntity;
import org.springblade.modules.district.service.IDistrictService;
import org.springblade.modules.doorplateAddress.entity.DoorplateAddressEntity;
import org.springblade.modules.doorplateAddress.excel.ImportDoorplateExcel;
import org.springblade.modules.doorplateAddress.mapper.DoorplateAddressMapper;
import org.springblade.modules.doorplateAddress.service.IDoorplateAddressService;
import org.springblade.modules.doorplateAddress.vo.DoorplateAddressVO;
@@ -276,22 +278,23 @@
         houseParam.setRoleName(roleName);
      }
      // 获取网格员对应的地址编号集合
      List<String> addressCodeList = getHouseCodeList(houseParam);
//      List<String> addressCodeList = getHouseCodeList(houseParam);
      List<String> gridCodeList = getGridCodeList(houseParam);
      List<String> communityCodeList = getCommunityCodeList(houseParam);
      // 获取网格员对应的网格信息
      getGridInfoByGridman(houseParam);
//      getGridInfoByGridman(houseParam);
      // 查小区，场所
      if (houseParam.getType() == 1) {
         // 根据社区名称查询小区集合
         list = baseMapper.getDistrictList(houseParam, addressCodeList, communityCodeList);
         list = baseMapper.getDistrictList(houseParam, gridCodeList, communityCodeList);
      }
      // 查楼栋，街路巷
      if (houseParam.getType() == 2) {
         return getBuildLevelData(houseParam, addressCodeList, map);
         return getBuildLevelData(houseParam, gridCodeList, map);
      }
      // 查户室
      if (houseParam.getType() == 3) {
         return getHouseLevelData(houseParam, addressCodeList, map);
         return getHouseLevelData(houseParam, gridCodeList, map);
      }
      return list;
   }
@@ -771,6 +774,28 @@
   }

   /**
    * 根据角色获取网格编号集合
    *
    * @param houseParam
    * @return
    */
   private List<String> getGridCodeList(HouseParam houseParam) {
      List<String> gridCodeList = new ArrayList<>();
      String userId = AuthUtil.getUserId().toString();
      houseParam.setUserId(userId);
      if (null != houseParam.getRoleName() && !houseParam.getRoleName().equals("")) {
         if ((houseParam.getRoleName().equals("wgy") || houseParam.getRoleName().equals("wzcj"))
            && !userId.equals("1726859808689696770")) {
            // 查询对应社区编号集合
            gridCodeList
               = SysCache.getGridRegionChildCodesByDeptId(AuthUtil.getDeptId(), null, houseParam.getRoleName());
         }
      }
      // 返回
      return gridCodeList;
   }

   /**
    * 房屋数据处理
    *
    * @return
@@ -1202,4 +1227,28 @@
//         backblastPubRecord.setJwGridCode(policeAffairsGridEntity.getJwGridCode());
//      }
   }

   @Override
   public String importDoorplate(List<ImportDoorplateExcel> read) {
      int i = 1;
      for (ImportDoorplateExcel importDoorplateExcel : read) {
         System.out.println("第-" + i + "-条记录");
         i++;
         DoorplateAddressEntity copyDoorplateAddress = Objects.requireNonNull(BeanUtil.copy(importDoorplateExcel, DoorplateAddressEntity.class));
         DoorplateAddressEntity doorplateAddressEntity = baseMapper.selectOne(Wrappers.<DoorplateAddressEntity>lambdaQuery()
            .eq(DoorplateAddressEntity::getAddressCode, importDoorplateExcel.getAddressCode()));
         if (null == doorplateAddressEntity) {
            baseMapper.insert(copyDoorplateAddress);
         } else {
            doorplateAddressEntity.setStreetRuCode(copyDoorplateAddress.getStreetRuCode());
            doorplateAddressEntity.setStreetRuName(copyDoorplateAddress.getStreetRuName());
            doorplateAddressEntity.setNeiName(copyDoorplateAddress.getNeiName());
            doorplateAddressEntity.setAoiCode(copyDoorplateAddress.getAoiCode());
            doorplateAddressEntity.setAoiName(copyDoorplateAddress.getAoiName());
            baseMapper.update(doorplateAddressEntity, Wrappers.<DoorplateAddressEntity>lambdaQuery()
               .eq(DoorplateAddressEntity::getAddressCode, importDoorplateExcel.getAddressCode()));
         }
      }
      return null;
   }
}