From 00d4725a6b768c30ba32139618aa69d77ef9d36e Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Fri, 28 Jun 2024 14:37:47 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=9C=81=E3=80=81=E5=B8=82?= =?UTF-8?q?=E3=80=81=E5=8E=BF=E6=8E=A5=E5=8F=A3=E8=BF=81=E7=A7=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/apiadmin/aggregation/RegionRest.java | 59 +++++++++++++++++++ .../com/yxt/wms/biz/func/region/Region.java | 29 +++++++++ .../wms/biz/func/region/RegionChildTwoVo.java | 30 ++++++++++ .../wms/biz/func/region/RegionChildVo.java | 34 +++++++++++ .../yxt/wms/biz/func/region/RegionDto.java | 46 +++++++++++++++ .../yxt/wms/biz/func/region/RegionListVo.java | 24 ++++++++ .../yxt/wms/biz/func/region/RegionMapper.java | 25 ++++++++ .../yxt/wms/biz/func/region/RegionMapper.xml | 33 +++++++++++ .../yxt/wms/biz/func/region/RegionQuery.java | 23 ++++++++ .../wms/biz/func/region/RegionService.java | 51 ++++++++++++++++ .../func/region/RegionThirdLevelNameVo.java | 24 ++++++++ .../com/yxt/wms/biz/func/region/RegionVo.java | 35 +++++++++++ .../wms/feign/portal/region/RegionFeign.java | 57 ++++++++++++++++++ 13 files changed, 470 insertions(+) create mode 100644 wms-biz/src/main/java/com/yxt/wms/apiadmin/aggregation/RegionRest.java create mode 100644 wms-biz/src/main/java/com/yxt/wms/biz/func/region/Region.java create mode 100644 wms-biz/src/main/java/com/yxt/wms/biz/func/region/RegionChildTwoVo.java create mode 100644 wms-biz/src/main/java/com/yxt/wms/biz/func/region/RegionChildVo.java create mode 100644 wms-biz/src/main/java/com/yxt/wms/biz/func/region/RegionDto.java create mode 100644 wms-biz/src/main/java/com/yxt/wms/biz/func/region/RegionListVo.java create mode 100644 wms-biz/src/main/java/com/yxt/wms/biz/func/region/RegionMapper.java create mode 100644 wms-biz/src/main/java/com/yxt/wms/biz/func/region/RegionMapper.xml create mode 100644 wms-biz/src/main/java/com/yxt/wms/biz/func/region/RegionQuery.java create mode 100644 wms-biz/src/main/java/com/yxt/wms/biz/func/region/RegionService.java create mode 100644 wms-biz/src/main/java/com/yxt/wms/biz/func/region/RegionThirdLevelNameVo.java create mode 100644 wms-biz/src/main/java/com/yxt/wms/biz/func/region/RegionVo.java create mode 100644 wms-biz/src/main/java/com/yxt/wms/feign/portal/region/RegionFeign.java diff --git a/wms-biz/src/main/java/com/yxt/wms/apiadmin/aggregation/RegionRest.java b/wms-biz/src/main/java/com/yxt/wms/apiadmin/aggregation/RegionRest.java new file mode 100644 index 0000000..62c369f --- /dev/null +++ b/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 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 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 county = regionService.getCounty(sid); + return ResultBean.fireSuccess().setData(county); + }; +} diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/region/Region.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/region/Region.java new file mode 100644 index 0000000..ff9868b --- /dev/null +++ b/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; + + +} diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/region/RegionChildTwoVo.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/region/RegionChildTwoVo.java new file mode 100644 index 0000000..74f159f --- /dev/null +++ b/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; +} diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/region/RegionChildVo.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/region/RegionChildVo.java new file mode 100644 index 0000000..6bb91ec --- /dev/null +++ b/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 regionChildTwoVoList; +} diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/region/RegionDto.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/region/RegionDto.java new file mode 100644 index 0000000..b20ac8b --- /dev/null +++ b/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; + + +} diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/region/RegionListVo.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/region/RegionListVo.java new file mode 100644 index 0000000..c939cb0 --- /dev/null +++ b/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; +} diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/region/RegionMapper.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/region/RegionMapper.java new file mode 100644 index 0000000..71a3a16 --- /dev/null +++ b/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 { + + List getProvince(); + + List getCity(String sid); + + List getCounty(String sid); +} diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/region/RegionMapper.xml b/wms-biz/src/main/java/com/yxt/wms/biz/func/region/RegionMapper.xml new file mode 100644 index 0000000..5b391ad --- /dev/null +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/region/RegionMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/region/RegionQuery.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/region/RegionQuery.java new file mode 100644 index 0000000..2853017 --- /dev/null +++ b/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; +} diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/region/RegionService.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/region/RegionService.java new file mode 100644 index 0000000..ba44e93 --- /dev/null +++ b/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 { + + @Autowired + private RegionFeign regionFeign; + + public List getProvince() { + return regionFeign.getProvince().getData(); + } + + /** + * 获取某省下的所有市 + * + * @param sid 省sid + * @return 该省下的所有市的list + */ + public List getCity(String sid) { + return regionFeign.getCity(sid).getData(); + + } + + /** + * 获取某市下的所有区县 + * + * @param sid 市sid + * @return 该市下的所有县区的list + */ + public List getCounty(String sid) { + return regionFeign.getCounty(sid).getData(); + } +} diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/region/RegionThirdLevelNameVo.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/region/RegionThirdLevelNameVo.java new file mode 100644 index 0000000..213c8c3 --- /dev/null +++ b/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; + +} diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/region/RegionVo.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/region/RegionVo.java new file mode 100644 index 0000000..2e13131 --- /dev/null +++ b/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 children; + +} diff --git a/wms-biz/src/main/java/com/yxt/wms/feign/portal/region/RegionFeign.java b/wms-biz/src/main/java/com/yxt/wms/feign/portal/region/RegionFeign.java new file mode 100644 index 0000000..2dc9640 --- /dev/null +++ b/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> getProvince(); + + /** + * 根据省查询该省下所有的市 + * + * @param sid 省sid + * @return 某省下所有的市 + */ + @ApiOperation("根据省sid获取该省的所有市") + @ResponseBody + @GetMapping("/getCity") + public ResultBean> getCity(@RequestParam("sid") String sid); + + /** + * 根据市查询该市下的所有县区 + * + * @param sid 市sid + * @return 某市下的所有县区 + */ + @ApiOperation("根据市sid获取该市的所有县区") + @ResponseBody + @GetMapping("/getCounty") + public ResultBean> getCounty(@RequestParam("sid") String sid); +}