Browse Source

仓库管理远程调用更新

Sakana 2 weeks ago
parent
commit
aedc8415de
18 changed files with 446 additions and 92 deletions
  1. 46 0
      edu-travel-adapter/edu-travel-adapter-country/src/main/java/edu/travel/adapter/service/country/CountryAdapter.java
  2. 0 60
      edu-travel-remote/edu-travel-remote-country/src/main/java/edu/travel/entity/ShopCurrency.java
  3. 0 7
      edu-travel-remote/edu-travel-remote-country/src/main/java/edu/travel/mapper/ShopCurrencyMapper.java
  4. 1 1
      edu-travel-remote/edu-travel-remote-country/src/main/java/edu/travel/remote/BaseCountryRemoteController.java
  5. 2 2
      edu-travel-remote/edu-travel-remote-country/src/main/java/edu/travel/remote/BaseCountryServeRemoteController.java
  6. 1 1
      edu-travel-remote/edu-travel-remote-country/src/main/java/edu/travel/remote/ShopCurrencyRemoteController.java
  7. 1 1
      edu-travel-remote/edu-travel-remote-country/src/main/java/edu/travel/remote/ShopLanguageRemoteController.java
  8. 0 3
      edu-travel-remote/edu-travel-remote-country/src/main/java/edu/travel/vo/BaseCountryServeVo.java
  9. 88 0
      edu-travel-remote/edu-travel-remote-warehouse/src/main/java/edu/travel/dto/ShopWarehouseDto.java
  10. 31 0
      edu-travel-remote/edu-travel-remote-warehouse/src/main/java/edu/travel/remote/ShopWarehouseRemoteController.java
  11. 98 0
      edu-travel-remote/edu-travel-remote-warehouse/src/main/java/edu/travel/vo/ShopWarehouseVo.java
  12. 3 0
      edu-travel-service/edu-travel-service-warehouse/src/main/java/edu/travel/WarehouseApplication.java
  13. 2 2
      edu-travel-service/edu-travel-service-warehouse/src/main/java/edu/travel/warehouse/entity/ShopWarehouse.java
  14. 7 1
      edu-travel-service/edu-travel-service-warehouse/src/main/java/edu/travel/warehouse/service/ShopWarehouseService.java
  15. 0 10
      edu-travel-service/edu-travel-service-warehouse/src/main/java/edu/travel/warehouse/service/impl/ShopWarehouseService.java
  16. 75 0
      edu-travel-service/edu-travel-service-warehouse/src/main/java/edu/travel/warehouse/service/impl/ShopWarehouseServiceImpl.java
  17. 1 1
      edu-travel-service/edu-travel-service-warehouse/src/main/java/edu/travel/warehouse/service/impl/ShopWarehouseStaffServiceImpl.java
  18. 90 3
      edu-travel-service/edu-travel-service-warehouse/src/main/java/edu/travel/warehouse/web/ShopWarehouseController.java

+ 46 - 0
edu-travel-adapter/edu-travel-adapter-country/src/main/java/edu/travel/adapter/service/country/CountryAdapter.java

@@ -0,0 +1,46 @@
+package edu.travel.adapter.service.country;
+
+import edu.travel.adapter.annotation.AdapterAnnotation;
+import edu.travel.dto.BaseCountryServeDto;
+import edu.travel.remote.BaseCountryServeRemoteController;
+import edu.travel.rpc.RPCBaseResponse;
+import edu.travel.vo.BaseCountryServeVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Component
+public class CountryAdapter  {
+    @Autowired
+    private BaseCountryServeRemoteController baseCountryServeRemoteController;
+    @AdapterAnnotation
+    public RPCBaseResponse<List<BaseCountryServeVo>> getCountryServeTree() {
+      return   baseCountryServeRemoteController.getCountryServeTree();
+    }
+
+    @AdapterAnnotation
+    public RPCBaseResponse<BaseCountryServeVo> getFormId(String id) {
+        return baseCountryServeRemoteController.getFormId(id);
+    }
+    @AdapterAnnotation
+
+    public RPCBaseResponse<BaseCountryServeVo> updateTargetFormId(BaseCountryServeDto entity) {
+        return baseCountryServeRemoteController.updateTargetFormId(entity);
+    }
+    @AdapterAnnotation
+
+    public RPCBaseResponse<BaseCountryServeVo> saveFormTarget(BaseCountryServeDto entity) {
+        return baseCountryServeRemoteController.saveFormTarget(entity);
+    }
+    @AdapterAnnotation
+
+    public RPCBaseResponse<BaseCountryServeVo> deleteTargetFormId(List<String> ids) {
+        return baseCountryServeRemoteController.deleteTargetFormId(ids);
+    }
+    @AdapterAnnotation
+
+    public RPCBaseResponse<List<BaseCountryServeVo>> getAllForm() {
+        return baseCountryServeRemoteController.getAllForm();
+    }
+}

