zhongrj
2024-02-28 bb23575b30f92471f5e92fc65cf1250fdb9d2560
src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java
@@ -23,6 +23,7 @@
import org.apache.logging.log4j.util.Strings;
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.core.secure.utils.AuthUtil;
@@ -54,6 +55,7 @@
import org.springblade.modules.place.service.IPlaceExtService;
import org.springblade.modules.place.service.IPlaceService;
import org.springblade.modules.place.vo.PlaceVO;
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;
@@ -105,6 +107,9 @@
   @Autowired
   private ICommunityService communityService;
   @Autowired
   private IPoliceAffairsGridService policeAffairsGridService;
   @Override
   public IPage<DoorplateAddressVO> selectDoorplateAddressPage(IPage<DoorplateAddressVO> page, DoorplateAddressVO doorplateAddress) {
@@ -125,21 +130,21 @@
      houseParam.setUserId(userId);
      List<String> stringList = new ArrayList<>();
      List<String> communityList = new ArrayList<>();
      if (null != roleName && !roleName.equals("")) {
         houseParam.setRoleName(roleName);
         if (roleName.equals("网格员") && !userId.equals("1726859808689696770")) {
            // 查询对应的房屋地址code
            stringList = gridService.getAddressCodeListByUserId(AuthUtil.getUserId());
         }
         if (roleName.equals("民警")) {
            // 查询对应的社区编号
            communityList = communityService.getCommunityCodeListByUserId(AuthUtil.getUserId());
         }
      }
      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 = policeAffairsGridService.getCommunityCodeListByUserId(AuthUtil.getUserId());
               }
            }
            // 查询街道
            List<TreeStringNode> townList = baseMapper.getRegionListByGroupTwon(houseParam, stringList, communityList);
            // 查询社区
@@ -642,12 +647,12 @@
   /**
    * 查询社区信息
    *
    * @param name
    * @param doorplateAddressEntity
    * @return
    */
   @Override
   public List<DoorplateAddressEntity> getAllDoorplateAddress(String name) {
      return baseMapper.getAllDoorplateAddress(name);
   public List<DoorplateAddressEntity> getAllDoorplateAddress(DoorplateAddressEntity doorplateAddressEntity) {
      return baseMapper.getAllDoorplateAddress(doorplateAddressEntity);
   }
   /**
@@ -695,7 +700,7 @@
      if (null != houseParam.getRoleName() && !houseParam.getRoleName().equals("")) {
         if (houseParam.getRoleName().equals("民警") && !userId.equals("1726859808689696770")) {
            // 查询对应的房屋地址code
            stringList = communityService.getCommunityCodeListByUserId(AuthUtil.getUserId());
            stringList = policeAffairsGridService.getCommunityCodeListByUserId(AuthUtil.getUserId());
         }
      }
      return stringList;
@@ -888,7 +893,7 @@
               // 无权限
               one.setIsJur(2);
               // 查询对应的社区code
               list = communityService.getCommunityCodeListByUserId(AuthUtil.getUserId());
               list = policeAffairsGridService.getCommunityCodeListByUserId(AuthUtil.getUserId());
               if (null!=list && list.size()>0){
                  boolean contains = list.contains(one.getNeiCode());
                  if (contains) {
@@ -936,12 +941,19 @@
   /**
    * 查询场所标准地址数据
    * @param doorplateAddressVO
    * @param doorplateAddress
    * @param size
    * @return
    */
   @Override
   public Object getPlaceList(DoorplateAddressVO doorplateAddressVO, Integer size) {
      return baseMapper.getPlaceList(doorplateAddressVO,size);
   public Object getPlaceList(DoorplateAddressVO doorplateAddress, Integer size) {
      // 公共参数设置
      CommonParamSet commonParamSet = new CommonParamSet().invoke(DoorplateAddressVO.class,doorplateAddress);
      return baseMapper.getPlaceList(doorplateAddress,
         null==size?10:size,
         commonParamSet.getGridCodeList(),
         commonParamSet.getRegionChildCodesList(),
         commonParamSet.getIsAdministrator()
         );
   }
}