Merge remote-tracking branch 'origin/master'

linwe

2023-11-11 a1d8ea1a72cddf7651742b87f042602ab006c879

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

@@ -16,25 +16,20 @@
 */
package org.springblade.modules.doorplateAddress.service.impl;

import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import liquibase.repackaged.org.apache.commons.lang3.StringUtils;
import org.apache.poi.hssf.record.DVALRecord;
import org.jetbrains.annotations.NotNull;
import org.springblade.common.constant.DictConstant;
import org.springblade.common.node.TreeNode;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.utils.StringUtil;
import org.springblade.modules.doorplateAddress.entity.DoorplateAddressEntity;
import org.springblade.modules.doorplateAddress.mapper.DoorplateAddressMapper;
import org.springblade.modules.doorplateAddress.service.IDoorplateAddressService;
import org.springblade.modules.doorplateAddress.vo.DoorplateAddressVOTree;
import org.springblade.modules.doorplateAddress.vo.DoorplateAddressVO;
import org.springblade.modules.doorplateAddress.vo.DoorplateAddressVOTree;
import org.springblade.modules.doorplateAddress.vo.FuncNode;
import org.springblade.modules.house.service.IHouseRentalService;
import org.springblade.modules.house.service.IHouseholdLabelService;
import org.springblade.modules.house.service.IHouseholdService;
import org.springblade.modules.house.vo.HouseParam;
import org.springblade.modules.house.vo.HouseRentalVO;
@@ -42,7 +37,6 @@
import org.springblade.modules.place.service.IPlaceService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;

import java.util.*;
import java.util.stream.Collectors;
@@ -87,12 +81,15 @@
            List<TreeNode> townList = baseMapper.getRegionListByGroupTwon();
            // 查询社区
            List<TreeNode> neiList = baseMapper.getRegionListByGroupNei();
            TreeNode node = townList.get(0);
            node.setHasChildren(true);
            // 遍历
            for (TreeNode treeNode : neiList) {
               treeNode.setHasChildren(false);
               node.getChildren().add(treeNode);
            for (TreeNode treeNode : townList) {
               // 遍历
               for (TreeNode node : neiList) {
                  if (treeNode.getId().equals(node.getParentId())){
                     node.setHasChildren(false);
                     treeNode.getChildren().add(node);
                  }
               }
            }
            // 查询区域数据，当前只有西市街道数据
            return townList;
@@ -113,9 +110,29 @@
   private Object getInhabitantInfo(List<TreeNode> list) {
      // 查询房屋集合信息
      List<TreeNode> houseNodeList = householdService.selectHouseNodeList(AuthUtil.getUserId());
      for (TreeNode treeNode : houseNodeList) {
         // 判断房屋类型类型
         if (DictConstant.SMALL_DOORPLATE.equals(treeNode.getDoorplateType())  ||
            (DictConstant.centre_DOORPLATE.equals(treeNode.getDoorplateType()) &&
               treeNode.getAddressLevel().equals(1))) {
            treeNode.setAddressType(2);
         } else {
            treeNode.setAddressType(1);
         }
      }
      // 查询场所集合信息
      List<TreeNode> placeNodeList = placeService.selectPlaceNodeList(AuthUtil.getUserId());
      if (houseNodeList.size()>0 && placeNodeList.size()>0){
      for (TreeNode treeNode : placeNodeList) {
         treeNode.setAddressType(2);
//         if (DictConstant.SMALL_DOORPLATE.equals(treeNode.getDoorplateType()) ||
//            (DictConstant.centre_DOORPLATE.equals(treeNode.getDoorplateType()) &&
//               treeNode.getAddressLevel().equals(1))) {
//            treeNode.setAddressType(2);
//         } else {
//            treeNode.setAddressType(3);
//         }
      }
      if (houseNodeList.size() > 0 && placeNodeList.size() > 0) {
         // 合并
         TreeNode houseNode = new TreeNode();
         houseNode.setName("房屋");
@@ -405,4 +422,16 @@
      // 返回
      return doorplateAddress;
   }

   @Override
   public Object getHouseType(String code) {
      DoorplateAddressEntity doorplateAddressEntity = baseMapper.selectOne(Wrappers.<DoorplateAddressEntity>lambdaQuery().eq(DoorplateAddressEntity::getAddressCode, code));
      // 判断房屋信息是否住宅
      if (doorplateAddressEntity.getDoorplateType().equals(DictConstant.SMALL_DOORPLATE) ||
         (doorplateAddressEntity.getDoorplateType().equals(DictConstant.centre_DOORPLATE) &&
            doorplateAddressEntity.getAddressLevel().equals(1))) {
         return 1;
      }
      return 0;
   }
}