Merge remote-tracking branch 'origin/master'

lin

2024-03-20 70a29ae28b85643e00a4b7fbf111a95646a24dc2

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

@@ -21,11 +21,13 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.logging.log4j.util.Strings;
import org.springblade.common.cache.SysCache;
import org.springblade.common.constant.DictConstant;
import org.springblade.common.node.TreeStringNode;
import org.springblade.common.param.CommonParamSet;
import org.springblade.common.utils.ComplexNumberStringComparator;
import org.springblade.common.utils.NodeTreeUtil;
import org.springblade.common.utils.SpringUtils;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.modules.category.dto.CategoryDTO;
import org.springblade.modules.category.service.ICategoryService;
@@ -44,9 +46,11 @@
import org.springblade.modules.grid.service.IGridService;
import org.springblade.modules.grid.service.IGridmanService;
import org.springblade.modules.house.entity.HouseEntity;
import org.springblade.modules.house.entity.UserHouseLabelEntity;
import org.springblade.modules.house.service.IHouseRentalService;
import org.springblade.modules.house.service.IHouseService;
import org.springblade.modules.house.service.IHouseholdService;
import org.springblade.modules.house.service.IUserHouseLabelService;
import org.springblade.modules.house.vo.HouseParam;
import org.springblade.modules.house.vo.HouseRentalVO;
import org.springblade.modules.house.vo.HouseholdVO;
@@ -63,6 +67,8 @@
import org.springframework.transaction.annotation.Transactional;

import java.util.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;

