From d3df66288069153f8affd34f4127c719b8c31a74 Mon Sep 17 00:00:00 2001 From: wangpengfei <1928057482@qq.com> Date: Mon, 1 Jul 2024 18:02:15 +0800 Subject: [PATCH] 7/1 --- wms-biz/pom.xml | 11 ++++- .../aggregation/BaseGoodsSpuRest.java | 5 +++ .../aggregation/BaseGoodsUnitRest.java | 6 ++- .../basegoodsspu/BaseGoodsSpuService.java | 3 ++ .../supplierinfo/SupplierInfoService.java | 7 +-- .../func/warehouseextend/WarehouseExtend.java | 10 ++--- .../warehouseextend/WarehouseExtendDto.java | 10 ++--- .../warehouseextend/WarehouseExtendVo.java | 10 ++--- .../biz/func/warehouseinfo/WarehouseInfo.java | 7 ++- .../func/warehouseinfo/WarehouseInfoDto.java | 11 +++-- .../func/warehouseinfo/WarehouseInfoVo.java | 10 ++--- .../yxt/wms/config/Swagger2Configuration.java | 43 +++++++++++++++++++ .../base/basegoodsspu/BaseGoodsSpuFeign.java | 4 +- .../BaseGoodsSpuFeignFallback.java | 5 +++ 14 files changed, 108 insertions(+), 34 deletions(-) create mode 100644 wms-biz/src/main/java/com/yxt/wms/config/Swagger2Configuration.java diff --git a/wms-biz/pom.xml b/wms-biz/pom.xml index cd144e5..48d7f1d 100644 --- a/wms-biz/pom.xml +++ b/wms-biz/pom.xml @@ -131,7 +131,16 @@ core 3.5.2 - + + io.springfox + springfox-swagger2 + 2.9.2 + + + io.springfox + springfox-swagger-ui + 2.8.0 + diff --git a/wms-biz/src/main/java/com/yxt/wms/apiadmin/aggregation/BaseGoodsSpuRest.java b/wms-biz/src/main/java/com/yxt/wms/apiadmin/aggregation/BaseGoodsSpuRest.java index 5a49a44..1b9e296 100644 --- a/wms-biz/src/main/java/com/yxt/wms/apiadmin/aggregation/BaseGoodsSpuRest.java +++ b/wms-biz/src/main/java/com/yxt/wms/apiadmin/aggregation/BaseGoodsSpuRest.java @@ -56,6 +56,11 @@ public class BaseGoodsSpuRest { return baseGoodsSpuService.delete(sid); } + @ApiOperation("批量删除") + @DeleteMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids) { + return baseGoodsSpuService.delAll(sids); + } @ApiOperation("更改可用状态") @GetMapping("/updateIsEnable/{sid}/{isEnable}") public ResultBean updateIsEnable(@PathVariable("sid") String sid,@PathVariable("isEnable")String isEnable) { diff --git a/wms-biz/src/main/java/com/yxt/wms/apiadmin/aggregation/BaseGoodsUnitRest.java b/wms-biz/src/main/java/com/yxt/wms/apiadmin/aggregation/BaseGoodsUnitRest.java index f377c98..9bf260a 100644 --- a/wms-biz/src/main/java/com/yxt/wms/apiadmin/aggregation/BaseGoodsUnitRest.java +++ b/wms-biz/src/main/java/com/yxt/wms/apiadmin/aggregation/BaseGoodsUnitRest.java @@ -52,7 +52,11 @@ public class BaseGoodsUnitRest { public ResultBean delete(@PathVariable("sid") String sid) { return baseGoodsUnitService.delete(sid); } - + @ApiOperation("删除") + @DeleteMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids) { + return baseGoodsUnitService.delAll(sids); + } @ApiOperation("更改可用状态") @GetMapping("/updateIsEnable/{sid}/{isEnable}") diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsspu/BaseGoodsSpuService.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsspu/BaseGoodsSpuService.java index d97b99d..a5f7a46 100644 --- a/wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsspu/BaseGoodsSpuService.java +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsspu/BaseGoodsSpuService.java @@ -81,6 +81,9 @@ public class BaseGoodsSpuService extends MybatisBaseService> choiceSupplierInfo(String createOrgSid) { diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseextend/WarehouseExtend.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseextend/WarehouseExtend.java index a2e4160..b0aebbf 100644 --- a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseextend/WarehouseExtend.java +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseextend/WarehouseExtend.java @@ -11,10 +11,10 @@ import lombok.Data; public class WarehouseExtend extends BaseEntity { private String warehouseSid;//仓库sid - private String markupRate1;//加价率1 - private String markupRate2;//加价率2 - private String markupRate3;//加价率3 - private String markupRate4;//加价率4 - private String markupRate5;//加价率5 + private Integer markupRate1;//加价率1 + private Integer markupRate2;//加价率2 + private Integer markupRate3;//加价率3 + private Integer markupRate4;//加价率4 + private Integer markupRate5;//加价率5 } diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseextend/WarehouseExtendDto.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseextend/WarehouseExtendDto.java index 64ca0a6..230cf65 100644 --- a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseextend/WarehouseExtendDto.java +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseextend/WarehouseExtendDto.java @@ -19,9 +19,9 @@ public class WarehouseExtendDto implements Dto { private String remarks; private String isEnable; private String warehouseSid;//仓库sid - private String markupRate1;//加价率1 - private String markupRate2;//加价率2 - private String markupRate3;//加价率3 - private String markupRate4;//加价率4 - private String markupRate5;//加价率5 + private Integer markupRate1;//加价率1 + private Integer markupRate2;//加价率2 + private Integer markupRate3;//加价率3 + private Integer markupRate4;//加价率4 + private Integer markupRate5;//加价率5 } diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseextend/WarehouseExtendVo.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseextend/WarehouseExtendVo.java index 8d1a46c..14bdff5 100644 --- a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseextend/WarehouseExtendVo.java +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseextend/WarehouseExtendVo.java @@ -25,9 +25,9 @@ public class WarehouseExtendVo implements Vo { private String isDelete; private String warehouseSid;//仓库sid private String warehouseName;//仓库名称 - private String markupRate1;//加价率1 - private String markupRate2;//加价率2 - private String markupRate3;//加价率3 - private String markupRate4;//加价率4 - private String markupRate5;//加价率5 + private Integer markupRate1;//加价率1 + private Integer markupRate2;//加价率2 + private Integer markupRate3;//加价率3 + private Integer markupRate4;//加价率4 + private Integer markupRate5;//加价率5 } diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinfo/WarehouseInfo.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinfo/WarehouseInfo.java index 30d0153..459060f 100644 --- a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinfo/WarehouseInfo.java +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinfo/WarehouseInfo.java @@ -1,8 +1,11 @@ package com.yxt.wms.biz.func.warehouseinfo; +import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.common.core.domain.BaseEntity; import lombok.Data; +import java.util.Date; + /** * @author wangpengfei * @date 2024/2/26 13:36 @@ -22,9 +25,9 @@ public class WarehouseInfo extends BaseEntity { private String latitude;//纬度 private String warehouseTypeKey;//仓库类型Key private String warehouseTypeValue;//仓库类型value - private String usageStatus;//使用状态,0停用 1正常 + private Integer usageStatus;//使用状态,0停用 1正常 private String squareMeter;//平方米 - private String sortNo;//排序 + private Integer sortNo;//排序 private String useOrgSid;//创建组织sid private String createOrgSid;//创建组织sid } diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinfo/WarehouseInfoDto.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinfo/WarehouseInfoDto.java index fc4ff8d..fc1b0ee 100644 --- a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinfo/WarehouseInfoDto.java +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinfo/WarehouseInfoDto.java @@ -15,10 +15,15 @@ import java.util.Date; public class WarehouseInfoDto implements Dto { private String id; private String sid; + private String lockVersion; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date createTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date modifyTime; private String remarks; - private String isEnable; + private Integer isEnable; + private Integer state; + private Integer isDelete; private String warehouseName;//仓库名称 private String warehouseCode;//仓库编码 private String contacts;//联系人 @@ -31,9 +36,9 @@ public class WarehouseInfoDto implements Dto { private String latitude;//纬度 private String warehouseTypeKey;//仓库类型Key private String warehouseTypeValue;//仓库类型value - private String usageStatus;//使用状态,0停用 1正常 + private Integer usageStatus;//使用状态,0停用 1正常 private String squareMeter;//平方米 - private String sortNo;//创建组织sid + private Integer sortNo;//排序 private String useOrgSid;//创建组织sid private String createOrgSid;//创建组织sid // private List wmsWarehouseExtendDtos; diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinfo/WarehouseInfoVo.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinfo/WarehouseInfoVo.java index 4b639c1..1594001 100644 --- a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinfo/WarehouseInfoVo.java +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinfo/WarehouseInfoVo.java @@ -22,9 +22,9 @@ public class WarehouseInfoVo implements Vo { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date modifyTime; private String remarks; - private String isEnable; - private String state; - private String isDelete; + private Integer isEnable; + private Integer state; + private Integer isDelete; private String warehouseName;//仓库名称 private String warehouseCode;//仓库编码 private String contacts;//联系人 @@ -37,9 +37,9 @@ public class WarehouseInfoVo implements Vo { private String latitude;//纬度 private String warehouseTypeKey;//仓库类型Key private String warehouseTypeValue;//仓库类型value - private String usageStatus;//使用状态,0停用 1正常 + private Integer usageStatus;//使用状态,0停用 1正常 private String squareMeter;//平方米 - private String sortNo;//创建组织sid + private Integer sortNo;//排序 private String useOrgSid;//创建组织sid private String createOrgSid;//创建组织sid private List wmsWarehouseExtendVos; diff --git a/wms-biz/src/main/java/com/yxt/wms/config/Swagger2Configuration.java b/wms-biz/src/main/java/com/yxt/wms/config/Swagger2Configuration.java new file mode 100644 index 0000000..9c0e392 --- /dev/null +++ b/wms-biz/src/main/java/com/yxt/wms/config/Swagger2Configuration.java @@ -0,0 +1,43 @@ +package com.yxt.wms.config; + +import io.swagger.annotations.Api; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import springfox.documentation.builders.ApiInfoBuilder; +import springfox.documentation.builders.PathSelectors; +import springfox.documentation.builders.RequestHandlerSelectors; +import springfox.documentation.service.ApiInfo; +import springfox.documentation.spi.DocumentationType; +import springfox.documentation.spring.web.plugins.Docket; +import springfox.documentation.swagger2.annotations.EnableSwagger2; + +/** + * @author wangpengfei + * @date 2024/7/1 15:48 + */ + +@Configuration +@EnableSwagger2 +public class Swagger2Configuration { + @Bean + public Docket createRestApi(){ + return new Docket(DocumentationType.SWAGGER_2) + .apiInfo(apiInfo()) + .select() +// .apis(RequestHandlerSelectors.withClassAnnotation(Api.class)) + .apis(RequestHandlerSelectors.basePackage("com.yxt.wms.apiadmin.aggregation")) + .paths(PathSelectors.any()) + .build(); + } + + //基本信息的配置，信息会在api文档上显示 + private ApiInfo apiInfo(){ + return new ApiInfoBuilder() + .title("zg测试的接口文档") + .description("xx相关接口的文档") + .termsOfServiceUrl("http://localhost:8080/hello") + .version("1.0") + .build(); + } + +} diff --git a/wms-biz/src/main/java/com/yxt/wms/feign/base/basegoodsspu/BaseGoodsSpuFeign.java b/wms-biz/src/main/java/com/yxt/wms/feign/base/basegoodsspu/BaseGoodsSpuFeign.java index c78d3b2..c62de05 100644 --- a/wms-biz/src/main/java/com/yxt/wms/feign/base/basegoodsspu/BaseGoodsSpuFeign.java +++ b/wms-biz/src/main/java/com/yxt/wms/feign/base/basegoodsspu/BaseGoodsSpuFeign.java @@ -39,7 +39,9 @@ public interface BaseGoodsSpuFeign { @ApiOperation("初始化") @GetMapping("/initialization/{sid}") public ResultBean initialization(@PathVariable("sid") String sid); - + @ApiOperation("根据sid批量删除") + @DeleteMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids); @ApiOperation("更改可用状态") @GetMapping("/updateIsEnable/{sid}/{isEnable}") public ResultBean updateIsEnable(@PathVariable("sid") String sid,@PathVariable("isEnable")String isEnable); diff --git a/wms-biz/src/main/java/com/yxt/wms/feign/base/basegoodsspu/BaseGoodsSpuFeignFallback.java b/wms-biz/src/main/java/com/yxt/wms/feign/base/basegoodsspu/BaseGoodsSpuFeignFallback.java index f6f571f..6a19075 100644 --- a/wms-biz/src/main/java/com/yxt/wms/feign/base/basegoodsspu/BaseGoodsSpuFeignFallback.java +++ b/wms-biz/src/main/java/com/yxt/wms/feign/base/basegoodsspu/BaseGoodsSpuFeignFallback.java @@ -38,6 +38,11 @@ public class BaseGoodsSpuFeignFallback implements BaseGoodsSpuFeign { return null; } + @Override + public ResultBean delBySids(String[] sids) { + return null; + } + @Override public ResultBean updateIsEnable(String sid, String isEnable) { return null;