diff --git a/supervise-customer-ui/src/router/modules/codemenu.js b/supervise-customer-ui/src/router/modules/codemenu.js index 07233924..e9819893 100644 --- a/supervise-customer-ui/src/router/modules/codemenu.js +++ b/supervise-customer-ui/src/router/modules/codemenu.js @@ -130,7 +130,7 @@ const codemenu = [{ }, children: [{ path: '/kucun/ddcx', - component: () => import('@/views/kucun/cx.vue'), + component: () => import('@/views/query/orders.vue'), name: 'manufacturerPreference', meta: { title: '订单查询', @@ -138,7 +138,7 @@ const codemenu = [{ } }, { path: '/kucun/ckdbcx', - component: () => import('@/views/kucun/cx.vue'), + component: () => import('@/views/query/cx.vue'), name: 'manufacturerPreference', meta: { title: '仓库调拨查询', @@ -146,7 +146,7 @@ const codemenu = [{ } }, { path: '/kucun/ddspcx', - component: () => import('@/views/kucun/cx.vue'), + component: () => import('@/views/query/cx.vue'), name: 'manufacturerPreference', meta: { title: '订单商品查询', @@ -154,7 +154,7 @@ const codemenu = [{ } }, { path: '/kucun/pspfcx', - component: () => import('@/views/kucun/cx.vue'), + component: () => import('@/views/query/cx.vue'), name: 'manufacturerPreference', meta: { title: '配送批发查询', @@ -162,7 +162,7 @@ const codemenu = [{ } }, { path: '/kucun/crkcx', - component: () => import('@/views/kucun/cx.vue'), + component: () => import('@/views/query/cx.vue'), name: 'manufacturerPreference', meta: { title: '出入库查询', @@ -170,7 +170,7 @@ const codemenu = [{ } }, { path: '/kucun/gyscx', - component: () => import('@/views/kucun/cx.vue'), + component: () => import('@/views/query/cx.vue'), name: 'manufacturerPreference', meta: { title: '供应商查询', @@ -178,7 +178,7 @@ const codemenu = [{ } }, { path: '/kucun/kcxxcx', - component: () => import('@/views/kucun/cx.vue'), + component: () => import('@/views/query/cx.vue'), name: 'manufacturerPreference', meta: { title: '库存信息查询', @@ -186,7 +186,7 @@ const codemenu = [{ } }, { path: '/kucun/xscx', - component: () => import('@/views/kucun/cx.vue'), + component: () => import('@/views/query/cx.vue'), name: 'manufacturerPreference', meta: { title: '销售查询', diff --git a/supervise-customer-ui/src/views/query/cx.vue b/supervise-customer-ui/src/views/query/cx.vue new file mode 100644 index 00000000..5e79a026 --- /dev/null +++ b/supervise-customer-ui/src/views/query/cx.vue @@ -0,0 +1,48 @@ + + + + + diff --git a/supervise-customer-ui/src/views/query/orders.vue b/supervise-customer-ui/src/views/query/orders.vue new file mode 100644 index 00000000..5e79a026 --- /dev/null +++ b/supervise-customer-ui/src/views/query/orders.vue @@ -0,0 +1,48 @@ + + + + + diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/crmcustomertemp/CrmCustomerTempService.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/crmcustomertemp/CrmCustomerTempService.java index 902e1e85..07dfd24d 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/crmcustomertemp/CrmCustomerTempService.java +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/crmcustomertemp/CrmCustomerTempService.java @@ -12,6 +12,7 @@ import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; +import com.yxt.supervise.system.config.DictCommonType; import com.yxt.supervise.system.dictcommon.DictCommonFeign; import com.yxt.supervise.system.sysorganization.SysOrganizationFeign; import com.yxt.supervise.system.sysorganization.SysOrganizationVo; @@ -49,6 +50,8 @@ public class CrmCustomerTempService extends MybatisBaseService createQueryWrapper(CrmCustomerTempQuery query) { QueryWrapper qw = new QueryWrapper<>(); @@ -203,6 +206,12 @@ public class CrmCustomerTempService extends MybatisBaseService staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(sysUserInfoVo.getStaffSid()); diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/dictcommon/DictCommonFeign.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/dictcommon/DictCommonFeign.java index 22933a66..8be2df12 100644 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/dictcommon/DictCommonFeign.java +++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/dictcommon/DictCommonFeign.java @@ -30,9 +30,12 @@ import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.*; +import java.util.List; + /** * Project: yxt_supervise(宇信通监管)
* File: DictCommonFeign.java
@@ -48,8 +51,8 @@ import org.springframework.web.bind.annotation.*; */ @Api(tags = "数据字典——数据项") @FeignClient( - contextId = "yxt-supervise-DictCommon", - name = "yxt-supervise", + contextId = "supervise-system-DictCommon", + name = "supervise-system", path = "v1/dictcommon", fallback = DictCommonFeignFallback.class) public interface DictCommonFeign { @@ -63,14 +66,29 @@ public interface DictCommonFeign { @PostMapping("/save") @ResponseBody public ResultBean save(@RequestBody DictCommonDto dto); - + @ApiOperation("根据sid删除记录") @DeleteMapping("/delBySids") @ResponseBody public ResultBean delBySids(@RequestBody String[] sids); - + @ApiOperation("根据SID获取一条记录") @GetMapping("/fetchDetailsBySid/{sid}") @ResponseBody public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); + + @GetMapping("/typeValues") + @ResponseBody + @ApiOperation("下拉框的获取") + ResultBean> getTypeValues(@RequestParam("type") String type, @RequestParam(value = "psid", defaultValue = "0") String psid); + + @GetMapping("/getFirstDictKeyByType") + @ResponseBody + @ApiOperation("根据数据字典的key获取第一个值(默认值)") + ResultBean getFirstDictKeyByType(@RequestParam("dictType") String dictType, @RequestParam("psid") String psid); + + @ResponseBody + @GetMapping("/selectBykey/{key}/{type}") + @ApiOperation(value = "数据字典信息修改时的初始化信息") + public ResultBean selectBykey(@ApiParam(value = "数据字典key", required = true) @PathVariable("key") String key, @ApiParam(value = "数据字典type", required = true) @PathVariable("type") String type); } \ No newline at end of file diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/dictcommon/DictCommonFeignFallback.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/dictcommon/DictCommonFeignFallback.java index 27c33c1e..0843bc75 100644 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/dictcommon/DictCommonFeignFallback.java +++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/dictcommon/DictCommonFeignFallback.java @@ -30,6 +30,8 @@ import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import org.springframework.stereotype.Component; +import java.util.List; + /** * Project: yxt_supervise(宇信通监管)
* File: DictCommonFeignFallback.java
@@ -67,4 +69,20 @@ public class DictCommonFeignFallback implements DictCommonFeign { ResultBean rb = ResultBean.fireFail(); return rb.setMsg("接口yxt_supervise/dictcommon/fetchDetailsBySid无法访问"); } + + @Override + public ResultBean> getTypeValues(String type, String psid) { + ResultBean> rb = ResultBean.fireFail(); + return rb.setMsg("接口yxt_supervise/dictcommon/getTypeValues无法访问"); + } + + @Override + public ResultBean getFirstDictKeyByType(String dictType, String psid) { + return null; + } + + @Override + public ResultBean selectBykey(String key, String type) { + return null; + } } \ No newline at end of file diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/region/Region.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/region/Region.java new file mode 100644 index 00000000..3f12c74d --- /dev/null +++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/region/Region.java @@ -0,0 +1,28 @@ +package com.yxt.supervise.system.region; + +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2023/1/30 14:14 + * @Description + */ +@Data +public class Region extends BaseEntity { + + private static final long serialVersionUID = -8228110479168648565L; + @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/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/region/RegionFeign.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/region/RegionFeign.java new file mode 100644 index 00000000..ebaa352e --- /dev/null +++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/region/RegionFeign.java @@ -0,0 +1,36 @@ +package com.yxt.supervise.system.region; + +import com.yxt.common.core.result.ResultBean; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +/** + * @Author dimengzhe + * @Date 2023/1/30 14:19 + * @Description + */ +@FeignClient( + contextId = "supervise-system-Region", + name = "supervise-system", + path = "v1/regions", + fallback = RegionFeignFallback.class) +public interface RegionFeign { + + @ApiOperation("获取省") + @ResponseBody + @GetMapping("/getProvince") + public ResultBean getProvince(); + + @ApiOperation("根据省sid获取该省的所有市") + @ResponseBody + @GetMapping("/getCity") + public ResultBean getCity(@RequestParam("sid") String sid); + + @ApiOperation("根据市sid获取该市的所有县区") + @ResponseBody + @GetMapping("/getCounty") + public ResultBean getCounty(@RequestParam("sid") String sid); +} diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/region/RegionFeignFallback.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/region/RegionFeignFallback.java new file mode 100644 index 00000000..2ea96d9e --- /dev/null +++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/region/RegionFeignFallback.java @@ -0,0 +1,12 @@ +package com.yxt.supervise.system.region; + +import org.springframework.stereotype.Component; + +/** + * @Author dimengzhe + * @Date 2023/1/30 14:21 + * @Description + */ +@Component +public class RegionFeignFallback { +} diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/region/RegionListVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/region/RegionListVo.java new file mode 100644 index 00000000..ce443cbb --- /dev/null +++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/region/RegionListVo.java @@ -0,0 +1,30 @@ +package com.yxt.supervise.system.region; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2023/1/30 14:27 + * @Description + */ +@Data +public class RegionListVo implements Vo { + private static final long serialVersionUID = 8014259465244029276L; + + @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/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysorganization/SysOrganizationFeign.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysorganization/SysOrganizationFeign.java index 0de0d522..80d8d84a 100644 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysorganization/SysOrganizationFeign.java +++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysorganization/SysOrganizationFeign.java @@ -28,8 +28,8 @@ import java.util.Map; */ @Api(tags = "组织机构表") @FeignClient( - contextId = "supervise-portal-SysOrganization", - name = "supervise-portal", + contextId = "supervise-system-SysOrganization", + name = "supervise-system", path = "v1/sysorganization", fallback = SysOrganizationFeignFallback.class) public interface SysOrganizationFeign { diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstafforg/SysStaffOrgFeign.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstafforg/SysStaffOrgFeign.java index 05720139..c6fc2001 100644 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstafforg/SysStaffOrgFeign.java +++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstafforg/SysStaffOrgFeign.java @@ -26,8 +26,8 @@ import java.util.List; */ @Api(tags = "员工部门关联表") @FeignClient( - contextId = "supervise-portal-SysStaffOrg", - name = "supervise-portal", + contextId = "supervise-system-SysStaffOrg", + name = "supervise-system", path = "v1/sysstafforg", fallback = SysStaffOrgFeignFallback.class) public interface SysStaffOrgFeign { diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/SysUserFeign.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/SysUserFeign.java index dada1936..6130b2e0 100644 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/SysUserFeign.java +++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/SysUserFeign.java @@ -33,8 +33,8 @@ import java.util.Map; */ @Api(tags = "用户表") @FeignClient( - contextId = "supervise-portal-SysUser", - name = "supervise-portal", + contextId = "supervise-system-SysUser", + name = "supervise-system", path = "v1/sysuser", fallback = SysUserFeignFallback.class) public interface SysUserFeign { diff --git a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/dictcommon/DictCommonMapper.java b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/dictcommon/DictCommonMapper.java index d7bbb7c0..282d70d3 100644 --- a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/dictcommon/DictCommonMapper.java +++ b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/dictcommon/DictCommonMapper.java @@ -26,9 +26,11 @@ package com.yxt.supervise.system.dictcommon; import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.common.core.result.ResultBean; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -67,4 +69,8 @@ public interface DictCommonMapper extends BaseMapper { DictCommonDetailsVo fetchByKeyAndType(@Param("key")String key, @Param("type")String type); @Select("select * from restricted_category where dictkey=#{key} and dictType=#{type}") DictCommonDetailsVo fetchByKeyAndTypeForLimit(@Param("type")String category, @Param("key")String categoryKey); + + List getValue(@Param(Constants.WRAPPER) QueryWrapper qw); + + DictCommonVo selectBykey(@Param("key") String key, @Param("type") String type); } \ No newline at end of file diff --git a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/dictcommon/DictCommonMapper.xml b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/dictcommon/DictCommonMapper.xml index 6c40cf41..79289fa8 100644 --- a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/dictcommon/DictCommonMapper.xml +++ b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/dictcommon/DictCommonMapper.xml @@ -6,8 +6,24 @@ - + + + + + \ No newline at end of file diff --git a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/dictcommon/DictCommonRest.java b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/dictcommon/DictCommonRest.java index 26400226..212ffcab 100644 --- a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/dictcommon/DictCommonRest.java +++ b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/dictcommon/DictCommonRest.java @@ -34,6 +34,8 @@ import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.List; + /** * Project: yxt_supervise(宇信通监管)
* File: DictCommonFeignFallback.java
@@ -90,4 +92,19 @@ public class DictCommonRest implements DictCommonFeign { DictCommonDetailsVo vo = dictCommonService.fetchDetailsVoBySid(sid); return rb.success().setData(vo); } + + @Override + public ResultBean> getTypeValues(String type, String psid) { + return dictCommonService.getTypeValues(type,psid); + } + + @Override + public ResultBean getFirstDictKeyByType(String dictType, String psid) { + return dictCommonService.getFirstDictKeyByType(dictType,psid); + } + + @Override + public ResultBean selectBykey(String key, String type) { + return dictCommonService.selectByKey(key,type); + } } diff --git a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/dictcommon/DictCommonService.java b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/dictcommon/DictCommonService.java index bc1b4ca3..e0cd7476 100644 --- a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/dictcommon/DictCommonService.java +++ b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/dictcommon/DictCommonService.java @@ -31,10 +31,13 @@ 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.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; +import java.util.List; + /** * Project: yxt_supervise(宇信通监管)
* File: DictCommonService.java
@@ -56,7 +59,7 @@ public class DictCommonService extends MybatisBaseService qw = new QueryWrapper<>(); return qw; } - + public PagerVo listPageVo(PagerQuery pq) { DictCommonQuery query = pq.getParams(); QueryWrapper qw = createQueryWrapper(query); @@ -65,32 +68,32 @@ public class DictCommonService extends MybatisBaseService p = PagerUtil.pageToVo(pagging, null); return p; } - + public void saveOrUpdateDto(DictCommonDto dto){ String dtoSid = dto.getSid(); if (StringUtils.isBlank(dtoSid)) { this.insertByDto(dto); - return; - } + return; + } this.updateByDto(dto); } - + public void insertByDto(DictCommonDto dto){ DictCommon entity = new DictCommon(); BeanUtil.copyProperties(dto, entity, "id", "sid"); baseMapper.insert(entity); } - + public void updateByDto(DictCommonDto dto){ String dtoSid = dto.getSid(); if (StringUtils.isBlank(dtoSid)) { return; - } + } DictCommon entity = fetchBySid(dtoSid); BeanUtil.copyProperties(dto, entity, "id", "sid"); baseMapper.updateById(entity); } - + public DictCommonDetailsVo fetchDetailsVoBySid(String sid){ DictCommon entity = fetchBySid(sid); DictCommonDetailsVo vo = new DictCommonDetailsVo(); @@ -112,4 +115,39 @@ public class DictCommonService extends MybatisBaseService> getTypeValues(String type, String psid) { + ResultBean> rb = ResultBean.fireFail(); + QueryWrapper qw = new QueryWrapper<>(); + if (StringUtils.isNotBlank(type)){//类型 + qw.eq("dc.dictType",type); + } + if (StringUtils.isNotBlank(psid)){//父级sid + qw.eq("dc.parentSid", psid); + } + List list = baseMapper.getValue(qw); + return rb.success().setData(list); + } + + public ResultBean getFirstDictKeyByType(String dictType, String psid) { + ResultBean rb = ResultBean.fireFail(); + QueryWrapper qw = new QueryWrapper<>(); + if (StringUtils.isNotBlank(dictType)){//类型 + qw.eq("dc.dictType",dictType); + } + if (StringUtils.isNotBlank(psid)){//父级sid + qw.eq("dc.parentSid", psid); + } + List list = baseMapper.getValue(qw); + return rb.success().setData(list); + } + + public ResultBean selectByKey(String key, String type) { + ResultBean rb = ResultBean.fireFail(); + DictCommonVo v = baseMapper.selectBykey(key, type); + if (v == null) { + return new ResultBean().success().setData(new DictCommonVo()); + } + return rb.success().setData(v); + } } \ No newline at end of file diff --git a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/region/RegionMapper.java b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/region/RegionMapper.java new file mode 100644 index 00000000..75e17081 --- /dev/null +++ b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/region/RegionMapper.java @@ -0,0 +1,37 @@ +package com.yxt.supervise.system.region; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + * @Author dimengzhe + * @Date 2023/1/30 14:24 + * @Description + */ +@Mapper +public interface RegionMapper extends BaseMapper { + /** + * 获取省 + * + * @return + */ + List getProvinceList(); + + /** + * 获取省下的市 + * + * @param sid 省sid + * @return + */ + List getCity(String sid); + + /** + * 获取市下的县区 + * + * @param sid 市sid + * @return + */ + List getCounty(String sid); +} diff --git a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/region/RegionMapper.xml b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/region/RegionMapper.xml new file mode 100644 index 00000000..93b86a9a --- /dev/null +++ b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/region/RegionMapper.xml @@ -0,0 +1,25 @@ + + + + + + + + + \ No newline at end of file diff --git a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/region/RegionRest.java b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/region/RegionRest.java new file mode 100644 index 00000000..19392c61 --- /dev/null +++ b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/region/RegionRest.java @@ -0,0 +1,36 @@ +package com.yxt.supervise.system.region; + +import com.yxt.common.core.result.ResultBean; +import io.swagger.annotations.Api; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; + +/** + * @Author dimengzhe + * @Date 2023/1/30 14:23 + * @Description + */ +@Controller +@RequestMapping("v1/regions") +@Api(tags = "区域管理") +public class RegionRest implements RegionFeign{ + + @Autowired + private RegionService regionService; + + @Override + public ResultBean getProvince() { + return regionService.getProvince(); + } + + @Override + public ResultBean getCity(String sid) { + return regionService.getCity(sid); + } + + @Override + public ResultBean getCounty(String sid) { + return regionService.getCounty(sid); + } +} diff --git a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/region/RegionService.java b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/region/RegionService.java new file mode 100644 index 00000000..131bfcec --- /dev/null +++ b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/region/RegionService.java @@ -0,0 +1,51 @@ +package com.yxt.supervise.system.region; + +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.core.result.ResultBean; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @Author dimengzhe + * @Date 2023/1/30 14:24 + * @Description + */ +@Service +public class RegionService extends MybatisBaseService { + + /** + * 获取省 + * + * @return + */ + public ResultBean getProvince() { + ResultBean rb = ResultBean.fireFail(); + List regionList = baseMapper.getProvinceList(); + return rb.success().setData(regionList); + } + + /** + * 获取省下的市 + * + * @param sid 省sid + * @return + */ + public ResultBean getCity(String sid) { + ResultBean rb = ResultBean.fireFail(); + List regionList = baseMapper.getCity(sid); + return rb.success().setData(regionList); + } + + /** + * 获取市下的县区 + * + * @param sid 市sid + * @return + */ + public ResultBean getCounty(String sid) { + ResultBean rb = ResultBean.fireFail(); + List regionList = baseMapper.getCounty(sid); + return rb.success().setData(regionList); + } +}