无诈代码优化

linwe

2024-07-05 fee8fbb72f73cc11075b07bf457ce2dd2a9ce19e

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

@@ -31,7 +31,6 @@
import org.springblade.common.utils.SpringUtils;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.utils.ObjectUtil;
import org.springblade.modules.backblast.entity.BackblastPubRecordEntity;
import org.springblade.modules.category.dto.CategoryDTO;
import org.springblade.modules.category.service.ICategoryService;
import org.springblade.modules.community.entity.CommunityEntity;
@@ -46,7 +45,6 @@
import org.springblade.modules.doorplateAddress.vo.FuncNode;
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.service.IGridRangeService;
import org.springblade.modules.grid.service.IGridService;
import org.springblade.modules.grid.service.IGridmanService;
@@ -66,10 +64,8 @@
import org.springblade.modules.place.service.IPlaceExtService;
import org.springblade.modules.place.service.IPlacePoiLabelService;
import org.springblade.modules.place.service.IPlaceService;
import org.springblade.modules.place.vo.PlaceVO;
import org.springblade.modules.police.entity.PoliceAffairsGridEntity;
import org.springblade.modules.police.service.IPoliceAffairsGridService;
import org.springblade.modules.system.entity.Region;
import org.springblade.modules.system.service.IRegionService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -150,10 +146,8 @@
      String roleName = SpringUtils.getRequestParam("roleName");
      if (!Strings.isBlank(roleName)) {
         // 如果是网格管理员，系统管理员,民警,无诈场所采集
         if (roleName.equals("admin") ||
            roleName.equals("wzcj") ||
            roleName.equals("wgy") ||
            roleName.equals("mj")) {
         if (roleName.equals("admin") || roleName.equals("wzcj") ||
            roleName.equals("wgy") || roleName.equals("mj")) {
            houseParam.setRoleName(roleName);
            if ((roleName.equals("wgy") || roleName.equals("wzcj"))
               && !userId.equals("1726859808689696770")) {
@@ -169,6 +163,10 @@
            List<TreeStringNode> townList = baseMapper.getRegionListByGroupTwon(houseParam, stringList, communityList);
            // 查询社区
            List<TreeStringNode> neiList = baseMapper.getRegionListByGroupNei(houseParam, stringList, communityList);
            // 查询网格
            if (stringList.size() > 0) {
               List<GridEntity> list1 = gridService.list(Wrappers.<GridEntity>lambdaQuery().in(GridEntity::getGridCode, stringList));
            }
            // 遍历
            for (TreeStringNode treeNode : townList) {
               // 遍历
@@ -278,22 +276,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;
   }
@@ -773,6 +772,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
@@ -1040,7 +1061,9 @@
               // 查询对应的社区code
               list = SysCache.getGridRegionChildCodesByDeptId(AuthUtil.getDeptId(), null, roleName);
               if (null != list && list.size() > 0) {
                  boolean contains = list.contains(doorplateAddressVO.getNeiCode());
                  // 存在一个社区有多个派出所，所以社区有36110200201702 存后面添加两位，对比的时候要删除后面两位
                  List<String> collect = list.stream().map(s -> s.length() > 12 ? s.substring(0, s.length() - 2) : s).collect(Collectors.toList());
                  boolean contains = collect.contains(doorplateAddressVO.getNeiCode());
                  if (contains) {
                     doorplateAddressVO.setIsJur(1);
                  }