Merge remote-tracking branch 'origin/master'

lin

2024-05-13 b15f61abc950c4ee94b5ade5f43af97da8465196

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

@@ -22,6 +22,7 @@
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.CommonConstant;
import org.springblade.common.constant.DictConstant;
import org.springblade.common.node.TreeStringNode;
import org.springblade.common.param.CommonParamSet;
@@ -29,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.ObjectUtil;
import org.springblade.modules.backblast.entity.BackblastPubRecordEntity;
import org.springblade.modules.category.dto.CategoryDTO;
import org.springblade.modules.category.service.ICategoryService;
@@ -48,6 +50,7 @@
import org.springblade.modules.grid.service.IGridRangeService;
import org.springblade.modules.grid.service.IGridService;
import org.springblade.modules.grid.service.IGridmanService;
import org.springblade.modules.grid.vo.GridVO;
import org.springblade.modules.house.entity.HouseEntity;
import org.springblade.modules.house.entity.UserHouseLabelEntity;
import org.springblade.modules.house.service.IHouseRentalService;
@@ -59,7 +62,9 @@
import org.springblade.modules.house.vo.HouseholdVO;
import org.springblade.modules.place.entity.PlaceEntity;
import org.springblade.modules.place.entity.PlaceExtEntity;
import org.springblade.modules.place.entity.PlacePoiLabel;
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;
@@ -129,31 +134,36 @@
   /**
    * 根据角色获取功能集合数据
    *
    * @param type     1：查社区  2:查房屋和场所（居民角色）
    * @param roleName
    * @param type      1：查社区  2:查房屋和场所（居民角色）--2024/04/10  弃用
    * @param roleNames --2024/04/10  弃用
    * @return
    */
   @Override
   public Object getFuncList(Integer type, String roleName) {
   public Object getFuncList(Integer type, String roleNames) {
      HouseParam houseParam = new HouseParam();
      String userId = AuthUtil.getUserId().toString();
      houseParam.setUserId(userId);
      List<String> stringList = new ArrayList<>();
      List<String> communityList = new ArrayList<>();
      List<TreeStringNode> list = new ArrayList<>();
      if (null != type) {
         // 如果是网格管理员，系统管理员,民警
         if (type == 1) {
            if (null != roleName && !roleName.equals("")) {
               houseParam.setRoleName(roleName);
               if (roleName.equals("网格员") && !userId.equals("1726859808689696770")) {
                  // 查询对应的网格code
                  stringList = gridService.getGridListByUserId(AuthUtil.getUserId());
               }
               if (roleName.equals("民警")) {
                  // 查询对应的社区编号
                  communityList = SysCache.getPoliceRegionChildCodesByDeptId(AuthUtil.getDeptId(),null);
               }
      // 获取请求头中的角色别名
      String roleName = SpringUtils.getRequestParam("roleName");
      if (!Strings.isBlank(roleName)) {
         // 如果是网格管理员，系统管理员,民警,无诈场所采集
         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")) {
               // 查询对应的网格code
//            stringList = gridService.getGridListByUserId(AuthUtil.getUserId());
               stringList = SysCache.getGridRegionChildCodesByDeptId(AuthUtil.getDeptId(), null, roleName);
            }
            if (roleName.equals("mj")) {
               // 查询对应的社区编号
               communityList = SysCache.getGridRegionChildCodesByDeptId(AuthUtil.getDeptId(), null, roleName);
            }
            // 查询街道
            List<TreeStringNode> townList = baseMapper.getRegionListByGroupTwon(houseParam, stringList, communityList);
@@ -173,7 +183,7 @@
            return townList;
         }
         // 如果是居民
         if (type == 2 || type == 3) {
         if (roleName.equals("inhabitant") || roleName.equals("xyzt") || roleName.equals("xyty")) {
            return getInhabitantInfo(list);
         }
      }
@@ -225,7 +235,7 @@
         list.add(houseNode);

         TreeStringNode placeNode = new TreeStringNode();
         placeNode.setName("场所");
         placeNode.setName("经营场所");
         placeNode.setId("2");
         placeNode.setHasChildren(true);
         placeNode.setChildren(placeNodeList);
@@ -243,7 +253,7 @@
      }
      if (placeNodeList.size() > 0) {
         TreeStringNode placeNode = new TreeStringNode();
         placeNode.setName("场所");
         placeNode.setName("经营场所");
         placeNode.setId("2");
         placeNode.setHasChildren(true);
         placeNode.setChildren(placeNodeList);
@@ -263,23 +273,27 @@
   public Object getHousesList(HouseParam houseParam) {
      List<TreeStringNode> list = new ArrayList<>();
      Map<String, Object> map = new HashMap<>(2);
      String roleName = SpringUtils.getRequestParam("roleName");
      if (!Strings.isBlank(roleName)) {
         houseParam.setRoleName(roleName);
      }
      // 获取网格员对应的地址编号集合
      List<String> stringList = getHouseCodeList(houseParam);
      List<String> addressCodeList = getHouseCodeList(houseParam);
      List<String> communityCodeList = getCommunityCodeList(houseParam);
      // 获取网格员对应的网格信息
      getGridInfoByGridman(houseParam);
      // 查小区，场所
      if (houseParam.getType() == 1) {
         // 根据社区名称查询小区集合
         list = baseMapper.getDistrictList(houseParam, stringList, communityCodeList);
         list = baseMapper.getDistrictList(houseParam, addressCodeList, communityCodeList);
      }
      // 查楼栋，街路巷
      if (houseParam.getType() == 2) {
         return getBuildLevelData(houseParam, map);
         return getBuildLevelData(houseParam, addressCodeList, map);
      }
      // 查户室
      if (houseParam.getType() == 3) {
         return getHouseLevelData(houseParam, map);
         return getHouseLevelData(houseParam, addressCodeList, map);
      }
      return list;
   }
@@ -290,22 +304,19 @@
    * @param houseParam
    */
   private void getGridInfoByGridman(HouseParam houseParam) {
      if (houseParam.getRoleName().equals("网格员")) {
         QueryWrapper<GridmanEntity> wrapper = new QueryWrapper<>();
         wrapper.eq("is_deleted", 0)
            .eq("user_id", AuthUtil.getUserId());
         List<GridmanEntity> list = gridmanService.list(wrapper);
      if (houseParam.getRoleName().equals("wgy")) {
         if (Strings.isBlank(houseParam.getRoleName())) {
            houseParam.setRoleName(SpringUtils.getRequestParam("roleName"));
         }
         // 查询网格员的网格编号集合
         List<String> gridCodeList
            = SysCache.getGridRegionChildCodesByDeptId(AuthUtil.getDeptId(), null, houseParam.getRoleName());
         String communityCode = SpringUtils.getRequestParam("communityCode");
         List<GridVO> list = gridService.getGridListByComAndList(communityCode, gridCodeList);
         if (list.size() > 0) {
            GridmanEntity gridmanEntity = list.get(0);
            GridEntity gridEntity = gridService.getById(gridmanEntity.getGridId());
            // 查询居委会
            Region region = regionService.getById(gridEntity.getCommunityCode());
            if (null != region) {
               houseParam.setCommunityName(region.getName());
            }
            if (!Strings.isBlank(gridEntity.getGridName())) {
               houseParam.setGridName(gridEntity.getGridName());
            }
            GridVO grid = list.get(0);
            houseParam.setCommunityName(grid.getCommunityName());
            houseParam.setGridName(grid.getGridName());
         }
      }
   }
@@ -317,8 +328,7 @@
    * @param map
    * @return
    */
   private Map<String, Object> getHouseLevelData(HouseParam houseParam, Map<String, Object> map) {
      List<String> stringList = getHouseCodeList(houseParam);
   private Map<String, Object> getHouseLevelData(HouseParam houseParam, List<String> stringList, Map<String, Object> map) {
      // 判断地址类型
      if (houseParam.getAddressType() == 1) {
         List<FuncNode> aoiList = new ArrayList<>();
@@ -391,7 +401,7 @@
    * @param map
    * @return
    */
   private Object getBuildLevelData(HouseParam houseParam, Map<String, Object> map) {
   private Object getBuildLevelData(HouseParam houseParam, List<String> stringList, Map<String, Object> map) {
      if (houseParam.getAddressType() == 4) {
         // 获取网格员对应的网格信息
         getGridInfoByGridman(houseParam);
@@ -402,7 +412,6 @@
         // 返回
         return map;
      } else {
         List<String> stringList = getHouseCodeList(houseParam);
         // 判断 code 长度，如果 code 长度大于 12 则为小区查楼栋/商铺，否则则按社区查街路巷
         if (houseParam.getCode().length() > 12) {
            List<TreeStringNode> aoiList = new ArrayList<>();
@@ -621,14 +630,20 @@
    * @return
    */
   @Override
   public Object getHouseRentInfo(String code) {
      // 先查询门牌信息
      DoorplateAddressVO doorplateAddressDetailVO = baseMapper.getDoorplateAddressDetailByCode(code);
   public Object getHouseRentInfo(String code, Long houseId) {
      DoorplateAddressVO doorplateAddressDetailVO = new DoorplateAddressVO();
      if (Strings.isBlank(code) && null != houseId) {
         // 先查询门牌信息
         doorplateAddressDetailVO = baseMapper.getDoorplateAddressDetailByHouseId(houseId);
      } else {
         // 先查询门牌信息
         doorplateAddressDetailVO = baseMapper.getDoorplateAddressDetailByCode(code);
      }
      if (null != doorplateAddressDetailVO) {
         // 查询房屋出租情况
         List<HouseRentalVO> houseRentalVOS = houseRentalService.getHouseRentalListByCode(code);
         List<HouseRentalVO> houseRentalVOS = houseRentalService.getHouseRentalListByCode(doorplateAddressDetailVO.getAddressCode());
         // 查询房屋人员情况
         List<HouseholdVO> householdVOS = householdService.getHouseholdListByCode(code);
         List<HouseholdVO> householdVOS = householdService.getHouseholdListByCode(doorplateAddressDetailVO.getAddressCode());
         // 设置数据
         doorplateAddressDetailVO.setHouseRentalList(houseRentalVOS);
         doorplateAddressDetailVO.setHouseholdList(householdVOS);
@@ -704,6 +719,10 @@
    */
   @Override
   public List<DoorplateAddressVOTree> getHouseTree(HouseParam houseParam) {
      String roleName = SpringUtils.getRequestParam("roleName");
      if (!Strings.isBlank(roleName)) {
         houseParam.setRoleName(roleName);
      }
      List<String> stringList = getHouseCodeList(houseParam);
      // 根据社区居委会编号获取对应的小区/楼栋/单元/户室
      return NodeTreeUtil.getAddressNodeTree(baseMapper.getHouseTree(houseParam, stringList));
@@ -716,16 +735,22 @@
    * @return
    */
   private List<String> getHouseCodeList(HouseParam houseParam) {
      List<String> stringList = new ArrayList<>();
      List<String> addressCodeList = new ArrayList<>();
      String userId = AuthUtil.getUserId().toString();
      houseParam.setUserId(userId);
      if (null != houseParam.getRoleName() && !houseParam.getRoleName().equals("")) {
         if (houseParam.getRoleName().equals("网格员") && !userId.equals("1726859808689696770")) {
         if ((houseParam.getRoleName().equals("wgy") || houseParam.getRoleName().equals("wzcj"))
            && !userId.equals("1726859808689696770")) {
            // 先取对应网格员对应的网格编号集合
            List<String> gridCodeList
               = SysCache.getGridRegionChildCodesByDeptId(AuthUtil.getDeptId(), null, houseParam.getRoleName());
            // 查询对应的房屋地址code
            stringList = gridService.getAddressCodeListByUserId(AuthUtil.getUserId(),null);
//            addressCodeList = gridService.getAddressCodeListByUserId(AuthUtil.getUserId(),null);
            addressCodeList =
               gridService.getAddressCodeListByGridCodeList(SpringUtils.getRequestParam("communityCode"), gridCodeList);
         }
      }
      return stringList;
      return addressCodeList;
   }

   /**
@@ -739,9 +764,9 @@
      String userId = AuthUtil.getUserId().toString();
      houseParam.setUserId(userId);
      if (null != houseParam.getRoleName() && !houseParam.getRoleName().equals("")) {
         if (houseParam.getRoleName().equals("民警") && !userId.equals("1726859808689696770")) {
         if (houseParam.getRoleName().equals("mj") && !userId.equals("1726859808689696770")) {
            // 查询对应社区编号集合
            stringList = SysCache.getPoliceRegionChildCodesByDeptId(AuthUtil.getDeptId(),null);
            stringList = SysCache.getGridRegionChildCodesByDeptId(AuthUtil.getDeptId(), null, houseParam.getRoleName());
         }
      }
      return stringList;
@@ -804,14 +829,14 @@
                  String point = "'POINT(" + doorplateAddressEntity.getX() + " " + doorplateAddressEntity.getY() + ")'";
                  //点坐标解析网格
                  List<GridEntity> gridEntityList = gridService.spatialAnalysis(point);
                  if (gridEntityList.size()>0){
                  if (gridEntityList.size() > 0) {
                     GridEntity gridEntity = gridEntityList.get(0);
                     houseEntity.setGridId(gridEntity.getId());
                     houseEntity.setGridCode(gridEntity.getGridCode());
                  }
                  //点坐标解析警格
                  List<PoliceAffairsGridEntity> policeAffairsGridEntityList = policeAffairsGridService.spatialAnalysis(point);
                  if (policeAffairsGridEntityList.size()>0){
                  if (policeAffairsGridEntityList.size() > 0) {
                     PoliceAffairsGridEntity policeAffairsGridEntity = policeAffairsGridEntityList.get(0);
                     houseEntity.setJwGridCode(policeAffairsGridEntity.getJwGridCode());
                  }
@@ -857,17 +882,18 @@
            // 加入集合
            districtService.save(districtEntity);
//            aoiList.add(districtEntity);
         } else {
            // 更新
            one.setCommunityCode(addressEntity.getNeiCode());
            one.setAoiCode(addressEntity.getAoiCode());
            one.setName(addressEntity.getAoiName());
            one.setAddress(addressEntity.getAddressName());
            one.setLng(addressEntity.getX());
            one.setLat(addressEntity.getY());
            // 加入集合
            districtService.updateById(one);
         }
//         else {
//            // 更新
//            one.setCommunityCode(addressEntity.getNeiCode());
//            one.setAoiCode(addressEntity.getAoiCode());
//            one.setName(addressEntity.getAoiName());
//            one.setAddress(addressEntity.getAddressName());
//            one.setLng(addressEntity.getX());
//            one.setLat(addressEntity.getY());
//            // 加入集合
//            districtService.updateById(one);
//         }
      }
      // 批量插入
//      districtService.saveBatch(aoiList);
@@ -910,14 +936,14 @@
            String point = "'POINT(" + addressEntity.getX() + " " + addressEntity.getY() + ")'";
            //点坐标解析网格
            List<GridEntity> gridEntityList = gridService.spatialAnalysis(point);
            if (gridEntityList.size()>0){
            if (gridEntityList.size() > 0) {
               GridEntity gridEntity = gridEntityList.get(0);
               placeEntity.setGridId(gridEntity.getId());
               placeEntity.setGridCode(gridEntity.getGridCode());
            }
            //点坐标解析警格
            List<PoliceAffairsGridEntity> policeAffairsGridEntityList = policeAffairsGridService.spatialAnalysis(point);
            if (policeAffairsGridEntityList.size()>0){
            if (policeAffairsGridEntityList.size() > 0) {
               PoliceAffairsGridEntity policeAffairsGridEntity = policeAffairsGridEntityList.get(0);
               placeEntity.setJwGridCode(policeAffairsGridEntity.getJwGridCode());
            }
@@ -970,24 +996,50 @@
      List<String> list = new ArrayList<>();
      // 扫码时调用，需判断是否有权限查看
      DoorplateAddressVO doorplateAddressVO = baseMapper.getDoorplateAddressVODetail(doorplateAddress);
      // 创建数组
      String[] schoolName = {"幼儿园", "小学", "中学", "高中", "大专", "学校"};
      List<String> stringList = new ArrayList<>(Arrays.asList(schoolName));
      if (null != doorplateAddressVO) {
         if (Strings.isNotBlank(doorplateAddressVO.getAoiName()) && stringList.stream()
            .anyMatch(doorplateAddressVO.getAoiName()::contains)) {
            doorplateAddressVO.setAddressLevel(1);
            doorplateAddressVO.setDoorplateType(DictConstant.centre_DOORPLATE);
         }
         if (Strings.isNotBlank(doorplateAddressVO.getPoi()) && stringList.stream()
            .anyMatch(doorplateAddressVO.getPoi()::contains)) {
            doorplateAddressVO.setAddressLevel(1);
            doorplateAddressVO.setDoorplateType(DictConstant.centre_DOORPLATE);
         }

         // 不限制
         doorplateAddressVO.setIsJur(1);
         if (!Strings.isBlank(doorplateAddress.getRoleName())) {
         String roleName = SpringUtils.getRequestParam("roleName");
         if (!Strings.isBlank(roleName)) {
            // 判断是否有权限
            if (doorplateAddress.getRoleName().equals("网格员")) {
               list = gridService.getAddressCodeListByUserId(AuthUtil.getUserId(),doorplateAddress.getAddressCode());
               if (list.size() == 0) {
                  // 无权限
                  doorplateAddressVO.setIsJur(2);
               } else {
                  doorplateAddressVO.setIsJur(1);
            if (roleName.equals("wgy") || roleName.equals("wzcj")) {
               // 无权限
               doorplateAddressVO.setIsJur(2);
//               list = gridService.getAddressCodeListByUserId(AuthUtil.getUserId(),doorplateAddress.getAddressCode());
               list = SysCache.getGridRegionChildCodesByDeptId(AuthUtil.getDeptId(), null, roleName);
               if (null != list && list.size() > 0) {
                  List<String> arrayList = new ArrayList<>();
                  for (String gridCode : list) {
                     if (gridCode.length() > 12) {
                        arrayList.add(gridCode.substring(0, gridCode.length() - 2));
                     } else {
                        arrayList.add(gridCode);
                     }
                  }
                  boolean contains = arrayList.contains(doorplateAddressVO.getNeiCode());
                  if (contains) {
                     doorplateAddressVO.setIsJur(1);
                  }
               }
            } else if (doorplateAddress.getRoleName().equals("民警")) {
            } else if (roleName.equals("mj")) {
               // 无权限
               doorplateAddressVO.setIsJur(2);
               // 查询对应的社区code
               list = policeAffairsGridService.getCommunityCodeListByUserId(AuthUtil.getUserId());
               list = SysCache.getGridRegionChildCodesByDeptId(AuthUtil.getDeptId(), null, roleName);
               if (null != list && list.size() > 0) {
                  boolean contains = list.contains(doorplateAddressVO.getNeiCode());
                  if (contains) {
@@ -999,13 +1051,21 @@
               doorplateAddressVO.setIsJur(1);
            }
         }
         if(doorplateAddressVO != null ){
         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);
            // 查询房屋类别
            IPlacePoiLabelService poiLabelService = SpringUtils.getBean(IPlacePoiLabelService.class);
            PlacePoiLabel placePoiLabel = poiLabelService.getOne(Wrappers.<PlacePoiLabel>lambdaQuery()
               .eq(PlacePoiLabel::getPlaceId, doorplateAddressVO.getPid())
               .eq(PlacePoiLabel::getType, CommonConstant.NUMBER_THREE));
            if (ObjectUtil.isNotEmpty(placePoiLabel)) {
               doorplateAddressVO.setLableCode(placePoiLabel.getPoiCode());
            }
         }
         return doorplateAddressVO;
      }
@@ -1073,19 +1133,20 @@

   /**
    * 网格范围数据处理
    *
    * @return
    */
   @Override
   public boolean gridRangeDataHandle(String townName,String communityName) {
   public boolean gridRangeDataHandle(String townName, String communityName) {
      // 查询未匹配的网格范围地址信息
      // 查询总数
      Integer count = baseMapper.getNotBindGridRangeDoorListCount(townName,communityName);
      Integer count = baseMapper.getNotBindGridRangeDoorListCount(townName, communityName);
      if (count > 0) {
         IGridRangeService gridRangeService = SpringUtils.getBean(IGridRangeService.class);
         int num = count / 1000;
         for (int i = 0; i <= num + 1; i++) {
            // 查询所有未匹配的网格范围地址数据
            List<DoorplateAddressEntity> list = baseMapper.getNotBindGridRangeDoorList(townName,communityName);
            List<DoorplateAddressEntity> list = baseMapper.getNotBindGridRangeDoorList(townName, communityName);
            // 需要新增的网格范围 list
            List<GridRangeEntity> gridRangeEntityList = new ArrayList<>();
            // 处理户室数据
@@ -1099,7 +1160,7 @@
                  String point = "'POINT(" + doorplateAddressEntity.getX() + " " + doorplateAddressEntity.getY() + ")'";
                  //点坐标解析网格
                  List<GridEntity> gridEntityList = gridService.spatialAnalysis(point);
                  if (gridEntityList.size()>0){
                  if (gridEntityList.size() > 0) {
                     GridRangeEntity gridRangeEntity = new GridRangeEntity();
                     gridRangeEntity.setHouseCode(doorplateAddressEntity.getAddressCode());
                     gridRangeEntity.setDistrictCode(doorplateAddressEntity.getAoiCode());
@@ -1121,15 +1182,16 @@

   /**
    * 设置警格网格信息
    *
    * @param doorplateAddressEntity
    */
   public void setGridInfo(DoorplateAddressEntity doorplateAddressEntity,GridRangeEntity gridRangeEntity) {
   public void setGridInfo(DoorplateAddressEntity doorplateAddressEntity, GridRangeEntity gridRangeEntity) {
      // 根据位置设置网格，警格编号
//      IPoliceAffairsGridService policeAffairsGridService = SpringUtils.getBean(IPoliceAffairsGridService.class);
      String point = "'POINT(" + doorplateAddressEntity.getX() + " " + doorplateAddressEntity.getY() + ")'";
      //点坐标解析网格
      List<GridEntity> gridEntityList = gridService.spatialAnalysis(point);
      if (gridEntityList.size()>0){
      if (gridEntityList.size() > 0) {
         GridEntity gridEntity = gridEntityList.get(0);
         gridRangeEntity.setGridId(gridEntity.getId());
         gridRangeEntity.setGridCode(gridEntity.getGridCode());