微服务仓储系统

warehousing-system/project/wh-manage/pom.xml

@@ -93,18 +93,19 @@
     </dependencies>
     <!--添加build标签-->
     <build>
+        <!--打包成jar包时的名字-->
+        <finalName>wm-manager</finalName>
         <plugins>
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
-                <configuration>
+                <executions>
-                    <excludes>
+                    <execution>
-                        <exclude>
+                        <goals>
-                            <groupId>org.projectlombok</groupId>
+                            <goal>repackage</goal>
-                            <artifactId>lombok</artifactId>
+                        </goals>
-                        </exclude>
+                    </execution>
-                    </excludes>
+                </executions>
-                </configuration>
             </plugin>
         </plugins>
     </build>

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.WhEnterpriseInformationFeign;
-import com.wh.feign.enterpriseinformation.EnterpriseInformationQuery;
+import com.wh.feign.enterpriseinformation.WhEnterpriseInformationQuery;
-import com.wh.pojo.InStorehouse;
 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<InStorehouseMainQuery> pq){
-        PagerQuery<EnterpriseInformationQuery> pqq=new PagerQuery<>();
+        PagerQuery<WhEnterpriseInformationQuery> pqq=new PagerQuery<>();
         ResultBean enterpriseBySid = enterpriseInformationFeign.listPage(pqq);
         PagerVo<InStoreHouseMainVo> pv = inStorehouseMainService.listPage(pq);
         ResultBean<PagerVo<InStoreHouseMainVo>> r = ResultBean.fireSuccess();

warehousing-system/project/wh-manage/src/main/java/com/wh/feign/enterpriseinformation/EnterpriseInformation.java → 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 WhEnterpriseInformation extends BaseEntity {
-public class EnterpriseInformation extends BaseEntity {
     @ApiModelProperty("企业名称")
     private String enterpriseName;
     @ApiModelProperty("企业简称")

warehousing-system/project/wh-manage/src/main/java/com/wh/feign/enterpriseinformation/EnterpriseInformationDetailsVo.java → 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("企业名称")

warehousing-system/project/wh-manage/src/main/java/com/wh/feign/enterpriseinformation/EnterpriseInformationDto.java → 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("企业名称")

warehousing-system/project/wh-manage/src/main/java/com/wh/feign/enterpriseinformation/EnterpriseInformationFeign.java → 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<PagerVo<EnterpriseInformationVo>> listPage(@RequestBody PagerQuery<EnterpriseInformationQuery> pq) ;
+    public ResultBean<PagerVo<WhEnterpriseInformationVo>> listPage(@RequestBody PagerQuery<WhEnterpriseInformationQuery> pq) ;
     @ApiOperation("查询全部企业")
     @PostMapping("/list")
-    public ResultBean<List<EnterpriseInformationVo>> EnterpriseList() ;
+    public ResultBean<List<WhEnterpriseInformationVo>> 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) ;
 
 
 }

warehousing-system/project/wh-manage/src/main/java/com/wh/feign/enterpriseinformation/EnterpriseInformationQuery.java → 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("企业名称")

warehousing-system/project/wh-manage/src/main/java/com/wh/feign/enterpriseinformation/EnterpriseInformationVo.java → 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("企业名称")