edu-travel-adapter/edu-travel-adapter-warehouse/pom.xml

@@ -0,0 +1,49 @@
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>edu.travel</groupId>
+        <artifactId>edu-travel-adapter</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>edu-travel-adapter-warehouse</artifactId>
+    <packaging>jar</packaging>
+
+    <name>edu-travel-adapter-warehouse</name>
+    <url>http://maven.apache.org</url>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-aop</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>edu.travel</groupId>
+            <artifactId>edu-travel-remote-warehouse</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>edu.travel</groupId>
+            <artifactId>edu-travel-common-adapter</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>io.zipkin.zipkin2</groupId>
+            <artifactId>zipkin</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-core</artifactId>
+        </dependency>
+    </dependencies>
+</project>

edu-travel-adapter/edu-travel-adapter-warehouse/src/main/java/edu/travel/adapter/service/warehouse/WarehouseAdapter.java

@@ -0,0 +1,82 @@
+package edu.travel.adapter.service.warehouse;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import edu.travel.adapter.annotation.AdapterAnnotation;
+import edu.travel.dto.ShopWarehouseDto;
+import edu.travel.dto.ShopWarehouseSaveDto;
+import edu.travel.remote.ShopWarehouseRemoteController;
+import edu.travel.rpc.RPCBaseResponse;
+import edu.travel.vo.ShopWarehouseStaffVo;
+import edu.travel.vo.ShopWarehouseVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
+
+@Component
+public class WarehouseAdapter {
+    @Autowired
+    private ShopWarehouseRemoteController shopWarehouseRemoteController;
+
+    //树形结构查询（连表）
+    @AdapterAnnotation
+    public RPCBaseResponse<List<ShopWarehouseVo>> getWarehouseCountryForm(ShopWarehouseDto dto) {
+        return shopWarehouseRemoteController.getWarehouseCountryForm(dto);
+    }
+
+    //分页动态查询(连表)
+    @AdapterAnnotation
+    public RPCBaseResponse<IPage<ShopWarehouseVo>> getWarehouseCountryPage(ShopWarehouseDto dto) {
+        return shopWarehouseRemoteController.getWarehouseCountryPage(dto);
+    }
+
+    //库房关联人员(角色）查询
+    @AdapterAnnotation
+    public RPCBaseResponse<List<ShopWarehouseStaffVo>> getWarehouseTenantRole(String id) {
+        return shopWarehouseRemoteController.getWarehouseTenantRole(id);
+    }
+
+    //库房连表新增
+    @AdapterAnnotation
+    public RPCBaseResponse<ShopWarehouseVo> saveAllForm(@RequestBody ShopWarehouseSaveDto entity) {
+        return shopWarehouseRemoteController.saveAllForm(entity);
+    }
+
+    //库房连表修改
+    @AdapterAnnotation
+    public RPCBaseResponse<ShopWarehouseVo> updateWarehouse(@RequestBody ShopWarehouseSaveDto entity) {
+        return shopWarehouseRemoteController.updateWarehouse(entity);
+    }
+
+    //查询库房详情
+    @AdapterAnnotation
+    public RPCBaseResponse<ShopWarehouseVo> getFormId(String id) {
+        return shopWarehouseRemoteController.getFormId(id);
+    }
+
+    //更新库房信息
+    @AdapterAnnotation
+    public RPCBaseResponse<ShopWarehouseVo> updateTargetFormId(@RequestBody ShopWarehouseDto entity) {
+        return shopWarehouseRemoteController.updateTargetFormId(entity);
+    }
+
+    //新增库房信息
+    @AdapterAnnotation
+    public RPCBaseResponse<ShopWarehouseVo> saveFormTarget(@RequestBody ShopWarehouseDto entity) {
+        return shopWarehouseRemoteController.saveFormTarget(entity);
+    }
+
+    //删除库房信息
+    @AdapterAnnotation
+    public RPCBaseResponse<ShopWarehouseVo> deleteTargetFormId(@RequestBody List<String> ids) {
+        return shopWarehouseRemoteController.deleteTargetFormId(ids);
+    }
+
+    //查询所有库房信息
+    @AdapterAnnotation
+    public RPCBaseResponse<List<ShopWarehouseVo>> getAllForm() {
+        return shopWarehouseRemoteController.getAllForm();
+    }
+
+}

edu-travel-adapter/pom.xml

@@ -18,7 +18,7 @@
         <module>edu-travel-adapter-country</module>
         <module>edu-travel-adapter-order</module>
         <module>edu-travel-adapter-commodity</module>
-        <module>edu-travel-adapter-currency</module>
+        <module>edu-travel-adapter-warehouse</module>
     </modules>
 
     <properties>

edu-travel-remote/edu-travel-remote-warehouse/src/main/java/edu/travel/remote/ShopWarehouseRemoteController.java