/**
@@ -142,7 +148,7 @@
               }
               if (roleName.equals("民警")) {
                  // 查询对应的社区编号
                  communityList = policeAffairsGridService.getCommunityCodeListByUserId(AuthUtil.getUserId());
                  communityList = SysCache.getPoliceRegionChildCodesByDeptId(AuthUtil.getDeptId());
               }
            }
            // 查询街道
@@ -536,8 +542,7 @@
         });
         // 排序
         sortUnit(tempList, list);
//         List<FuncNode> sortList = tempList.stream().sorted(Comparator.comparing(X -> X.getUnitName())).collect(Collectors.toList());
//         list.addAll(sortList);

      }
   }

@@ -564,13 +569,45 @@
            } else if (funcNode.getUnitName().contains("六")) {
               funcNode.setSort(6);
            } else {
               funcNode.setSort(1);
               if (!containsNumber(funcNode.getUnitName())) {
                  funcNode.setSort(1);
               } else {
                  funcNode.setSort(getNumber(funcNode.getUnitName()));
               }
            }
         }
         // 排序
         List<FuncNode> sortList = tempList.stream().sorted(Comparator.comparing(X -> X.getSort())).collect(Collectors.toList());
         list.addAll(sortList);
      }
   }

   /**
    * 判断是否包含数字
    *
    * @param str
    * @return
    */
   public static boolean containsNumber(String str) {
      Pattern pattern = Pattern.compile(".*\\d+.*");
      Matcher matcher = pattern.matcher(str);
      return matcher.matches();
   }

   /**
    * 取出字符串中的数字
    *
    * @param str
    * @return
    */
   public static int getNumber(String str) {
      StringBuilder sb = new StringBuilder();
      for (char c : str.toCharArray()) {
         if (Character.isDigit(c)) {
            sb.append(c);
         }
      }
      return Integer.parseInt(sb.toString());
   }

   /**
@@ -725,9 +762,9 @@
   private void handleHouseData(String townName) {
      // 查询总数
      Integer count = baseMapper.getNotHouseListCount(townName);
      if (count>0) {
         int num = count/1000;
         for (int i = 0; i <= num+1; i++) {
      if (count > 0) {
         int num = count / 1000;
         for (int i = 0; i <= num + 1; i++) {
            // 查询所有户室数据（未入库的）
            List<DoorplateAddressEntity> list = baseMapper.getHouseList(townName);
            // 需要新增的房屋 list
@@ -801,7 +838,7 @@
            // 加入集合
            districtService.save(districtEntity);
//            aoiList.add(districtEntity);
         }else {
         } else {
            // 更新
            one.setCommunityCode(addressEntity.getNeiCode());
            one.setAoiCode(addressEntity.getAoiCode());
@@ -836,26 +873,26 @@
         for (DoorplateAddressEntity addressEntity : list) {
            // pio 名称不为空的进行插入操作
//            if (!Strings.isBlank(addressEntity.getPoi())) {
               PlaceEntity placeEntity = new PlaceEntity();
               placeEntity.setHouseCode(addressEntity.getAddressCode());
               placeEntity.setPlaceName(addressEntity.getPoi());
               placeEntity.setLng(addressEntity.getX());
               placeEntity.setLat(addressEntity.getY());
               placeEntity.setLocation(addressEntity.getAddressName());
               // 设置来源( 1：地址总表  2：国控采集 3:商超)
               placeEntity.setSource(1);
               // 待完善
               placeEntity.setStatus(1);
               // 默认为非九小场所
               placeEntity.setIsNine(2);
               // 默认为现场采集
               placeEntity.setIsScene(1);
               // 加入集合
            PlaceEntity placeEntity = new PlaceEntity();
            placeEntity.setHouseCode(addressEntity.getAddressCode());
            placeEntity.setPlaceName(addressEntity.getPoi());
            placeEntity.setLng(addressEntity.getX());
            placeEntity.setLat(addressEntity.getY());
            placeEntity.setLocation(addressEntity.getAddressName());
            // 设置来源( 1：地址总表  2：国控采集 3:商超)
            placeEntity.setSource(1);
            // 待完善
            placeEntity.setStatus(1);
            // 默认为非九小场所
            placeEntity.setIsNine(2);
            // 默认为现场采集
            placeEntity.setIsScene(1);
            // 加入集合
//               placeList.add(placeEntity);
               // 保存
               placeService.save(placeEntity);
               // 新增场所详情
               savePlaceExtAndTaskInfo(placeEntity);
            // 保存
            placeService.save(placeEntity);
            // 新增场所详情
            savePlaceExtAndTaskInfo(placeEntity);
//            }
         }
         // 批量插入
@@ -867,6 +904,7 @@

   /**
    * 新增场所详情
    *
    * @param placeEntity
    */
   public void savePlaceExtAndTaskInfo(PlaceEntity placeEntity) {
@@ -874,8 +912,8 @@
      placeExtEntity.setPlaceId(placeEntity.getId());
      // 判断是否已存在，已存在则不新增
      QueryWrapper<PlaceExtEntity> wrapper = new QueryWrapper<>();
      wrapper.eq("is_deleted",0)
         .eq("place_id",placeEntity.getId());
      wrapper.eq("is_deleted", 0)
         .eq("place_id", placeEntity.getId());
      PlaceExtEntity one = placeExtService.getOne(wrapper);
      if (null == one) {
         placeExtEntity.setPlaceId(placeEntity.getId());
@@ -897,10 +935,10 @@
   public Object getDetail(DoorplateAddressVO doorplateAddress) {
      List<String> list = new ArrayList<>();
      // 扫码时调用，需判断是否有权限查看
      DoorplateAddressVO one = baseMapper.getDoorplateAddressVODetail(doorplateAddress);
      if (null != one) {
      DoorplateAddressVO doorplateAddressVO = baseMapper.getDoorplateAddressVODetail(doorplateAddress);
      if (null != doorplateAddressVO) {
         // 不限制
         one.setIsJur(1);
         doorplateAddressVO.setIsJur(1);
         if (!Strings.isBlank(doorplateAddress.getRoleName())) {
            // 判断是否有权限
            if (doorplateAddress.getRoleName().equals("网格员")) {
@@ -908,27 +946,35 @@
               boolean contains = list.contains(doorplateAddress.getAddressCode());
               if (list.size() == 0 || !contains) {
                  // 无权限
                  one.setIsJur(2);
                  doorplateAddressVO.setIsJur(2);
               } else {
                  one.setIsJur(1);
                  doorplateAddressVO.setIsJur(1);
               }
            } else if (doorplateAddress.getRoleName().equals("民警")) {
               // 无权限
               one.setIsJur(2);
               doorplateAddressVO.setIsJur(2);
               // 查询对应的社区code
               list = policeAffairsGridService.getCommunityCodeListByUserId(AuthUtil.getUserId());
               if (null!=list && list.size()>0){
                  boolean contains = list.contains(one.getNeiCode());
               if (null != list && list.size() > 0) {
                  boolean contains = list.contains(doorplateAddressVO.getNeiCode());
                  if (contains) {
                     one.setIsJur(1);
                     doorplateAddressVO.setIsJur(1);
                  }
               }
            } else {
               // 不限制
               one.setIsJur(1);
               doorplateAddressVO.setIsJur(1);
            }
         }
         return one;
         if(doorplateAddressVO != null ){
            //  获取房屋标签
            IUserHouseLabelService userHouseLabelService = SpringUtils.getBean(IUserHouseLabelService.class);
            List<UserHouseLabelEntity> houseLabelEntityList = userHouseLabelService.list(Wrappers.<UserHouseLabelEntity>lambdaQuery()
               .eq(UserHouseLabelEntity::getHouseCode, doorplateAddressVO.getAddressCode())
               .eq(UserHouseLabelEntity::getLableType, 2));
            doorplateAddressVO.setUserHouseLabelVOList(houseLabelEntityList);
         }
         return doorplateAddressVO;
      }
      return null;
   }
@@ -964,6 +1010,7 @@

   /**
    * 查询场所标准地址数据
    *
    * @param doorplateAddress
    * @param size
    * @return
@@ -971,22 +1018,23 @@
   @Override
   public Object getPlaceList(DoorplateAddressVO doorplateAddress, Integer size) {
      // 公共参数设置
      CommonParamSet commonParamSet = new CommonParamSet().invoke(DoorplateAddressVO.class,doorplateAddress);
      CommonParamSet commonParamSet = new CommonParamSet().invoke(DoorplateAddressVO.class, doorplateAddress);
      return baseMapper.getPlaceList(doorplateAddress,
         null==size?10:size,
         null == size ? 10 : size,
         commonParamSet.getGridCodeList(),
         commonParamSet.getRegionChildCodesList(),
         commonParamSet.getIsAdministrator()
         );
      );
   }

   /**
    * 通过小区id 查询楼栋编码
    *
    * @param districtId
    * @return
    */
   @Override
   public    List<DoorplateAddressVO>  getHouseBuildingCode(String districtId) {
   public List<DoorplateAddressVO> getHouseBuildingCode(String districtId) {
      return baseMapper.getHouseBuildingCode(districtId);
   }
}