Merge remote-tracking branch 'origin/master'

zhongrj

2023-11-01 f49f89760fc68ab8cd0438955c412209e925e416

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

@@ -16,15 +16,18 @@
 */
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.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springblade.common.node.TreeNode;
import org.springblade.common.utils.NodeTreeUtil;
import org.springblade.core.mp.base.BaseServiceImpl;
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.FuncNode;
import org.springblade.modules.house.service.IHouseRentalService;
@@ -38,6 +41,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@@ -188,4 +192,27 @@
      // 返回
      return doorplateAddressDetailVO;
   }

   @Override
   public List<DoorplateAddressVOTree> getDoorplateAddressList(String code, String type) {

      //西市街道 万达社区 滨江西路66号 万达华府 26栋
      List<DoorplateAddressVOTree> list = new ArrayList<>();


      if (type.equals("townStreet")){
         //获取所有街道街道
         list = baseMapper.getTownStreetVOTreeList();
      }else if (type.equals("nei")){
         list= baseMapper.getNeiVOTreeList(code);
      }else if (type.equals("streetRu")){
         list = baseMapper.getStreetRuVOTreeList(code);
      }else if (type.equals("district")){
         list=baseMapper.getDistrictVOTreeList(code);
      }else if (type.equals("building")){
         list = baseMapper.getBuildingVOTreeList(code);
      }

      return list;
   }
}