lin
2024-05-06 9ba12dad011e2afa278833f37aba895a632ccb9c
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;
@@ -60,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;
@@ -179,7 +183,7 @@
            return townList;
         }
         // 如果是居民
         if (roleName.equals("inhabitant")) {
         if (roleName.equals("inhabitant") || roleName.equals("xyzt") || roleName.equals("xyty")) {
            return getInhabitantInfo(list);
         }
      }
@@ -1039,6 +1043,14 @@
               .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;
      }
@@ -1106,6 +1118,7 @@
   /**
    * 网格范围数据处理
    *
    * @return
    */
   @Override
@@ -1154,6 +1167,7 @@
   /**
    * 设置警格网格信息
    *
    * @param doorplateAddressEntity
    */
   public void setGridInfo(DoorplateAddressEntity doorplateAddressEntity,GridRangeEntity gridRangeEntity) {