”修改“

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

@@ -224,6 +224,28 @@ public class TMSController extends BaseRESTfulController {
         return tmsshipFeign.listAllOrders(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
     }
 
+
+    @PostMapping("/getBatchList")
+    public Map<String, Object> getBatchList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                            Integer pageNum,
+                                            Integer pageSize,
+                                            Integer apiId,
+                                            String con){
+        return  tmsshipFeign.getBatchList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId, con);
+    }
+
+
+  //框计算计算货权转移中出现的批次
+  @PostMapping("/getBatchListForAttorney")
+  public Map<String, Object> getBatchListForAttorney(@RequestBody(required = false) Map<String, Object> mapValue,
+                                          Integer pageNum,
+                                          Integer pageSize,
+                                          Integer apiId,
+                                          String con){
+      return  tmsshipFeign.getBatchListForAttorney(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId, con);
+  }
+
+
     /**
      * 展示船只信息
      *
@@ -238,11 +260,12 @@ public class TMSController extends BaseRESTfulController {
     public Map<String, Object> getCapacityList(@RequestBody(required = false) Map<String, Object> mapValue,
                                                Integer pageNum,
                                                Integer pageSize,
-                                               Integer apiId) {
+                                               Integer apiId,
+                                               String con) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return tmsshipFeign.getCapacityList(mapValue, pageNum, pageSize, apiId);
+        return tmsshipFeign.getCapacityList(mapValue, pageNum, pageSize, apiId,con);
     }
 
     /**
@@ -261,9 +284,7 @@ public class TMSController extends BaseRESTfulController {
                                                  Integer pageSize,
                                                  Integer apiId,
                                                  String con) {
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
+
         return tmsshipFeign.getUnLoadShipList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
     }
 
@@ -478,9 +499,7 @@ public class TMSController extends BaseRESTfulController {
                                                                 Integer pageSize,
                                                                 Integer apiId,
                                                                 String con) {
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
+
         return tmsshipFeign.getGroupList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
     }
     @PostMapping("getMaterialList")

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

@@ -243,9 +243,10 @@ public interface TmsshipFeign {
      */
     @PostMapping(value = "/api/v1/shipTms/tmsshiptotalresults/getCapacityList")
     Map<String, Object> getCapacityList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                  @RequestParam Integer pageNum,
-                                  @RequestParam Integer pageSize,
-                                  @RequestParam Integer apiId);
+                                        @RequestParam Integer pageNum,
+                                        @RequestParam Integer pageSize,
+                                        @RequestParam Integer apiId,
+                                        @RequestParam String con);
 
     /**
      * 展示卸船作业信息列表
@@ -258,9 +259,9 @@ public interface TmsshipFeign {
      */
     @PostMapping(value = "/api/v1/shipTms/tmsshipunloadshipresults/getUnLoadShipList")
     Map<String, Object> getUnLoadShipList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                    @RequestParam Integer pageNum,
-                                    @RequestParam Integer pageSize,
-                                    @RequestParam Integer apiId,
+                                          @RequestParam Integer pageNum,
+                                          @RequestParam Integer pageSize,
+                                          @RequestParam Integer apiId,
                                           @RequestParam String con);
 
     /**
@@ -531,6 +532,23 @@ public interface TmsshipFeign {
     @GetMapping(value = "/api/v1/shipTms/omsshipshipmentinstructions/getBatchId")
     Map<String, Object> getBatchId();
 
+
+    @PostMapping(value = "/api/v1/shipTms/dilbatchs/getBatchList")
+    Map<String, Object> getBatchList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                     @RequestParam Integer pageNum,
+                                     @RequestParam Integer pageSize,
+                                     @RequestParam Integer apiId,
+                                     @RequestParam String con);
+
+
+
+    @PostMapping(value = "/api/v1/shipTms/dilbatchs/getBatchListForAttorney")
+    Map<String, Object> getBatchListForAttorney(@RequestBody(required = false) Map<String, Object> mapValue,
+                                     @RequestParam Integer pageNum,
+                                     @RequestParam Integer pageSize,
+                                     @RequestParam Integer apiId,
+                                     @RequestParam String con);
+
     //获取船运物资id
     @GetMapping("/api/v1/shipTms/amsshipcargotransferresults/getMaterialId")
     Map<String,Object> getMaterialId();

src/main/resources/bootstrap.yml

@@ -27,7 +27,7 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.33.161:8083}
   AmsFeign:
-    url: ${AMSFEIGN_URL:192.168.1.104:8079}
+    url: ${AMSFEIGN_URL:172.16.33.161:8079}
   BmsshipFeign:
     url: ${BMSSHIPFEIGN_URL:localhost:8078}
   BmstrainFeign: