获取省、市、县接口迁移

wms-biz/src/main/java/com/yxt/wms/apiadmin/aggregation/RegionRest.java

@@ -0,0 +1,59 @@
+package com.yxt.wms.apiadmin.aggregation;
+
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.wms.biz.func.region.RegionChildTwoVo;
+import com.yxt.wms.biz.func.region.RegionService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.util.List;
+
+public class RegionRest {
+
+    @Autowired
+    private RegionService regionService;
+
+    /**
+     * 区域获取省
+     *
+     * @return 所有省的集合
+     */
+    @ApiOperation("获取省")
+    @ResponseBody
+    @GetMapping("/getProvince")
+    public ResultBean getProvince() {
+        List<RegionChildTwoVo> regionList = regionService.getProvince();
+        return ResultBean.fireSuccess().setData(regionList);
+    }
+
+    /**
+     * 根据省查询该省下所有的市
+     *
+     * @param sid 省sid
+     * @return 某省下所有的市
+     */
+    @ApiOperation("根据省sid获取该省的所有市")
+    @ResponseBody
+    @GetMapping("/getCity")
+    public ResultBean getCity(@RequestParam("sid") String sid){
+        List<RegionChildTwoVo> city = regionService.getCity(sid);
+        return ResultBean.fireSuccess().setData(city);
+    };
+
+    /**
+     * 根据市查询该市下的所有县区
+     *
+     * @param sid 市sid
+     * @return 某市下的所有县区
+     */
+    @ApiOperation("根据市sid获取该市的所有县区")
+    @ResponseBody
+    @GetMapping("/getCounty")
+    public ResultBean getCounty(@RequestParam("sid") String sid){
+        List<RegionChildTwoVo> county = regionService.getCounty(sid);
+        return ResultBean.fireSuccess().setData(county);
+    };
+}

wms-biz/src/main/java/com/yxt/wms/biz/func/region/Region.java

@@ -0,0 +1,29 @@
+package com.yxt.wms.biz.func.region;
+
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author dimengzhe
+ * @date 2021/7/2 14:21
+ * @description
+ */
+@Data
+public class Region extends BaseEntity {
+    private static final long serialVersionUID = -2834981997098086066L;
+    @ApiModelProperty(value = "上级sid")
+    private String pSid;
+    @ApiModelProperty(value = "级别")
+    private Integer level;
+    @ApiModelProperty(value = "名称，区域名称")
+    private String name;
+    @ApiModelProperty(value = "行政区划代码")
+    private String districtCode;
+    @ApiModelProperty(value = "sid全路径")
+    private String sidPath;
+    @ApiModelProperty(value = "排序号")
+    private Integer sortNo;
+
+
+}

wms-biz/src/main/java/com/yxt/wms/biz/func/region/RegionChildTwoVo.java

@@ -0,0 +1,30 @@
+package com.yxt.wms.biz.func.region;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author dimengzhe
+ * @date 2021/7/2 23:15
+ * @description
+ */
+@Data
+public class RegionChildTwoVo implements Vo {
+    private static final long serialVersionUID = 4618662603777612150L;
+
+    @ApiModelProperty(value = "sid")
+    private String sid;
+    @ApiModelProperty(value = "上级sid")
+    private String pSid;
+    @ApiModelProperty(value = "级别")
+    private Integer level;
+    @ApiModelProperty(value = "名称，区域名称")
+    private String name;
+    @ApiModelProperty(value = "行政区划代码")
+    private String districtCode;
+    @ApiModelProperty(value = "sid全路径")
+    private String sidPath;
+    @ApiModelProperty(value = "排序号")
+    private Integer sortNo;
+}

wms-biz/src/main/java/com/yxt/wms/biz/func/region/RegionChildVo.java

@@ -0,0 +1,34 @@
+package com.yxt.wms.biz.func.region;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author dimengzhe
+ * @date 2021/7/2 23:14
+ * @description
+ */
+@Data
+public class RegionChildVo implements Vo {
+    private static final long serialVersionUID = -4741874809037026585L;
+
+    @ApiModelProperty(value = "sid")
+    private String sid;
+    @ApiModelProperty(value = "上级sid")
+    private String pSid;
+    @ApiModelProperty(value = "级别")
+    private Integer level;
+    @ApiModelProperty(value = "名称，区域名称")
+    private String name;
+    @ApiModelProperty(value = "行政区划代码")
+    private String districtCode;
+    @ApiModelProperty(value = "sid全路径")
+    private String sidPath;
+    @ApiModelProperty(value = "排序号")
+    private Integer sortNo;
+
+    private List<RegionChildTwoVo> regionChildTwoVoList;
+}

wms-biz/src/main/java/com/yxt/wms/biz/func/region/RegionDto.java

@@ -0,0 +1,46 @@
+package com.yxt.wms.biz.func.region;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+
+/**
+ * @Author dimengzhe
+ * @Date 2021/11/11 15:18
+ * @Description
+ */
+@Data
+public class RegionDto implements Dto {
+    private static final long serialVersionUID = 1283045363206557586L;
+    /**
+     * 名称，区域名称
+     */
+    @ApiModelProperty(value = "区域名称", required = true)
+    @NotBlank(message = "区域名称不能为空")
+    @Size(max = 64, min = 1)
+    private String name;
+    /**
+     * 行政区划代码
+     */
+    @ApiModelProperty(value = "行政区划代码", required = true)
+    @NotBlank(message = "行政区划代码不能为空")
+    private String districtCode;
+    /**
+     * 上级sid
+     */
+    @ApiModelProperty(value = "上级sid", required = true, example = "0")
+    private String psid;
+
+    /**
+     * 排序号
+     */
+    @ApiModelProperty(value = "排序号", required = true)
+    private Integer sortNo;
+    @ApiModelProperty(value = "级别")
+    private int level;
+
+
+}

wms-biz/src/main/java/com/yxt/wms/biz/func/region/RegionListVo.java

@@ -0,0 +1,24 @@
+package com.yxt.wms.biz.func.region;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+/**
+ * @author dimengzhe
+ * @date 2021/7/13 21:41
+ * @description
+ */
+@Data
+public class RegionListVo implements Vo {
+    private static final long serialVersionUID = 8123582673134551495L;
+    @ApiModelProperty(value = "sid")
+    private String sid;
+    @ApiModelProperty(value = "名称")
+    private String name;
+    @ApiModelProperty(value = "区划代码")
+    private String districtCode;
+    @ApiModelProperty(value = "排序")
+    private Integer sortNo;
+}

wms-biz/src/main/java/com/yxt/wms/biz/func/region/RegionMapper.java

@@ -0,0 +1,25 @@
+package com.yxt.wms.biz.func.region;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @author dimengzhe
+ * @date 2021/7/2 15:10
+ * @description
+ */
+@Mapper
+public interface RegionMapper extends BaseMapper<Region> {
+
+    List<RegionChildTwoVo> getProvince();
+
+    List<RegionChildTwoVo> getCity(String sid);
+
+    List<RegionChildTwoVo> getCounty(String sid);
+}

wms-biz/src/main/java/com/yxt/wms/biz/func/region/RegionMapper.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.wms.biz.func.region.RegionMapper">
+    <resultMap id="regionMapNoChild" type="com.yxt.wms.biz.func.region.RegionChildTwoVo">
+        <result column="name" jdbcType="VARCHAR" property="name"/>
+        <result column="sid" jdbcType="VARCHAR" property="sid"/>
+        <result column="pSid" jdbcType="VARCHAR" property="pSid"/>
+        <result column="districtCode" jdbcType="INTEGER" property="districtCode"/>
+        <result column="sidPath" jdbcType="VARCHAR" property="sidPath"/>
+    </resultMap>
+
+    <select id="getProvince" parameterType="com.yxt.wms.biz.func.region.RegionVo" resultMap="regionMapNoChild">
+        SELECT name, sid, pSid, districtCode, sidPath
+        FROM region
+        WHERE level = 1
+          AND pSid = 0
+    </select>
+
+    <select id="getCity" parameterType="com.yxt.wms.biz.func.region.RegionVo" resultMap="regionMapNoChild">
+        SELECT name, sid, pSid, districtCode, sidPath
+        FROM region
+        WHERE level = 2
+          AND pSid = #{sid}
+        ORDER BY sortNo + 0
+    </select>
+
+    <select id="getCounty" parameterType="com.yxt.wms.biz.func.region.RegionVo" resultMap="regionMapNoChild">
+        SELECT name, sid, pSid, districtCode, sidPath
+        FROM region
+        WHERE level = 3
+          AND pSid = #{sid}
+    </select>
+</mapper>

wms-biz/src/main/java/com/yxt/wms/biz/func/region/RegionQuery.java

@@ -0,0 +1,23 @@
+package com.yxt.wms.biz.func.region;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+/**
+ * @author dimengzhe
+ * @date 2021/7/13 21:55
+ * @description
+ */
+@Data
+public class RegionQuery implements Query {
+    private static final long serialVersionUID = -3494331991678665867L;
+
+    @ApiModelProperty(value = "行政区划")
+    private String districtCode;
+    @ApiModelProperty(value = "名称")
+    private String name;
+    @ApiModelProperty(value = "pSid,市级列表此值需要传省级列表sid", example = "0")
+    private String psid;
+}

wms-biz/src/main/java/com/yxt/wms/biz/func/region/RegionService.java

@@ -0,0 +1,51 @@
+package com.yxt.wms.biz.func.region;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.base.utils.StringUtils;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.wms.feign.portal.region.RegionFeign;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @author dimengzhe
+ * @date 2021/7/2 15:06
+ * @description
+ */
+@Service
+public class RegionService extends MybatisBaseService<RegionMapper, Region> {
+
+    @Autowired
+    private RegionFeign regionFeign;
+
+    public List<RegionChildTwoVo> getProvince() {
+        return regionFeign.getProvince().getData();
+    }
+
+    /**
+     * 获取某省下的所有市
+     *
+     * @param sid 省sid
+     * @return 该省下的所有市的list
+     */
+    public List<RegionChildTwoVo> getCity(String sid) {
+        return regionFeign.getCity(sid).getData();
+
+    }
+
+    /**
+     * 获取某市下的所有区县
+     *
+     * @param sid 市sid
+     * @return 该市下的所有县区的list
+     */
+    public List<RegionChildTwoVo> getCounty(String sid) {
+        return regionFeign.getCounty(sid).getData();
+    }
+}

wms-biz/src/main/java/com/yxt/wms/biz/func/region/RegionThirdLevelNameVo.java

@@ -0,0 +1,24 @@
+package com.yxt.wms.biz.func.region;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description
+ * @Author liuguohui
+ * @Date 2021/10/4
+ */
+@Data
+public class RegionThirdLevelNameVo implements Vo {
+
+    @ApiModelProperty(value = "省")
+    private String province;
+
+    @ApiModelProperty(value = "市")
+    private String city;
+
+    @ApiModelProperty(value = "县")
+    private String county;
+
+}

wms-biz/src/main/java/com/yxt/wms/biz/func/region/RegionVo.java

@@ -0,0 +1,35 @@
+package com.yxt.wms.biz.func.region;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author dimengzhe
+ * @date 2021/7/2 14:22
+ * @description
+ */
+@Data
+public class RegionVo implements Vo {
+    private static final long serialVersionUID = 3351684167946104384L;
+
+    @ApiModelProperty(value = "sid")
+    private String sid;
+    @ApiModelProperty(value = "上级sid")
+    private String pSid;
+    @ApiModelProperty(value = "级别")
+    private Integer level;
+    @ApiModelProperty(value = "名称，区域名称")
+    private String name;
+    @ApiModelProperty(value = "行政区划代码")
+    private String districtCode;
+    @ApiModelProperty(value = "sid全路径")
+    private String sidPath;
+    @ApiModelProperty(value = "排序号")
+    private Integer sortNo;
+
+    private List<RegionVo> children;
+
+}

wms-biz/src/main/java/com/yxt/wms/feign/portal/region/RegionFeign.java

@@ -0,0 +1,57 @@
+package com.yxt.wms.feign.portal.region;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.wms.biz.func.region.RegionChildTwoVo;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * @author dimengzhe
+ * @date 2021/7/2 14:18
+ * @description
+ */
+@FeignClient(
+        contextId = "ss-common-portal-Region",
+        name = "ss-common-portal",
+        path = "/apiadmin/regions")
+public interface RegionFeign {
+
+    /**
+     * 区域获取省
+     *
+     * @return 所有省的集合
+     */
+    @ApiOperation("获取省")
+    @ResponseBody
+    @GetMapping("/getProvince")
+    public ResultBean<List<RegionChildTwoVo>> getProvince();
+
+    /**
+     * 根据省查询该省下所有的市
+     *
+     * @param sid 省sid
+     * @return 某省下所有的市
+     */
+    @ApiOperation("根据省sid获取该省的所有市")
+    @ResponseBody
+    @GetMapping("/getCity")
+    public ResultBean<List<RegionChildTwoVo>> getCity(@RequestParam("sid") String sid);
+
+    /**
+     * 根据市查询该市下的所有县区
+     *
+     * @param sid 市sid
+     * @return 某市下的所有县区
+     */
+    @ApiOperation("根据市sid获取该市的所有县区")
+    @ResponseBody
+    @GetMapping("/getCounty")
+    public ResultBean<List<RegionChildTwoVo>> getCounty(@RequestParam("sid") String sid);
+}