diff --git a/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/base/client/CategoryClient.java b/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/base/client/CategoryClient.java new file mode 100644 index 0000000..35548a0 --- /dev/null +++ b/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/base/client/CategoryClient.java @@ -0,0 +1,31 @@ +package com.chinaunicom.mall.ebtp.common.base.client; + +import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; +import com.chinaunicom.mall.ebtp.common.base.entity.CoscoCategoryMaintenance; +import com.chinaunicom.mall.ebtp.common.base.entity.CoscoCategoryMaintenanceVO; +import com.chinaunicom.mall.ebtp.common.base.fallback.CategoryClientFallback; +import com.chinaunicom.mall.ebtp.common.constant.ServiceNameConstants; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +import java.util.List; + +@FeignClient( + name = ServiceNameConstants.SYSTEM_SERVICE, + fallback = CategoryClientFallback.class +) +public interface CategoryClient { + + // --------------------------品类接口----------------------- + @ApiOperation("查询品类数据详细") + @GetMapping("/v1/coscocategorymaintenance/{id}") + BaseResponse getInfo(@PathVariable String id); + + @ApiOperation("查询树结构数据") + @PostMapping("/v1/coscocategorymaintenance/getTreeList") + BaseResponse> getTreeList(@RequestBody CoscoCategoryMaintenanceVO coscoCategoryMaintenanceVO); +} diff --git a/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/base/client/DictClient.java b/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/base/client/DictClient.java new file mode 100644 index 0000000..23ef4e1 --- /dev/null +++ b/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/base/client/DictClient.java @@ -0,0 +1,34 @@ +package com.chinaunicom.mall.ebtp.common.base.client; + +import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; +import com.chinaunicom.mall.ebtp.common.base.entity.DictProject; +import com.chinaunicom.mall.ebtp.common.base.fallback.DictClientFallback; +import com.chinaunicom.mall.ebtp.common.constant.ServiceNameConstants; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; + +import java.util.List; + +@FeignClient( + name = ServiceNameConstants.SYSTEM_SERVICE, + fallback = DictClientFallback.class +) +public interface DictClient { + + // --------------------------字典接口----------------------- + + /** + * 查询所有字典 + * @param dictProject + * @return + */ + @ApiOperation("查询数据集合") + @GetMapping("/v1/dictProject/selectDictList") + BaseResponse> selectDictList(DictProject dictProject); + + @ApiOperation("查询数据集合(支持详情查询)") + @GetMapping("/v1/dictProject/getDictList") + BaseResponse> getDictList(DictProject dictProject); +} + diff --git a/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/base/client/DictRegionClient.java b/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/base/client/DictRegionClient.java new file mode 100644 index 0000000..31c09fd --- /dev/null +++ b/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/base/client/DictRegionClient.java @@ -0,0 +1,39 @@ +package com.chinaunicom.mall.ebtp.common.base.client; + +import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; +import com.chinaunicom.mall.ebtp.common.base.entity.DictRegion; +import com.chinaunicom.mall.ebtp.common.base.entity.DictRegionInternational; +import com.chinaunicom.mall.ebtp.common.base.entity.DictRegionTreeVO; +import com.chinaunicom.mall.ebtp.common.base.fallback.DictRegionClientFallback; +import com.chinaunicom.mall.ebtp.common.base.fallback.DictRegionInternationalClientFallback; +import com.chinaunicom.mall.ebtp.common.constant.ServiceNameConstants; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestParam; + +import java.util.List; + +@FeignClient( + name = ServiceNameConstants.SYSTEM_SERVICE, + fallback = DictRegionClientFallback.class +) +public interface DictRegionClient { + + // --------------------------省市区信息接口----------------------- + + + @ApiOperation("查询所有数据") + @GetMapping("/v1/dictRegion/all") + BaseResponse> listAll(); + + @ApiOperation("查询数据子节点") + @GetMapping("/v1/dictRegion/getChild") + BaseResponse> getChild(@RequestParam(name = "pId") String pId); + + @ApiOperation("递归查询所有下级数据树形结构") + @GetMapping("/v1/dictRegion/getAllChildrenTree/{id}") + BaseResponse getAllChildrenTree(@PathVariable String id); +} + diff --git a/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/base/client/DictRegionInternationalClient.java b/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/base/client/DictRegionInternationalClient.java new file mode 100644 index 0000000..c5459bc --- /dev/null +++ b/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/base/client/DictRegionInternationalClient.java @@ -0,0 +1,30 @@ +package com.chinaunicom.mall.ebtp.common.base.client; + +import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; +import com.chinaunicom.mall.ebtp.common.base.entity.DictRegionInternational; +import com.chinaunicom.mall.ebtp.common.base.fallback.DictRegionInternationalClientFallback; +import com.chinaunicom.mall.ebtp.common.constant.ServiceNameConstants; +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 java.util.List; + +@FeignClient( + name = ServiceNameConstants.SYSTEM_SERVICE, + fallback = DictRegionInternationalClientFallback.class +) +public interface DictRegionInternationalClient { + + // --------------------------全球国家信息接口----------------------- + + @ApiOperation("查询所有数据") + @GetMapping("/v1/dictRegionInternational/all") + BaseResponse> listAll(); + + @ApiOperation("查询子数据") + @GetMapping("/v1/dictRegionInternational/getChild") + BaseResponse> getChild(@RequestParam(name = "pId") String pId); +} + diff --git a/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/base/client/SystemClient.java b/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/base/client/SystemClient.java index 8de59fa..745dde9 100644 --- a/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/base/client/SystemClient.java +++ b/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/base/client/SystemClient.java @@ -44,6 +44,10 @@ public interface SystemClient { @ApiParam(value = "查询对象数据", required = false) @SpringQueryMap SysUser param ); + @ApiOperation("根据用户ID查询本单位下所有用户分页数据") + @PostMapping("/v1/sysuser/getPageByUserCompany") + BaseResponse> getPageByUserCompany(@ApiParam(value = "分页及查询条件", required = true) @RequestBody SysUserVO sysUserVO); + // -----------------------供应商用户接口----------------------- @ApiOperation("供应商注册(自动生成账号并设置统一重置密码)") @PostMapping("/v1/supplieruser/register") diff --git a/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/base/entity/CoscoCategoryMaintenance.java b/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/base/entity/CoscoCategoryMaintenance.java new file mode 100644 index 0000000..7ac9210 --- /dev/null +++ b/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/base/entity/CoscoCategoryMaintenance.java @@ -0,0 +1,86 @@ +package com.chinaunicom.mall.ebtp.common.base.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; + +/** + * 实体类 CoscoCategoryMaintenance + * @author sunyu + * @date 2025-5-27 + */ +@Data +@Accessors(chain = true) +@ApiModel +public class CoscoCategoryMaintenance extends BaseEntity implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @ApiModelProperty(value = "主键ID") + private Long id; + + /** + * 版本id + */ + @ApiModelProperty(value = "版本id") + private Long versionId; + + /** + * 父id + */ + @ApiModelProperty(value = "父id") + private Long parentId; + + /** + * 路径 + */ + @ApiModelProperty(value = "路径") + private String path; + + /** + * 品类名称 + */ + @ApiModelProperty(value = "品类名称") + private String categoryName; + + /** + * 编码 + */ + @ApiModelProperty(value = "编码") + private String code; + + /** + * 状态(1启用 0停用) + */ + @ApiModelProperty(value = "状态(1启用 0停用)") + private Integer status; + + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private java.time.LocalDateTime createDate; + + + /** + * 更新时间 + */ + @ApiModelProperty(value = "更新时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private java.time.LocalDateTime updateDate; + + +} diff --git a/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/base/entity/CoscoCategoryMaintenanceVO.java b/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/base/entity/CoscoCategoryMaintenanceVO.java new file mode 100644 index 0000000..294c89f --- /dev/null +++ b/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/base/entity/CoscoCategoryMaintenanceVO.java @@ -0,0 +1,32 @@ +package com.chinaunicom.mall.ebtp.common.base.entity; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.util.List; + +/** + * 实体类 CoscoCategoryMaintenance + * @author sunyu + * @date 2025-5-27 + */ +@Data +@Accessors(chain = true) +@ApiModel +public class CoscoCategoryMaintenanceVO extends CoscoCategoryMaintenance implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "分页对象信息") + private BasePageRequest basePageRequest; + + @ApiModelProperty(value = "children") + private List children; + + @ApiModelProperty(value = "品类版本id") + private Long versionId; + +} diff --git a/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/base/entity/DictProject.java b/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/base/entity/DictProject.java index 9c50e19..46793ee 100644 --- a/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/base/entity/DictProject.java +++ b/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/base/entity/DictProject.java @@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; /** * 实体类 DictProject @@ -65,4 +67,14 @@ public class DictProject implements Serializable { private String description; + /** + * 英文名称 + */ + @ApiModelProperty(value = "英文名称") + private String enName; + + /** + * 字典子项 + */ + List children = new ArrayList<>(); } diff --git a/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/base/entity/DictRegion.java b/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/base/entity/DictRegion.java new file mode 100644 index 0000000..443d765 --- /dev/null +++ b/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/base/entity/DictRegion.java @@ -0,0 +1,65 @@ +package com.chinaunicom.mall.ebtp.common.base.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; + +import java.io.Serializable; + +/** + * 全国行政区域实体类 DictRegion + * + * @author daixc + * @date 2020/10/29 + */ +@Data +@Accessors(chain = true) +@ApiModel("全国行政区域实体类") +public class DictRegion implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * id + */ + @ApiModelProperty(value = "id") + private String id; + + /** + * 上级id + */ + @ApiModelProperty(value = "上级id") + private String pId; + + /** + * 名称 + */ + @ApiModelProperty(value = "名称") + private String name; + + /** + * 类型:0-省,1-市,2-县 + */ + @ApiModelProperty(value = "类型:0-省,1-市,2-县") + private String level; + /** + * 缩写 + */ + @ApiModelProperty(value = "缩写") + private String ab; + + /** + * ID路径,逗号分隔 + */ + @ApiModelProperty(value = "ID路径,逗号分隔") + private String path; + + /** + * 名称路径,逗号分隔 + */ + @ApiModelProperty(value = "名称路径,逗号分隔") + private String pathName; + +} diff --git a/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/base/entity/DictRegionInternational.java b/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/base/entity/DictRegionInternational.java new file mode 100644 index 0000000..c3edc1c --- /dev/null +++ b/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/base/entity/DictRegionInternational.java @@ -0,0 +1,58 @@ +package com.chinaunicom.mall.ebtp.common.base.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; + +import java.io.Serializable; + +/** + * 全球国家信息实体类 DictRegionInternational + * + * @author 自动生成 + */ +@Data +@Accessors(chain = true) +@ApiModel("全球国家信息实体类") +public class DictRegionInternational implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * id + */ + @ApiModelProperty(value = "id") + private String id; + + /** + * 上级id + */ + @ApiModelProperty(value = "上级id") + private String pId; + + /** + * 名称 + */ + @ApiModelProperty(value = "名称") + private String name; + + /** + * 类型:0-国家 + */ + @ApiModelProperty(value = "类型:0-国家") + private String level; + + /** + * 缩写 + */ + @ApiModelProperty(value = "缩写") + private String ab; + + /** + * 英文名称 + */ + @ApiModelProperty(value = "英文名称") + private String enName; +} diff --git a/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/base/entity/DictRegionTreeVO.java b/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/base/entity/DictRegionTreeVO.java new file mode 100644 index 0000000..cda041f --- /dev/null +++ b/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/base/entity/DictRegionTreeVO.java @@ -0,0 +1,71 @@ +package com.chinaunicom.mall.ebtp.common.base.entity; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.util.List; + +/** + * 全国行政区域树形结构VO + * + * @author daixc + * @date 2020/10/29 + */ +@Data +@Accessors(chain = true) +@ApiModel("全国行政区域树形结构VO") +public class DictRegionTreeVO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * id + */ + @ApiModelProperty(value = "id") + private String id; + + /** + * 上级id + */ + @ApiModelProperty(value = "上级id") + private String pId; + + /** + * 名称 + */ + @ApiModelProperty(value = "名称") + private String name; + + /** + * 类型:0-省,1-市,2-县 + */ + @ApiModelProperty(value = "类型:0-省,1-市,2-县") + private String level; + + /** + * 缩写 + */ + @ApiModelProperty(value = "缩写") + private String ab; + + /** + * 子节点列表 + */ + @ApiModelProperty(value = "子节点列表") + private List children; + + /** + * 是否叶子节点 + */ + @ApiModelProperty(value = "是否叶子节点") + private Boolean isLeaf; + + /** + * 层级深度 + */ + @ApiModelProperty(value = "层级深度") + private Integer depth; +} diff --git a/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/base/fallback/CategoryClientFallback.java b/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/base/fallback/CategoryClientFallback.java new file mode 100644 index 0000000..0763d39 --- /dev/null +++ b/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/base/fallback/CategoryClientFallback.java @@ -0,0 +1,22 @@ +package com.chinaunicom.mall.ebtp.common.base.fallback; + +import com.chinaunicom.mall.ebtp.common.base.client.CategoryClient; +import com.chinaunicom.mall.ebtp.common.base.entity.*; +import org.springframework.stereotype.Component; + +import java.util.List; + + +@Component +public class CategoryClientFallback implements CategoryClient { + + @Override + public BaseResponse getInfo(String id) { + return null; + } + + @Override + public BaseResponse> getTreeList(CoscoCategoryMaintenanceVO coscoCategoryMaintenanceVO) { + return null; + } +} \ No newline at end of file diff --git a/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/base/fallback/DictClientFallback.java b/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/base/fallback/DictClientFallback.java new file mode 100644 index 0000000..7bced38 --- /dev/null +++ b/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/base/fallback/DictClientFallback.java @@ -0,0 +1,23 @@ +package com.chinaunicom.mall.ebtp.common.base.fallback; + +import com.chinaunicom.mall.ebtp.common.base.client.DictClient; +import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; +import com.chinaunicom.mall.ebtp.common.base.entity.DictProject; +import org.springframework.stereotype.Component; + +import java.util.List; + + +@Component +public class DictClientFallback implements DictClient { + + @Override + public BaseResponse> selectDictList(DictProject dictProject) { + return null; + } + + @Override + public BaseResponse> getDictList(DictProject dictProject) { + return null; + } +} \ No newline at end of file diff --git a/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/base/fallback/DictRegionClientFallback.java b/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/base/fallback/DictRegionClientFallback.java new file mode 100644 index 0000000..72416f7 --- /dev/null +++ b/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/base/fallback/DictRegionClientFallback.java @@ -0,0 +1,31 @@ +package com.chinaunicom.mall.ebtp.common.base.fallback; + +import com.chinaunicom.mall.ebtp.common.base.client.DictRegionClient; +import com.chinaunicom.mall.ebtp.common.base.client.DictRegionInternationalClient; +import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; +import com.chinaunicom.mall.ebtp.common.base.entity.DictRegion; +import com.chinaunicom.mall.ebtp.common.base.entity.DictRegionInternational; +import com.chinaunicom.mall.ebtp.common.base.entity.DictRegionTreeVO; +import org.springframework.stereotype.Component; + +import java.util.List; + + +@Component +public class DictRegionClientFallback implements DictRegionClient { + + @Override + public BaseResponse> listAll() { + return null; + } + + @Override + public BaseResponse> getChild(String pId) { + return null; + } + + @Override + public BaseResponse getAllChildrenTree(String id) { + return null; + } +} \ No newline at end of file diff --git a/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/base/fallback/DictRegionInternationalClientFallback.java b/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/base/fallback/DictRegionInternationalClientFallback.java new file mode 100644 index 0000000..7ee4431 --- /dev/null +++ b/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/base/fallback/DictRegionInternationalClientFallback.java @@ -0,0 +1,25 @@ +package com.chinaunicom.mall.ebtp.common.base.fallback; + +import com.chinaunicom.mall.ebtp.common.base.client.DictClient; +import com.chinaunicom.mall.ebtp.common.base.client.DictRegionInternationalClient; +import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; +import com.chinaunicom.mall.ebtp.common.base.entity.DictProject; +import com.chinaunicom.mall.ebtp.common.base.entity.DictRegionInternational; +import org.springframework.stereotype.Component; + +import java.util.List; + + +@Component +public class DictRegionInternationalClientFallback implements DictRegionInternationalClient { + + @Override + public BaseResponse> listAll() { + return null; + } + + @Override + public BaseResponse> getChild(String pId) { + return null; + } +} \ No newline at end of file diff --git a/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/base/fallback/SystemClientFallback.java b/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/base/fallback/SystemClientFallback.java index 5447fb8..2c732f6 100644 --- a/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/base/fallback/SystemClientFallback.java +++ b/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/base/fallback/SystemClientFallback.java @@ -1,5 +1,6 @@ package com.chinaunicom.mall.ebtp.common.base.fallback; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.chinaunicom.mall.ebtp.common.base.client.SystemClient; import com.chinaunicom.mall.ebtp.common.base.entity.*; @@ -29,6 +30,11 @@ public class SystemClientFallback implements SystemClient { return null; } + @Override + public BaseResponse> getPageByUserCompany(SysUserVO sysUserVO) { + return null; + } + @Override public BaseResponse register(SupplierRegistrationVO registrationVO) { return null;