diff --git a/yxt_supervise/README.md b/yxt_supervise/README.md index 49fd3432..87ec740a 100644 --- a/yxt_supervise/README.md +++ b/yxt_supervise/README.md @@ -22,6 +22,7 @@ supervise -- 根项目 │ ├────────────customerorder -- 客户订单 │ ├────────────customerordergoods -- 客户订单内商品 │ ├────────────customersupplier -- 客户供应商 + │ ├────────────customersupplierindex -- 客户供应商代码对应表 │ ├────────────restrictedbrand -- 限定品牌 │ ├────────────restrictedcategory -- 限定品类 │ ├────────────risk -- 风险 diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/customersupplierindex/CustomerSupplierIndex.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/customersupplierindex/CustomerSupplierIndex.java new file mode 100644 index 00000000..932749bf --- /dev/null +++ b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/customersupplierindex/CustomerSupplierIndex.java @@ -0,0 +1,25 @@ +package com.supervise.rms.api.customersupplierindex; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel(value = "风险表", description = "风险表") +@TableName("risk") +public class CustomerSupplierIndex extends BaseEntity { + @ApiModelProperty("风险指标Sid") + private String riskIndicatorsSid; + @ApiModelProperty("风险处理状态0.待处理1.处理中2.完成") + private Integer riskTreatmentStatus; + @ApiModelProperty("风险消除程度0.未消除1.已消除") + private Integer riskEliminationDegree; + @ApiModelProperty("客户Sid") + private String customerSid; + @ApiModelProperty("风险处于位置1.供应商2.一类仓3.门店仓") + private Integer riskInPositionNum; + @ApiModelProperty("风险处于位置Sid") + private String riskInPositionSid; +} diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/customersupplierindex/CustomerSupplierIndexDto.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/customersupplierindex/CustomerSupplierIndexDto.java new file mode 100644 index 00000000..3889ea78 --- /dev/null +++ b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/customersupplierindex/CustomerSupplierIndexDto.java @@ -0,0 +1,22 @@ +package com.supervise.rms.api.customersupplierindex; + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class CustomerSupplierIndexDto implements Dto { + private String sid; + @ApiModelProperty("风险指标Sid") + private String riskIndicatorsSid; + @ApiModelProperty("风险处理状态0.待处理1.处理中2.完成") + private Integer riskTreatmentStatus; + @ApiModelProperty("风险消除程度0.未消除1.已消除") + private Integer riskEliminationDegree; + @ApiModelProperty("客户Sid") + private String customerSid; + @ApiModelProperty("风险处于位置1.供应商2.一类仓3.门店仓") + private Integer riskInPositionNum; + @ApiModelProperty("风险处于位置Sid") + private String riskInPositionSid; +} diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/customersupplierindex/CustomerSupplierIndexFeign.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/customersupplierindex/CustomerSupplierIndexFeign.java new file mode 100644 index 00000000..f3e0b7a8 --- /dev/null +++ b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/customersupplierindex/CustomerSupplierIndexFeign.java @@ -0,0 +1,13 @@ +package com.supervise.rms.api.customersupplierindex; + +import io.swagger.annotations.Api; +import org.springframework.cloud.openfeign.FeignClient; + +@Api(tags = "风险表") +@FeignClient( + contextId = "yxt-supervise-CustomerOrder", + name = "yxt-supervise", + path = "v1/risk", + fallback = CustomerSupplierIndexFeignFallback.class) +public interface CustomerSupplierIndexFeign { +} diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/customersupplierindex/CustomerSupplierIndexFeignFallback.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/customersupplierindex/CustomerSupplierIndexFeignFallback.java new file mode 100644 index 00000000..4c705fbd --- /dev/null +++ b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/customersupplierindex/CustomerSupplierIndexFeignFallback.java @@ -0,0 +1,7 @@ +package com.supervise.rms.api.customersupplierindex; + +import org.springframework.stereotype.Component; + +@Component +public class CustomerSupplierIndexFeignFallback implements CustomerSupplierIndexFeign { +} diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/customersupplierindex/CustomerSupplierIndexVo.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/customersupplierindex/CustomerSupplierIndexVo.java new file mode 100644 index 00000000..c2b8a750 --- /dev/null +++ b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/customersupplierindex/CustomerSupplierIndexVo.java @@ -0,0 +1,22 @@ +package com.supervise.rms.api.customersupplierindex; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class CustomerSupplierIndexVo implements Vo { + private String sid; + @ApiModelProperty("风险指标Sid") + private String riskIndicatorsSid; + @ApiModelProperty("风险处理状态0.待处理1.处理中2.完成") + private Integer riskTreatmentStatus; + @ApiModelProperty("风险消除程度0.未消除1.已消除") + private Integer riskEliminationDegree; + @ApiModelProperty("客户Sid") + private String customerSid; + @ApiModelProperty("风险处于位置1.供应商2.一类仓3.门店仓") + private Integer riskInPositionNum; + @ApiModelProperty("风险处于位置Sid") + private String riskInPositionSid; +} \ No newline at end of file diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/risklist/RiskList.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/risklist/RiskList.java deleted file mode 100644 index ff1deeb2..00000000 --- a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/risklist/RiskList.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.supervise.rms.api.risklist; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.yxt.common.core.domain.BaseEntity; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -@ApiModel(value = "风险名单表", description = "风险名单表") -@TableName("risk_list") -public class RiskList extends BaseEntity { - @ApiModelProperty("风险对象Sid") - private String riskObjectSid; - @ApiModelProperty("风险对象类型1.供应商2.仓库3.门店") - private Integer riskObjectType; -} diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/risklist/RiskListDto.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/risklist/RiskListDto.java deleted file mode 100644 index 326fa9e1..00000000 --- a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/risklist/RiskListDto.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.supervise.rms.api.risklist; - -import com.yxt.common.core.dto.Dto; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class RiskListDto implements Dto { - private String sid; - @ApiModelProperty("风险对象Sid") - private String riskObjectSid; - @ApiModelProperty("风险对象类型1.供应商2.仓库3.门店") - private Integer riskObjectType; -} diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/risklist/RiskListFeign.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/risklist/RiskListFeign.java deleted file mode 100644 index dbe7c955..00000000 --- a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/risklist/RiskListFeign.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.supervise.rms.api.risklist; - -import io.swagger.annotations.Api; -import org.springframework.cloud.openfeign.FeignClient; - -@Api(tags = "风险指标类别表") -@FeignClient( - contextId = "yxt-supervise-RiskList", - name = "yxt-supervise", - path = "v1/riskList", - fallback = RiskListFeignFallback.class) -public interface RiskListFeign { -} diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/risklist/RiskListFeignFallback.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/risklist/RiskListFeignFallback.java deleted file mode 100644 index 0dc372b1..00000000 --- a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/risklist/RiskListFeignFallback.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.supervise.rms.api.risklist; - -import org.springframework.stereotype.Component; - -@Component -public class RiskListFeignFallback implements RiskListFeign{ -} diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/risklist/RiskListVo.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/risklist/RiskListVo.java deleted file mode 100644 index 26abe36a..00000000 --- a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/risklist/RiskListVo.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.supervise.rms.api.risklist; - -import com.yxt.common.core.vo.Vo; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class RiskListVo implements Vo { - private String sid; - @ApiModelProperty("风险对象Sid") - private String riskObjectSid; - @ApiModelProperty("风险对象类型1.供应商2.仓库3.门店") - private Integer riskObjectType; -} \ No newline at end of file diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/risklist/RiskListMapper.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/customersupplierindex/CustomerSupplierIndexMapper.java similarity index 90% rename from yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/risklist/RiskListMapper.java rename to yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/customersupplierindex/CustomerSupplierIndexMapper.java index 723866d4..a2e8c98a 100644 --- a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/risklist/RiskListMapper.java +++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/customersupplierindex/CustomerSupplierIndexMapper.java @@ -23,13 +23,13 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.supervise.rms.biz.risklist; +package com.supervise.rms.biz.customersupplierindex; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.supervise.rms.api.risklist.RiskList; +import com.supervise.rms.api.risk.Risk; import org.apache.ibatis.annotations.Mapper; @Mapper -public interface RiskListMapper extends BaseMapper { +public interface CustomerSupplierIndexMapper extends BaseMapper { } \ No newline at end of file diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/risklist/RiskListMapper.xml b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/customersupplierindex/CustomerSupplierIndexMapper.xml similarity index 66% rename from yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/risklist/RiskListMapper.xml rename to yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/customersupplierindex/CustomerSupplierIndexMapper.xml index 1536113b..a3c8532b 100644 --- a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/risklist/RiskListMapper.xml +++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/customersupplierindex/CustomerSupplierIndexMapper.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/customersupplierindex/CustomerSupplierIndexRest.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/customersupplierindex/CustomerSupplierIndexRest.java new file mode 100644 index 00000000..86d8657c --- /dev/null +++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/customersupplierindex/CustomerSupplierIndexRest.java @@ -0,0 +1,13 @@ +package com.supervise.rms.biz.customersupplierindex; + +import com.supervise.rms.api.risk.RiskFeign; +import io.swagger.annotations.Api; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@Api(tags = "风险名单表") +@RestController("com.supervise.rmc.biz.risk.RiskRest") +@RequestMapping("v1/risk") +public class CustomerSupplierIndexRest implements RiskFeign { + +} diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/customersupplierindex/CustomerSupplierIndexService.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/customersupplierindex/CustomerSupplierIndexService.java new file mode 100644 index 00000000..1623437a --- /dev/null +++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/customersupplierindex/CustomerSupplierIndexService.java @@ -0,0 +1,11 @@ +package com.supervise.rms.biz.customersupplierindex; + +import com.supervise.rms.api.risk.Risk; +import com.yxt.common.base.service.MybatisBaseService; +import org.springframework.stereotype.Service; + +@Service +public class CustomerSupplierIndexService extends MybatisBaseService { + + +} diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/risklist/RiskListRest.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/risklist/RiskListRest.java deleted file mode 100644 index fb2e7414..00000000 --- a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/risklist/RiskListRest.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.supervise.rms.biz.risklist; - -import com.supervise.rms.api.risklist.RiskListFeign; -import io.swagger.annotations.Api; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -@Api(tags = "风险名单表") -@RestController("com.supervise.rmc.biz.risklist.RiskListRest") -@RequestMapping("v1/riskList") -public class RiskListRest implements RiskListFeign { - -} diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/risklist/RiskListService.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/risklist/RiskListService.java deleted file mode 100644 index 001a5d7d..00000000 --- a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/risklist/RiskListService.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.supervise.rms.biz.risklist; - -import com.yxt.common.base.service.MybatisBaseService; -import com.supervise.rms.api.risklist.RiskList; -import org.springframework.stereotype.Service; - -@Service -public class RiskListService extends MybatisBaseService { - - -}