12.22rms

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

@@ -810,6 +810,49 @@ public class RMScontroller {
         return rmsFeign.getOilPriceById(id);
     }
 
+    //港口
+    @ApiOperation(value = "获取港口", notes = "分页查询")
+    @PostMapping(value = "/getPort")
+    public Map<String, Object> getPortList(@RequestBody(required = false) Map<String, Object> mapVal,
+                                           Integer apiId,
+                                           Integer pageNum,
+                                           Integer pageSize,
+                                           String con
+    ) {
+        if (mapVal == null) {
+            mapVal = new HashMap<>();
+        }
+        return rmsFeign.getPortList(mapVal == null ? new HashMap<>() : mapVal, apiId, pageNum, pageSize, con);
+    }
+
+    //码头
+    @ApiOperation(value = "获取码头", notes = "分页查询")
+    @PostMapping(value = "/getPier")
+    public Map<String, Object> getPierList(@RequestBody(required = false) Map<String, Object> mapVal,
+                                           Integer apiId,
+                                           Integer pageNum,
+                                           Integer pageSize,
+                                           String con
+    ) {
+        if (mapVal == null) {
+            mapVal = new HashMap<>();
+        }
+        return rmsFeign.getPierList(mapVal == null ? new HashMap<>() : mapVal, apiId, pageNum, pageSize, con);
+    }
+
+    @ApiOperation(value = "获取港存堆场", notes = "分页查询")
+    @PostMapping(value = "/getYardList")
+    public Map<String, Object> getPortYardList(@RequestBody(required = false) Map<String, Object> mapVal,
+                                               Integer apiId,
+                                               Integer pageNum,
+                                               Integer pageSize,
+                                               String con
+    ) {
+        if (mapVal == null) {
+            mapVal = new HashMap<>();
+        }
+        return rmsFeign.getPortYardList(mapVal == null ? new HashMap<>() : mapVal, apiId, pageNum, pageSize, con);
+    }
 
 //*******************************下拉框************************
 
@@ -819,16 +862,23 @@ public class RMScontroller {
         return rmsFeign.getNoticeTypeId();
     }
 
+
+    @GetMapping("getPortType")
+    @ApiOperation(value = "得到港口类型Id")
+    public Map<String,Object> getPortType(){
+        return rmsFeign.getPortType();
+    }
+
     @ApiOperation(value="新增原料仓库信息", notes="根据rmsWarehouse对象创建")
     @ApiImplicitParam(name = "rmsWarehouse", value = "详细实体rmsWarehouse", required = true, dataType = "rmsWarehouse")
-
     @PostMapping(value = "/insertWarehouse")
     public Map<String, Object> insertWarehouse(@RequestBody(required = false) Map<String, Object> map) {
         return rmsFeign.insertWarehouse(map);
     }
 
+
     //展示收货客户信息
-    @ApiOperation(value = "获取公告信息", notes = "分页查询")
+    @ApiOperation(value = "获取收货客户信息", notes = "分页查询")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
             @ApiImplicitParam(name = "apiId()", value = "动态表头", required = false, dataType = "Integer"),
@@ -836,8 +886,6 @@ public class RMScontroller {
             @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
     })
-
-
     @PostMapping(value = "/getConsigneeList")
     public Map<String, Object> getConsigneeList(@RequestBody(required = false) Map<String, Object> mapValue,
                                                      Integer apiId,
@@ -862,4 +910,38 @@ public class RMScontroller {
 
     }
 
+
+    //港口
+    @PostMapping("/insertPort")
+    public Map<String, Object> insertPort(@RequestBody(required = false) Map<String, Object> map) {
+        return rmsFeign.insertPort(map);
+    }
+
+    //
+    @PostMapping("/insertPier")
+    public Map<String, Object> insertPier(@RequestBody(required = false) Map<String, Object> map) {
+        return rmsFeign.insertPier(map);
+    }
+
+    //港口
+    @PostMapping("/insertPortYard")
+    public Map<String, Object> insertPortYard(@RequestBody(required = false) Map<String, Object> map) {
+        return rmsFeign.insertPortYard(map);
+    }
+
+    @PostMapping(value = "/deletePort/{portId}")//BigDecimal
+    public Map<String, Object> deletePort(@PathVariable("portId") BigDecimal portId) {
+        return rmsFeign.deletePort(portId);
+    }
+
+    @PostMapping(value = "/deletePier/{pierId}")//BigDecimal
+    public Map<String, Object> deletePier(@PathVariable("pierId") BigDecimal pierId) {
+        return rmsFeign.deletePier(pierId);
+    }
+
+    @PostMapping(value = "/deletePortYard/{warehouseId}")//BigDecimal
+    public Map<String, Object> deletePortYard(@PathVariable("warehouseId") BigDecimal warehouseId) {
+        return rmsFeign.deletePortYard(warehouseId);
+    }
+
 }

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

@@ -461,7 +461,56 @@ public interface RmsFeign {
                                             @RequestParam("pageSize") Integer pageSize,
                                             @RequestParam("con") String con);
 
+
   //边输入边搜索承运商
     @PostMapping(value = "/api/v1/rms/rmscardriver/getCarrierName")
     Map<String, Object> getCarrierName(@RequestParam(value = "state")String state);
+
+    //港口
+    @PostMapping(value = "api/v1/rms/rmsPort/insertPort")
+    Map<String,Object> insertPort(@RequestBody(required = false) Map<String,Object> map);
+
+    //删除港口
+    @PostMapping(value = "api/v1/rms/rmsPort//deletePort/{portId}")
+    Map<String, Object> deletePort(@PathVariable("portId") BigDecimal portId);
+
+    //删除码头
+    @PostMapping(value = "api/v1/rms/rmsPier//deletePier/{pierId}")
+    Map<String, Object> deletePier(@PathVariable("pierId") BigDecimal pierId);
+
+    @PostMapping(value = "/api/v1/rms/rmsPort/getPort")
+    Map<String, Object> getPortList(@RequestBody(required = false) Map<String , Object> mapVal,
+                                    @RequestParam Integer apiId,
+                                    @RequestParam Integer pageNum,
+                                    @RequestParam Integer pageSize,
+                                    @RequestParam String con);
+
+    @PostMapping(value = "/api/v1/rms/rmsPier/getPier")
+    Map<String, Object> getPierList(@RequestBody(required = false) Map<String, Object> mapVal,
+                                    @RequestParam Integer apiId,
+                                    @RequestParam Integer pageNum,
+                                    @RequestParam Integer pageSize,
+                                    @RequestParam String con);
+
+    @PostMapping(value = "/api/v1/rms/rmsPortYard/getPortYard")
+    Map<String, Object> getPortYardList(@RequestBody(required = false) Map<String, Object> mapVal,
+                                        @RequestParam Integer apiId,
+                                        @RequestParam Integer pageNum,
+                                        @RequestParam Integer pageSize,
+                                        @RequestParam String con);
+
+    @GetMapping(value = "api/v1/rms/rmsPort/getPortType")
+    Map<String, Object> getPortType();
+
+
+    @PostMapping(value = "api/v1/rms/rmsPier/insertPier")
+    Map<String, Object> insertPier(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping(value = "api/v1/rms/rmsPortYard/insertPortYard")
+    Map<String, Object> insertPortYard(@RequestBody(required = false) Map<String, Object> map);
+
+    //删除港存堆场
+    @PostMapping(value = "api/v1/rms/rmsPortYard/deletePortYard/{warehouseId}")
+    Map<String, Object> deletePortYard(@PathVariable("warehouseId") BigDecimal warehouseId);
+
 }