框计算

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

@@ -46,11 +46,12 @@ public class TMSController extends BaseRESTfulController {
     public Map<String, Object> getBargeOperationList(@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.getBargeOperationList(mapValue, pageNum, pageSize, apiId);
+        return tmsshipFeign.getBargeOperationList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
     }
 
     @PostMapping("selectBargeOperation/{bargeOperationId}")
@@ -109,11 +110,12 @@ public class TMSController extends BaseRESTfulController {
     public Map<String, Object> getLoadShipList(@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.getLoadShipList(mapValue, pageNum, pageSize, apiId);
+        return tmsshipFeign.getLoadShipList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
     }
 
     @PostMapping("getLoadShip/{resultId}")
@@ -160,11 +162,12 @@ public class TMSController extends BaseRESTfulController {
     public Map<String, Object> getShipLocationList(@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.getShipLocationList(mapValue, pageNum, pageSize, apiId);
+        return tmsshipFeign.getShipLocationList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
     }
 
     @PostMapping("getShipLocation/{locationId}")
@@ -211,11 +214,12 @@ public class TMSController extends BaseRESTfulController {
     public Map<String, Object> listAllOrders(@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.listAllOrders(mapValue, pageNum, pageSize, apiId);
+        return tmsshipFeign.listAllOrders(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
     }
 
     /**
@@ -253,11 +257,12 @@ public class TMSController extends BaseRESTfulController {
     public Map<String, Object> getUnLoadShipList(@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.getUnLoadShipList(mapValue, pageNum, pageSize, apiId);
+        return tmsshipFeign.getUnLoadShipList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
     }
 
     @PostMapping("getUnloadShip/{resultId}")
@@ -304,11 +309,12 @@ public class TMSController extends BaseRESTfulController {
     public Map<String, Object> getWaterQualityResultList(@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.getWaterQualityResultList(mapValue, pageNum, pageSize, apiId);
+        return tmsshipFeign.getWaterQualityResultList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
     }
 
     @PostMapping("getWaterQuality/{resultId}")
@@ -401,11 +407,12 @@ public class TMSController extends BaseRESTfulController {
     public Map<String, Object> getShipMentInstructionsList(@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.getShipMentInstructionsList(mapValue, pageNum, pageSize, apiId);
+        return tmsshipFeign.getShipMentInstructionsList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
     }
 
     @PostMapping("getShipmentInstructions/{instructionsId}")
@@ -452,11 +459,12 @@ public class TMSController extends BaseRESTfulController {
     public Map<String, Object> getAmsshipCargoTranferResultList(@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.getAmsshipCargoTranferResultList(mapValue, pageNum, pageSize, apiId);
+        return tmsshipFeign.getAmsshipCargoTranferResultList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
     }
 
     @PostMapping("insertamsshipCargoTransferResult")
@@ -497,11 +505,12 @@ public class TMSController extends BaseRESTfulController {
     public Map<String, Object> getAmsshipDeliveryAttroneyList(@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.getAmsshipDeliveryAttroneyList(mapValue, pageNum, pageSize, apiId);
+        return tmsshipFeign.getAmsshipDeliveryAttroneyList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
     }
 
     @PostMapping("insertshipDeliveryAttorney")
@@ -548,11 +557,12 @@ public class TMSController extends BaseRESTfulController {
     public Map<String, Object> getshipDeliveryNoticeList(@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.getshipDeliveryNoticeList(mapValue, pageNum, pageSize, apiId);
+        return tmsshipFeign.getshipDeliveryNoticeList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
     }
 
     @PostMapping("insertDeliveryNotice")

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

@@ -28,7 +28,8 @@ public interface TmsshipFeign {
     Map<String, Object> getBargeOperationList(@RequestBody(required = false) Map<String, Object> mapValue,
                                         @RequestParam Integer pageNum,
                                         @RequestParam Integer pageSize,
-                                        @RequestParam Integer apiId);
+                                        @RequestParam Integer apiId,
+                                              @RequestParam String con);
 
     /**
      * 查询驳船作业信息
@@ -106,7 +107,8 @@ public interface TmsshipFeign {
     Map<String, Object> getLoadShipList(@RequestBody(required = false) Map<String, Object> mapValue,
                                   @RequestParam Integer pageNum,
                                   @RequestParam Integer pageSize,
-                                  @RequestParam Integer apiId);
+                                  @RequestParam Integer apiId,
+                                        @RequestParam String con);
 
     /**
      * 查询装船作业表单
@@ -166,7 +168,8 @@ public interface TmsshipFeign {
     Map<String, Object> getShipLocationList(@RequestBody(required = false) Map<String, Object> mapValue,
                                       @RequestParam Integer pageNum,
                                       @RequestParam Integer pageSize,
-                                      @RequestParam Integer apiId);
+                                      @RequestParam Integer apiId,
+                                            @RequestParam String con);
 
     /**
      * 查询位置作业信息
@@ -226,7 +229,8 @@ public interface TmsshipFeign {
     Map<String, Object> listAllOrders(@RequestBody(required = false) Map<String, Object> mapValue,
                                 @RequestParam Integer pageNum,
                                 @RequestParam Integer pageSize,
-                                @RequestParam Integer apiId);
+                                @RequestParam Integer apiId,
+                                      @RequestParam String con);
 
     /**
      * 展示船只信息
@@ -256,7 +260,8 @@ public interface TmsshipFeign {
     Map<String, Object> getUnLoadShipList(@RequestBody(required = false) Map<String, Object> mapValue,
                                     @RequestParam Integer pageNum,
                                     @RequestParam Integer pageSize,
-                                    @RequestParam Integer apiId);
+                                    @RequestParam Integer apiId,
+                                          @RequestParam String con);
 
     /**
      * 查询卸船作业信息
@@ -316,7 +321,8 @@ public interface TmsshipFeign {
     Map<String, Object> getWaterQualityResultList(@RequestBody(required = false) Map<String, Object> mapValue,
                                             @RequestParam Integer pageNum,
                                             @RequestParam Integer pageSize,
-                                            @RequestParam Integer apiId);
+                                            @RequestParam Integer apiId,
+                                                  @RequestParam String con);
 
     /**
      * 查询水分质检信息
@@ -428,7 +434,8 @@ public interface TmsshipFeign {
     Map<String, Object> getShipMentInstructionsList(@RequestBody(required = false) Map<String, Object> mapValue,
                                               @RequestParam Integer pageNum,
                                               @RequestParam Integer pageSize,
-                                              @RequestParam Integer apiId);
+                                              @RequestParam Integer apiId,
+                                                    @RequestParam String con);
 
     /**
      * 查询装船指令
@@ -537,7 +544,8 @@ public interface TmsshipFeign {
     Map<String, Object> getAmsshipCargoTranferResultList(@RequestBody(required = false) Map<String, Object> mapValue,
                                                    @RequestParam Integer pageNum,
                                                    @RequestParam Integer pageSize,
-                                                   @RequestParam Integer apiId);
+                                                   @RequestParam Integer apiId,
+                                                         @RequestParam String con);
 
     /**
      * 新增货权转移
@@ -588,7 +596,8 @@ public interface TmsshipFeign {
     Map<String, Object> getAmsshipDeliveryAttroneyList(@RequestBody(required = false) Map<String, Object> mapValue,
                                                  @RequestParam Integer pageNum,
                                                  @RequestParam Integer pageSize,
-                                                 @RequestParam Integer apiId);
+                                                 @RequestParam Integer apiId,
+                                                 @RequestParam String con);
 
     /**
      * 新增提货委托
@@ -648,7 +657,8 @@ public interface TmsshipFeign {
     Map<String, Object> getshipDeliveryNoticeList(@RequestBody(required = false) Map<String, Object> mapValue,
                                             @RequestParam Integer pageNum,
                                             @RequestParam Integer pageSize,
-                                            @RequestParam Integer apiId);
+                                            @RequestParam Integer apiId,
+                                            @RequestParam String con);
 
     /**
      * 新增放货通知