+ 0 - 60
edu-travel-remote/edu-travel-remote-country/src/main/java/edu/travel/entity/ShopCurrency.java

@@ -1,60 +0,0 @@
-package edu.travel.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * 货币表
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@TableName(value = "shop_currency")
-public class ShopCurrency extends BaseEntity {
-    /**
-     * ID
-     */
-    @TableId(value = "id", type = IdType.ASSIGN_ID)
-    private Long id;
-
-    /**
-     * 货币名称_en
-     */
-    @TableField(value = "currency_name_en")
-    private String currencyNameEn;
-
-    /**
-     * 货币名称_zh
-     */
-    @TableField(value = "currency_name_zh")
-    private String currencyNameZh;
-
-    /**
-     * 货币代码
-     */
-    @TableField(value = "currency_code")
-    private String currencyCode;
-
-    /**
-     * 货币符号
-     * */
-    @TableField(value = "currency_symbol")
-    private String currencySymbol;
-    /**
-     * 货币单位
-     * */
-    @TableField(value = "currency_unit")
-    private String currencyUnit;
-
-    /**
-     * 状态 -0启用  -1禁用
-     * */
-    @TableField(value = "status")
-    private String status;
-
-}

+ 0 - 7
edu-travel-remote/edu-travel-remote-country/src/main/java/edu/travel/mapper/ShopCurrencyMapper.java

@@ -1,7 +0,0 @@
-package edu.travel.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import edu.travel.entity.ShopCurrency;
-
-public interface ShopCurrencyMapper extends BaseMapper<ShopCurrency> {
-}

+ 1 - 1
edu-travel-remote/edu-travel-remote-country/src/main/java/edu/travel/remote/BaseCountryRemoteController.java

@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
 
