diff --git a/warehousing-system/project/wh-manage/pom.xml b/warehousing-system/project/wh-manage/pom.xml index 4feea1e8..67ce7573 100644 --- a/warehousing-system/project/wh-manage/pom.xml +++ b/warehousing-system/project/wh-manage/pom.xml @@ -93,18 +93,19 @@ + + wm-manager org.springframework.boot spring-boot-maven-plugin - - - - org.projectlombok - lombok - - - + + + + repackage + + + diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/controller/api/input/InStoreHouseMainController.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/controller/api/input/InStoreHouseMainController.java index 8601697f..cf8c6cf3 100644 --- a/warehousing-system/project/wh-manage/src/main/java/com/wh/controller/api/input/InStoreHouseMainController.java +++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/controller/api/input/InStoreHouseMainController.java @@ -1,11 +1,9 @@ package com.wh.controller.api.input; -import com.wh.feign.enterpriseinformation.EnterpriseInformationFeign; -import com.wh.feign.enterpriseinformation.EnterpriseInformationQuery; -import com.wh.pojo.InStorehouse; +import com.wh.feign.enterpriseinformation.WhEnterpriseInformationFeign; +import com.wh.feign.enterpriseinformation.WhEnterpriseInformationQuery; import com.wh.pojo.api.*; -import com.wh.pojo.purchasenew.Purchasenew; import com.wh.service.api.instorehouse.InStorehouseMainService; import com.wh.service.purchasenew.PurchasenewService; import com.wh.service.purchasenewproduct.PurchasenewProductService; @@ -17,8 +15,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; -import java.util.HashMap; -import java.util.List; import java.util.Map; @RestController @@ -33,7 +29,7 @@ public class InStoreHouseMainController { @Autowired private PurchasenewProductService purchasenewProductService; @Resource - private EnterpriseInformationFeign enterpriseInformationFeign; + private WhEnterpriseInformationFeign enterpriseInformationFeign; @PostMapping("addInStorehouse") public ResultBean addInStorehouse(@RequestBody InStoreHouseMainDto inStoreHouseMainDto){ @@ -46,7 +42,7 @@ public class InStoreHouseMainController { } @PostMapping("listPage") public ResultBean listPage(@RequestBody PagerQuery pq){ - PagerQuery pqq=new PagerQuery<>(); + PagerQuery pqq=new PagerQuery<>(); ResultBean enterpriseBySid = enterpriseInformationFeign.listPage(pqq); PagerVo pv = inStorehouseMainService.listPage(pq); ResultBean> r = ResultBean.fireSuccess(); diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/feign/enterpriseinformation/EnterpriseInformation.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/feign/enterpriseinformation/WhEnterpriseInformation.java similarity index 89% rename from warehousing-system/project/wh-manage/src/main/java/com/wh/feign/enterpriseinformation/EnterpriseInformation.java rename to warehousing-system/project/wh-manage/src/main/java/com/wh/feign/enterpriseinformation/WhEnterpriseInformation.java index a51fc4d3..205dbeef 100644 --- a/warehousing-system/project/wh-manage/src/main/java/com/wh/feign/enterpriseinformation/EnterpriseInformation.java +++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/feign/enterpriseinformation/WhEnterpriseInformation.java @@ -1,6 +1,5 @@ package com.wh.feign.enterpriseinformation; -import com.baomidou.mybatisplus.annotation.TableName; import com.yxt.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -12,8 +11,7 @@ import lombok.Data; */ @Data @ApiModel(value = "企业信息", description = "企业信息") -@TableName("enterprise_information") -public class EnterpriseInformation extends BaseEntity { +public class WhEnterpriseInformation extends BaseEntity { @ApiModelProperty("企业名称") private String enterpriseName; @ApiModelProperty("企业简称") diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/feign/enterpriseinformation/EnterpriseInformationDetailsVo.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/feign/enterpriseinformation/WhEnterpriseInformationDetailsVo.java similarity index 95% rename from warehousing-system/project/wh-manage/src/main/java/com/wh/feign/enterpriseinformation/EnterpriseInformationDetailsVo.java rename to warehousing-system/project/wh-manage/src/main/java/com/wh/feign/enterpriseinformation/WhEnterpriseInformationDetailsVo.java index 4e13a38e..8dcbb737 100644 --- a/warehousing-system/project/wh-manage/src/main/java/com/wh/feign/enterpriseinformation/EnterpriseInformationDetailsVo.java +++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/feign/enterpriseinformation/WhEnterpriseInformationDetailsVo.java @@ -11,7 +11,7 @@ import lombok.Data; */ @Data @ApiModel(value = "企业信息 视图数据详情", description = "企业信息 视图数据详情") -public class EnterpriseInformationDetailsVo implements Vo { +public class WhEnterpriseInformationDetailsVo implements Vo { private String id; private String sid; @ApiModelProperty("企业名称") diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/feign/enterpriseinformation/EnterpriseInformationDto.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/feign/enterpriseinformation/WhEnterpriseInformationDto.java similarity index 95% rename from warehousing-system/project/wh-manage/src/main/java/com/wh/feign/enterpriseinformation/EnterpriseInformationDto.java rename to warehousing-system/project/wh-manage/src/main/java/com/wh/feign/enterpriseinformation/WhEnterpriseInformationDto.java index bc772b14..ae7295b7 100644 --- a/warehousing-system/project/wh-manage/src/main/java/com/wh/feign/enterpriseinformation/EnterpriseInformationDto.java +++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/feign/enterpriseinformation/WhEnterpriseInformationDto.java @@ -11,7 +11,7 @@ import lombok.Data; */ @ApiModel(value = "企业信息 数据传输对象", description = "企业信息 数据传输对象") @Data -public class EnterpriseInformationDto implements Dto { +public class WhEnterpriseInformationDto implements Dto { private String id; private String sid; @ApiModelProperty("企业名称") diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/feign/enterpriseinformation/EnterpriseInformationFeign.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/feign/enterpriseinformation/WhEnterpriseInformationFeign.java similarity index 67% rename from warehousing-system/project/wh-manage/src/main/java/com/wh/feign/enterpriseinformation/EnterpriseInformationFeign.java rename to warehousing-system/project/wh-manage/src/main/java/com/wh/feign/enterpriseinformation/WhEnterpriseInformationFeign.java index 4ebf557a..99b7ed93 100644 --- a/warehousing-system/project/wh-manage/src/main/java/com/wh/feign/enterpriseinformation/EnterpriseInformationFeign.java +++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/feign/enterpriseinformation/WhEnterpriseInformationFeign.java @@ -16,21 +16,21 @@ import java.util.List; */ @Api(tags = "企业信息") @FeignClient( path = "v1/enterpriseinformation", value = "supervise-crm") -public interface EnterpriseInformationFeign { +public interface WhEnterpriseInformationFeign { //@Override @ApiOperation("根据条件分页查询数据的列表") @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq) ; + public ResultBean> listPage(@RequestBody PagerQuery pq) ; @ApiOperation("查询全部企业") @PostMapping("/list") - public ResultBean> EnterpriseList() ; + public ResultBean> EnterpriseList() ; @ApiOperation("保存") @PostMapping("/save") - public ResultBean save(@RequestBody EnterpriseInformationDto dto); + public ResultBean save(@RequestBody WhEnterpriseInformationDto dto); @ApiOperation("修改") @PostMapping("/update") - public ResultBean update(@RequestBody EnterpriseInformationDto dto) ; + public ResultBean update(@RequestBody WhEnterpriseInformationDto dto) ; } diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/feign/enterpriseinformation/EnterpriseInformationQuery.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/feign/enterpriseinformation/WhEnterpriseInformationQuery.java similarity index 95% rename from warehousing-system/project/wh-manage/src/main/java/com/wh/feign/enterpriseinformation/EnterpriseInformationQuery.java rename to warehousing-system/project/wh-manage/src/main/java/com/wh/feign/enterpriseinformation/WhEnterpriseInformationQuery.java index c9230385..c2b3ce44 100644 --- a/warehousing-system/project/wh-manage/src/main/java/com/wh/feign/enterpriseinformation/EnterpriseInformationQuery.java +++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/feign/enterpriseinformation/WhEnterpriseInformationQuery.java @@ -11,7 +11,7 @@ import lombok.Data; */ @ApiModel(value = "企业信息 查询条件", description = "企业信息 查询条件") @Data -public class EnterpriseInformationQuery implements Query { +public class WhEnterpriseInformationQuery implements Query { private String id; private String sid; @ApiModelProperty("企业名称") diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/feign/enterpriseinformation/EnterpriseInformationVo.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/feign/enterpriseinformation/WhEnterpriseInformationVo.java similarity index 95% rename from warehousing-system/project/wh-manage/src/main/java/com/wh/feign/enterpriseinformation/EnterpriseInformationVo.java rename to warehousing-system/project/wh-manage/src/main/java/com/wh/feign/enterpriseinformation/WhEnterpriseInformationVo.java index cb805b0b..4ae25c1e 100644 --- a/warehousing-system/project/wh-manage/src/main/java/com/wh/feign/enterpriseinformation/EnterpriseInformationVo.java +++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/feign/enterpriseinformation/WhEnterpriseInformationVo.java @@ -11,7 +11,7 @@ import lombok.Data; */ @ApiModel(value = "企业信息 视图数据对象", description = "企业信息 视图数据对象") @Data -public class EnterpriseInformationVo implements Vo { +public class WhEnterpriseInformationVo implements Vo { private String id; private String sid; @ApiModelProperty("企业名称")