Merge remote-tracking branch 'origin/master'

zhongrj

2023-11-01 f49f89760fc68ab8cd0438955c412209e925e416

Merge remote-tracking branch 'origin/master'

 src/main/java/org/springblade/modules/doorplateAddress/controller/DoorplateAddressController.java

@@ -25,13 +25,18 @@
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.node.ForestNodeMerger;
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.doorplateAddress.entity.DoorplateAddressEntity;
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.wrapper.DoorplateAddressWrapper;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.metadata.IPage;

import java.util.List;

/*
 * 门牌地址表（总台账数据） 控制器
 *
@@ -152,5 +157,12 @@
        return R.data(doorplateAddressService.getHouseRentInfo(code));
    }

    @GetMapping("/getDoorplateAddressList")
    public R<List<DoorplateAddressVOTree>> getDoorplateAddressList(String code, String type){
        List<DoorplateAddressVOTree> list = doorplateAddressService.getDoorplateAddressList(code,type);
        return R.data(list);
    }



}

 src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.java

@@ -18,15 +18,14 @@

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.MapKey;
import org.apache.ibatis.annotations.Param;
import org.springblade.common.node.TreeNode;
import org.springblade.modules.doorplateAddress.entity.DoorplateAddressEntity;
import org.springblade.modules.doorplateAddress.vo.DoorplateAddressVOTree;
import org.springblade.modules.doorplateAddress.vo.DoorplateAddressVO;
import org.springblade.modules.doorplateAddress.vo.FuncNode;

import java.util.List;
import java.util.Map;

/**
 * 门牌地址表（总台账数据） Mapper 接口
@@ -89,4 +88,15 @@
     * @return
     */
    DoorplateAddressVO getDoorplateAddressDetailByCode(@Param("code") String code);

    List<DoorplateAddressVOTree> getTownStreetVOTreeList();

    List<DoorplateAddressVOTree> getNeiVOTreeList(@Param("code") String code);

    List<DoorplateAddressVOTree> getStreetRuVOTreeList(@Param("code") String code);


    List<DoorplateAddressVOTree> getDistrictVOTreeList(@Param("code") String code);

    List<DoorplateAddressVOTree> getBuildingVOTreeList(@Param("code") String code);
}

 src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml

@@ -57,4 +57,43 @@
        select * from jczz_doorplate_address where address_code = #{code}
    </select>



    <select id="getTownStreetVOTreeList"
            resultType="org.springblade.modules.doorplateAddress.vo.DoorplateAddressVOTree">
        SELECT town_street_code as code,town_street_name as name FROM jczz_doorplate_address group by town_street_code , town_street_name
    </select>

    <select id="getNeiVOTreeList" resultType="org.springblade.modules.doorplateAddress.vo.DoorplateAddressVOTree">
        SELECT nei_code as code,nei_name as name FROM jczz_doorplate_address WHERE town_street_code =#{code} GROUP BY nei_code,nei_name
    </select>
    <select id="getStreetRuVOTreeList"
            resultType="org.springblade.modules.doorplateAddress.vo.DoorplateAddressVOTree">
        SELECT street_ru_code as code,street_ru_name as name
        FROM jczz_doorplate_address
        WHERE nei_code =#{code}
        and street_ru_code is not null and street_ru_code !=''
        and street_ru_name is not null and street_ru_name !=''
        GROUP BY street_ru_code,street_ru_name

    </select>
    <select id="getDistrictVOTreeList"
            resultType="org.springblade.modules.doorplateAddress.vo.DoorplateAddressVOTree">
        SELECT district_code as code,district_name as name
        FROM jczz_doorplate_address
        WHERE street_ru_code =#{code}
        and district_code is not null and district_code !=''
        and district_name is not null and district_name !=''
       GROUP BY district_code,district_name
    </select>
    <select id="getBuildingVOTreeList"
            resultType="org.springblade.modules.doorplateAddress.vo.DoorplateAddressVOTree">
        SELECT building_code as code,building_name as name
        FROM jczz_doorplate_address
        WHERE district_code =#{code}
          and building_code is not null and building_code !=''
        and building_name is not null and building_name !=''
        GROUP BY building_code,building_name
    </select>

</mapper>

 src/main/java/org/springblade/modules/doorplateAddress/service/IDoorplateAddressService.java

@@ -19,7 +19,10 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.modules.doorplateAddress.entity.DoorplateAddressEntity;
import org.springblade.modules.doorplateAddress.vo.DoorplateAddressVOTree;
import org.springblade.modules.doorplateAddress.vo.DoorplateAddressVO;

import java.util.List;

/**
 * 门牌地址表（总台账数据） 服务类
@@ -61,4 +64,6 @@
     * @return
     */
    Object getHouseRentInfo(String code);

    List<DoorplateAddressVOTree> getDoorplateAddressList(String code, String type);
}

 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;
    }
}

 src/main/java/org/springblade/modules/doorplateAddress/vo/DoorplateAddressVOTree.java

New file
@@ -0,0 +1,25 @@
package org.springblade.modules.doorplateAddress.vo;

import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springblade.core.tool.node.INode;
import org.springblade.modules.doorplateAddress.entity.DoorplateAddressEntity;

import java.util.ArrayList;
import java.util.List;

@Data
public class DoorplateAddressVOTree  {

    private static final long serialVersionUID = 1L;

    private String name;

    private String code;

    private List<DoorplateAddressVOTree> children;

}