@@ -1,8 +1,11 @@
 package edu.travel.remote;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import edu.travel.dto.ShopWarehouseDto;
+import edu.travel.dto.ShopWarehouseSaveDto;
 import edu.travel.remote.base.RemoteBaseController;
 import edu.travel.rpc.RPCBaseResponse;
+import edu.travel.vo.ShopWarehouseStaffVo;
 import edu.travel.vo.ShopWarehouseVo;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -11,7 +14,16 @@ import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
 
-@FeignClient(path = "/shopWarehouse", name = "warehouse")
+@FeignClient(path = "/shopWarehouse", name = "warehouse-dev")
 public interface ShopWarehouseRemoteController extends RemoteBaseController<ShopWarehouseVo, ShopWarehouseDto> {
-
+    @GetMapping("/getWarehouseCountryForm")
+    public RPCBaseResponse<List<ShopWarehouseVo>> getWarehouseCountryForm(ShopWarehouseDto dto);
+    @GetMapping("/getWarehouseCountryPage")
+    public RPCBaseResponse<IPage<ShopWarehouseVo>> getWarehouseCountryPage(ShopWarehouseDto dto);
+    @GetMapping("/getWarehouseTenantRole")
+    public RPCBaseResponse<List<ShopWarehouseStaffVo>> getWarehouseTenantRole(String id);
+    @PostMapping("/saveAllForm")
+    public RPCBaseResponse<ShopWarehouseVo> saveAllForm(@RequestBody ShopWarehouseSaveDto entity);
+    @PostMapping("/updateWarehouse")
+    public RPCBaseResponse<ShopWarehouseVo> updateWarehouse(@RequestBody ShopWarehouseSaveDto entity);
 }

edu-travel-service/edu-travel-service-warehouse/src/main/java/edu/travel/warehouse/web/ShopWarehouseController.java

@@ -72,7 +72,7 @@ public class ShopWarehouseController extends BaseController<ShopWarehouse> imple
      * 查询库房详情
      */
     @Override
-    @GetMapping("/getWarehouseFormId")
+    @GetMapping("/getFormId")
     public RPCBaseResponse<ShopWarehouseVo> getFormId(String id) {
         RPCBaseResponse<ShopWarehouse> shopWarehouseRPCBaseResponse = super.getId(id);
         RPCBaseResponse<ShopWarehouseVo> shopWarehouseVoRPCBaseResponse = new RPCBaseResponse<>();
@@ -84,7 +84,7 @@ public class ShopWarehouseController extends BaseController<ShopWarehouse> imple
      * 更新库房信息
      */
     @Override
-    @PostMapping("/updateWarehouseFormId")
+    @PostMapping("/updateTargetFormId")
     public RPCBaseResponse<ShopWarehouseVo> updateTargetFormId(@RequestBody ShopWarehouseDto entity) {
         ShopWarehouse shopWarehouse = new ShopWarehouse();
         BeanUtils.copyProperties(entity, shopWarehouse);
@@ -98,7 +98,7 @@ public class ShopWarehouseController extends BaseController<ShopWarehouse> imple
      * 新增库房信息
      */
     @Override
-    @PostMapping("/saveWarehouseForm")
+    @PostMapping("/saveFormTarget")
     public RPCBaseResponse<ShopWarehouseVo> saveFormTarget(@RequestBody ShopWarehouseDto entity) {
         ShopWarehouse shopWarehouse = new ShopWarehouse();
         BeanUtils.copyProperties(entity, shopWarehouse);
@@ -112,7 +112,7 @@ public class ShopWarehouseController extends BaseController<ShopWarehouse> imple
      * 删除库房信息
      */
     @Override
-    @PostMapping("/deleteWarehouseFormId")
+    @PostMapping("/deleteTargetFormId")
     public RPCBaseResponse<ShopWarehouseVo> deleteTargetFormId(@RequestBody List<String> ids) {
         RPCBaseResponse<ShopWarehouse> shopWarehouseRPCBaseResponse = super.deleteTargetById(ids);
         RPCBaseResponse<ShopWarehouseVo> shopWarehouseVoRPCBaseResponse = new RPCBaseResponse<>();
@@ -124,7 +124,7 @@ public class ShopWarehouseController extends BaseController<ShopWarehouse> imple
      * 查询所有库房信息
      */
     @Override
-    @GetMapping("/getWarehouseForm")
+    @GetMapping("/getAllForm")
     public RPCBaseResponse<List<ShopWarehouseVo>> getAllForm() {
         RPCBaseResponse<List<ShopWarehouse>> shopWarehouseRPCBaseResponse = super.listAll();
         RPCBaseResponse<List<ShopWarehouseVo>> shopWarehouseVoRPCBaseResponse = new RPCBaseResponse<>();