-@FeignClient(path = "/baseCountry",name = "commodity")
+@FeignClient(path = "/baseCountry",name = "commodity-dev")
 public interface BaseCountryRemoteController extends RemoteBaseController<BaseCountryVo, BaseCountryDto> {
 
     //国家树

+ 2 - 2
edu-travel-remote/edu-travel-remote-country/src/main/java/edu/travel/remote/BaseCountryServeRemoteController.java

@@ -7,10 +7,10 @@ import edu.travel.vo.BaseCountryServeVo;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
-
-@FeignClient(path = "/baseCountryServe",name = "commodity")
+@FeignClient(path = "/baseCountryServe",name = "commodity-dev")
 public interface BaseCountryServeRemoteController extends RemoteBaseController<BaseCountryServeVo, BaseCountryServeDto> {
     //服务国家树
     @GetMapping("/getCountryServeTree")

+ 1 - 1
edu-travel-remote/edu-travel-remote-country/src/main/java/edu/travel/remote/ShopCurrencyRemoteController.java

@@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 
 import java.util.List;
 
-@FeignClient(path = "/shopCurrency",name = "commodity")
+@FeignClient(path = "/shopCurrency",name = "commodity-dev")
 public interface ShopCurrencyRemoteController extends RemoteBaseController<ShopCurrencyVo, ShopCurrencyDto> {
     @GetMapping("/getCurrencyPage")
     public RPCBaseResponse<IPage<ShopCurrencyVo>> getCurrencyPage(ShopCurrencyDto dto);

+ 1 - 1
edu-travel-remote/edu-travel-remote-country/src/main/java/edu/travel/remote/ShopLanguageRemoteController.java

@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
 
-@FeignClient(path = "/shopLanguage",name = "commodity")
+@FeignClient(path = "/shopLanguage",name = "commodity-dev")
 public interface ShopLanguageRemoteController extends RemoteBaseController<ShopLanguageVo, ShopLanguageDto> {
 
     //语言分页

+ 0 - 3
edu-travel-remote/edu-travel-remote-country/src/main/java/edu/travel/vo/BaseCountryServeVo.java

@@ -1,9 +1,7 @@
 package edu.travel.vo;
 
 import com.baomidou.mybatisplus.annotation.TableField;
-import edu.travel.annotation.LinkOne;
 import edu.travel.entity.BaseEntity;
-import edu.travel.mapper.ShopCurrencyMapper;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -83,7 +81,6 @@ public class BaseCountryServeVo extends BaseEntity {
      *map
      */
     @TableField(exist = false)
-    @LinkOne(linkField = "currencyId", linkMapper = ShopCurrencyMapper.class, linkPrimaryField = "id")
     private Map<String, Object> map;
     /**
      * 子类

+ 88 - 0
edu-travel-remote/edu-travel-remote-warehouse/src/main/java/edu/travel/dto/ShopWarehouseDto.java

@@ -0,0 +1,88 @@
+package edu.travel.dto;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import edu.travel.po.PagePO;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+/**
+ * 库房表
+ */
+@Data
+public class ShopWarehouseDto extends PagePO {
+    /**
+     * 库房表ID
+     */
+    private Long id;
+
+    /**
+     * 0是总仓
+     */
+    private Long parentId;
+
+    /**
+     * 库房名称
+     */
+    private String warehouseName;
+
+    /**
+     * 经度
+     */
+    private String longitude;
+
+    /**
+     * 维度
+     */
+    private String latitude;
+
+    /**
+     * 国家ID
+     */
+    private String countryId;
+
+    /**
+     * 库房详细地址
+     */
+    private String detailedAddress;
+
+    /**
+     * '启用禁用 0 启用 1禁用'
+     */
+    private Integer status;
+
+    /**
+     * 系统标识
+     */
+    private String project;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 创建人
+     */
+    private String createUserId;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    /**
+     * 更新人id
+     */
+    private String updateUserId;
+
+    /**
+     * 删除标记 0正常 1删除
+     */
+    private Integer deleteFlag;
+}

+ 31 - 0
edu-travel-remote/edu-travel-remote-warehouse/src/main/java/edu/travel/remote/ShopWarehouseRemoteController.java

@@ -0,0 +1,31 @@
+package edu.travel.remote;
+
+import edu.travel.dto.ShopWarehouseDto;
+import edu.travel.remote.base.RemoteBaseController;
+import edu.travel.rpc.RPCBaseResponse;
+import edu.travel.vo.ShopWarehouseVo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
+
+@FeignClient(path = "/shopWarehouse", name = "warehouse")
+public interface ShopWarehouseRemoteController extends RemoteBaseController<ShopWarehouseVo, ShopWarehouseDto> {
+    //查询库房详情
+    @GetMapping("/getWarehouseFormId")
+    RPCBaseResponse<ShopWarehouseVo> getFormId(String id);
+    //更新库房信息
+    @PostMapping("/updateWarehouseFormId")
+    RPCBaseResponse<ShopWarehouseVo> updateTargetFormId(@RequestBody ShopWarehouseDto entity);
+    //新增库房信息
+    @PostMapping("/saveWarehouseForm")
+    RPCBaseResponse<ShopWarehouseVo> saveFormTarget(@RequestBody ShopWarehouseDto entity);
+   // 删除库房信息
+    @PostMapping("/deleteWarehouseFormId")
+    RPCBaseResponse<ShopWarehouseVo> deleteTargetFormId(@RequestBody List<String> ids);
+    //查询库房列表
+    @GetMapping("/getWarehouseForm")
+    RPCBaseResponse<List<ShopWarehouseVo>> getAllForm();
+}

+ 98 - 0
edu-travel-remote/edu-travel-remote-warehouse/src/main/java/edu/travel/vo/ShopWarehouseVo.java

@@ -0,0 +1,98 @@
+package edu.travel.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import edu.travel.entity.BaseEntity;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 库房表
+ */
+@Data
+public class ShopWarehouseVo extends BaseEntity {
+    /**
+     * 库房表ID
+     */
+    private Long id;
+
+    /**
+     * 0是总仓
+     */
+    private Long parentId;
+
+    /**
+     * 库房名称
+     */
+    private String warehouseName;
+
+    /**
+     * 经度
+     */
+    private String longitude;
+
+    /**
+     * 维度
+     */
+    private String latitude;
+
+    /**
+     * 国家ID
+     */
+    private String countryServeId;
+
+    /**
+     * 库房详细地址
+     */
+    private String detailedAddress;
+
+    /**
+     * '启用禁用 0 启用 1禁用'
+     */
+    private Integer status;
+
+    /**
+     * 系统标识
+     */
+    private String project;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 创建人
+     */
+    private String createUserId;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    /**
+     * 更新人id
+     */
+    private String updateUserId;
+
+    /**
+     * 删除标记 0正常 1删除
+     */
+    private Integer deleteFlag;
+    /**
+     * map
+     */
+    private Map<String, Object> map;
+    /**
+     * 子集
+     */
+    private List<ShopWarehouseVo> children;
+}

+ 3 - 0
edu-travel-service/edu-travel-service-warehouse/src/main/java/edu/travel/WarehouseApplication.java

@@ -5,11 +5,14 @@ import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.cloud.openfeign.FeignClient;
 
 @SpringBootApplication
 @EnableDiscoveryClient
 @MapperScan("edu.travel.warehouse.mapper")
 @EnableRedisCache
+@EnableFeignClients//确保扫描到FeignClient注解
 public class WarehouseApplication {
     public static void main(String[] args) {
         SpringApplication.run(WarehouseApplication.class, args);

+ 2 - 2
edu-travel-service/edu-travel-service-warehouse/src/main/java/edu/travel/warehouse/entity/ShopWarehouse.java

@@ -50,8 +50,8 @@ public class ShopWarehouse {
     /**
      * 国家ID
      */
-    @TableField(value = "country_id")
-    private String countryId;
+    @TableField(value = "country_serve_id")
+    private String countryServeId;
 
     /**
      * 库房详细地址

+ 7 - 1
edu-travel-service/edu-travel-service-warehouse/src/main/java/edu/travel/warehouse/service/ShopWarehouseService.java

@@ -1,8 +1,14 @@
 package edu.travel.warehouse.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import edu.travel.dto.ShopWarehouseDto;
+import edu.travel.rpc.RPCBaseResponse;
+import edu.travel.vo.ShopWarehouseVo;
 import edu.travel.warehouse.entity.ShopWarehouse;
 
-public interface ShopWarehouseService extends IService<ShopWarehouse> {
+import java.util.List;
 
+public interface ShopWarehouseService extends IService<ShopWarehouse> {
+//分页
+    RPCBaseResponse<List<ShopWarehouseVo>> getWarehouseCountryPageForm(ShopWarehouseDto dto);
 }

+ 0 - 10
edu-travel-service/edu-travel-service-warehouse/src/main/java/edu/travel/warehouse/service/impl/ShopWarehouseService.java

@@ -1,10 +0,0 @@
-package edu.travel.warehouse.service.impl;
-
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import edu.travel.warehouse.mapper.ShopWarehouseMapper;
-import edu.travel.warehouse.entity.ShopWarehouse;
-@Service
-public class ShopWarehouseService extends ServiceImpl<ShopWarehouseMapper, ShopWarehouse> {
-
-}

+ 75 - 0
edu-travel-service/edu-travel-service-warehouse/src/main/java/edu/travel/warehouse/service/impl/ShopWarehouseServiceImpl.java

@@ -0,0 +1,75 @@
+package edu.travel.warehouse.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import edu.travel.adapter.service.country.CountryAdapter;
+import edu.travel.dto.ShopWarehouseDto;
+import edu.travel.rpc.RPCBaseResponse;
+import edu.travel.service.SysServiceImpl;
+import edu.travel.vo.BaseCountryServeVo;
+import edu.travel.vo.ShopWarehouseVo;
+import edu.travel.warehouse.entity.ShopWarehouse;
+import edu.travel.warehouse.mapper.ShopWarehouseMapper;
+import edu.travel.warehouse.service.ShopWarehouseService;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+@Service
+public class ShopWarehouseServiceImpl extends SysServiceImpl<ShopWarehouseMapper, ShopWarehouse> implements ShopWarehouseService {
+    @Autowired
+    private CountryAdapter countryAdapter;
+    /**
+     * 获取仓库国家分页数据
+     * @param dto
+     * @return
+     */
+    @Override
+    public RPCBaseResponse<List<ShopWarehouseVo>> getWarehouseCountryPageForm(ShopWarehouseDto dto) {
+        // 查询所有库房数据
+        LambdaQueryWrapper<ShopWarehouse> queryWrapper = new LambdaQueryWrapper<>();
+        // 查询所有库房数据
+        List<ShopWarehouse> shopWarehouseList = super.getListLink(queryWrapper);
+
+        // 提取国家服务ID
+        Set<String> countryServeIds = shopWarehouseList.stream()
+                .map(ShopWarehouse::getCountryServeId)
+                .collect(Collectors.toSet());
+
+        // 创建一个 Map 以便通过 countryServeId 查询到对应的国家数据
+        Map<String, BaseCountryServeVo> baseCountryServeVoMap = new HashMap<>();
+        if (!countryServeIds.isEmpty()) {
+            // 使用 getFormId 方法查询国家信息
+            for (String countryServeId : countryServeIds) {
+                RPCBaseResponse<BaseCountryServeVo> response = countryAdapter.getFormId(countryServeId);
+                if (response != null && response.getData() != null) {
+                    baseCountryServeVoMap.put(countryServeId, response.getData());
+                }
+            }
+        }
+
+        // 链接库房信息与国家信息
+        List<ShopWarehouseVo> shopWarehouseVoList = shopWarehouseList.stream()
+                .map(shopWarehouse -> {
+                    ShopWarehouseVo shopWarehouseVo = new ShopWarehouseVo();
+                    shopWarehouseVo.setId(shopWarehouse.getId());
+                    shopWarehouseVo.setCountryServeId(shopWarehouse.getCountryServeId());
+                    shopWarehouseVo.setMap(new HashMap<>()); // 创建一个新 Map
+                    // 将国家信息放入 Map 中
+                    if (baseCountryServeVoMap.containsKey(shopWarehouse.getCountryServeId())) {
+                        shopWarehouseVo.getMap().put("country", baseCountryServeVoMap.get(shopWarehouse.getCountryServeId()));
+                    }
+                    return shopWarehouseVo;
+                })
+                .collect(Collectors.toList());
+
+        // 返回所有库房与国家信息
+        return new RPCBaseResponse<>(200, "SUCCESS", shopWarehouseVoList);
+    }
+
+}

+ 1 - 1
edu-travel-service/edu-travel-service-warehouse/src/main/java/edu/travel/warehouse/service/impl/ShopWarehouseStaffService.java → edu-travel-service/edu-travel-service-warehouse/src/main/java/edu/travel/warehouse/service/impl/ShopWarehouseStaffServiceImpl.java

@@ -5,6 +5,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import edu.travel.warehouse.mapper.ShopWarehouseStaffMapper;
 import edu.travel.warehouse.entity.ShopWarehouseStaff;
 @Service
-public class ShopWarehouseStaffService extends ServiceImpl<ShopWarehouseStaffMapper, ShopWarehouseStaff> {
+public class ShopWarehouseStaffServiceImpl extends ServiceImpl<ShopWarehouseStaffMapper, ShopWarehouseStaff> {
 
 }

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

@@ -1,13 +1,100 @@
 package edu.travel.warehouse.web;
 
+import edu.travel.dto.ShopWarehouseDto;
+import edu.travel.remote.ShopWarehouseRemoteController;
+import edu.travel.rpc.RPCBaseResponse;
+import edu.travel.vo.ShopWarehouseVo;
 import edu.travel.warehouse.entity.ShopWarehouse;
+import edu.travel.warehouse.service.ShopWarehouseService;
 import edu.travel.web.BaseController;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
+/**
+ * 库房表
+ */
 
 @RestController
 @RequestMapping("/shopWarehouse")
-public class ShopWarehouseController extends BaseController<ShopWarehouse> {
+public class ShopWarehouseController extends BaseController<ShopWarehouse> implements ShopWarehouseRemoteController {
+    /**
+     * 库房表控制层
+     */
+    @Autowired
+    private ShopWarehouseService shopWarehouseService;
+
+    /**
+     * 分页查询(连表)
+     */
+    @GetMapping("/getWarehouseCountryPageForm")
+    public RPCBaseResponse<List<ShopWarehouseVo>> getWarehouseCountryPageForm(ShopWarehouseDto dto) {
+        return shopWarehouseService.getWarehouseCountryPageForm(dto);
+    }
+
+    /**
+     * 查询库房详情
+     */
+    @Override
+    @GetMapping("/getWarehouseFormId")
+    public RPCBaseResponse<ShopWarehouseVo> getFormId(String id) {
+        RPCBaseResponse<ShopWarehouse> shopWarehouseRPCBaseResponse = super.getId(id);
+        RPCBaseResponse<ShopWarehouseVo> shopWarehouseVoRPCBaseResponse = new RPCBaseResponse<>();
+        BeanUtils.copyProperties(shopWarehouseRPCBaseResponse, shopWarehouseVoRPCBaseResponse);
+        return shopWarehouseVoRPCBaseResponse;
+    }
+
+    /**
+     * 更新库房信息
+     */
+    @Override
+    @PostMapping("/updateWarehouseFormId")
+    public RPCBaseResponse<ShopWarehouseVo> updateTargetFormId(@RequestBody ShopWarehouseDto entity) {
+        ShopWarehouse shopWarehouse = new ShopWarehouse();
+        BeanUtils.copyProperties(entity, shopWarehouse);
+        RPCBaseResponse<ShopWarehouse> shopWarehouseRPCBaseResponse = super.updateTargetById(shopWarehouse);
+        RPCBaseResponse<ShopWarehouseVo> shopWarehouseVoRPCBaseResponse = new RPCBaseResponse<>();
+        BeanUtils.copyProperties(shopWarehouseRPCBaseResponse, shopWarehouseVoRPCBaseResponse);
+        return shopWarehouseVoRPCBaseResponse;
+    }
+
+    /**
+     * 新增库房信息
+     */
+    @Override
+    @PostMapping("/saveWarehouseForm")
+    public RPCBaseResponse<ShopWarehouseVo> saveFormTarget(@RequestBody ShopWarehouseDto entity) {
+        ShopWarehouse shopWarehouse = new ShopWarehouse();
+        BeanUtils.copyProperties(entity, shopWarehouse);
+        RPCBaseResponse<ShopWarehouse> shopWarehouseRPCBaseResponse = super.saveTarget(shopWarehouse);
+        RPCBaseResponse<ShopWarehouseVo> shopWarehouseVoRPCBaseResponse = new RPCBaseResponse<>();
+        BeanUtils.copyProperties(shopWarehouseRPCBaseResponse, shopWarehouseVoRPCBaseResponse);
+        return shopWarehouseVoRPCBaseResponse;
+    }
+
+    /**
+     * 删除库房信息
+     */
+    @Override
+    @PostMapping("/deleteWarehouseFormId")
+    public RPCBaseResponse<ShopWarehouseVo> deleteTargetFormId(@RequestBody List<String> ids) {
+        RPCBaseResponse<ShopWarehouse> shopWarehouseRPCBaseResponse = super.deleteTargetById(ids);
+        RPCBaseResponse<ShopWarehouseVo> shopWarehouseVoRPCBaseResponse = new RPCBaseResponse<>();
+        BeanUtils.copyProperties(shopWarehouseRPCBaseResponse, shopWarehouseVoRPCBaseResponse);
+        return shopWarehouseVoRPCBaseResponse;
+    }
 
+    /**
+     * 查询所有库房信息
+     */
+    @Override
+    @GetMapping("/getWarehouseForm")
+    public RPCBaseResponse<List<ShopWarehouseVo>> getAllForm() {
+        RPCBaseResponse<List<ShopWarehouse>> shopWarehouseRPCBaseResponse = super.listAll();
+        RPCBaseResponse<List<ShopWarehouseVo>> shopWarehouseVoRPCBaseResponse = new RPCBaseResponse<>();
+        BeanUtils.copyProperties(shopWarehouseRPCBaseResponse, shopWarehouseVoRPCBaseResponse);
+        return shopWarehouseVoRPCBaseResponse;
+    }
 }