Merge branch 'master' of https://gitee.com/antai-wuliu/ANTAI-API

src/main/java/com/steerinfo/dil/controller/RMScontroller.java

@@ -9,12 +9,14 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.java.Log;
+import oracle.jdbc.proxy.annotation.Post;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.math.BigDecimal;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 @RestController
 @RequestMapping("${api.version}/rms")
@@ -700,4 +702,28 @@ public class RMScontroller extends BaseRESTfulController {
         return success(map,"测试成功！");
     }
 
+    @ApiOperation(value = "新增集装箱数据")
+    @PostMapping("insetShipContainer")
+    public Map<String,Object> insetShipContainer(@RequestBody(required = false) Map<String,Object> map) {
+
+                return rmsFeign.insetShipContainer(map);
+    }
+
+    @ApiOperation(value = "修改集装箱数据")
+    @PostMapping("updateShipContainer")
+    public Map<String,Object> updateShipContainer(@RequestBody List<Map<String,Object>> mapList) {
+        return rmsFeign.updateShipContainer(mapList);
+    }
+
+    @ApiOperation("查询集装箱数据")
+    @PostMapping("getShippingContainer")
+    public Map<String,Object> getShippingContainer(@RequestBody(required = false) Map<String,Object> map,
+                                                   @RequestParam(required = false) Integer apiId,
+                                                   @RequestParam(required = false) Integer pageNum,
+                                                   @RequestParam(required = false) Integer pageSize){
+        if(map==null){
+            map=new HashMap<>();
+        }
+        return rmsFeign.getShippingContainer(map,apiId,pageNum,pageSize);
+    }
 }

src/main/java/com/steerinfo/dil/feign/RmsFeign.java

@@ -10,6 +10,7 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.math.BigDecimal;
+import java.util.List;
 import java.util.Map;
 
 @FeignClient(value = "ANTAI-RMS-API", url = "${openfeign.RmsFeign.url}")
@@ -480,6 +481,27 @@ public interface RmsFeign {
                                         @RequestParam("pageNum") Integer pageNum,
                                         @RequestParam("pageSize") Integer pageSize);
 
-    @PostMapping(value = "api/v1/rms/rmstransrange/insertTransRange")
+
+    /**
+     * 集装箱的相关方法
+     * @param map
+     * @return
+     */
+    @PostMapping(value = "api/v1/rms/rmscapacitytype/insertTransRange")
     Map<String, Object> insertTransRange(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping(value = "api/v1/rms/rmsShipContainer/insetShipContainer")
+    Map<String, Object> insetShipContainer(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping(value = "api/v1/rms/rmsShipContainer/updateShipContainer")
+    Map<String, Object> updateShipContainer(@RequestBody(required = false)List<Map<String, Object>> mapList);
+
+    @PostMapping(value = "api/v1/rms/rmsShipContainer/getShippingContainer")
+    Map<String, Object> getShippingContainer(@RequestBody(required = false) Map<String, Object> map,
+                                             @RequestParam(value = "apiId") Integer apiId,
+                                             @RequestParam(value = "pageNum") Integer pageNum,
+                                             @RequestParam(value = "pageSize") Integer pageSize);
+
+
+
 }