'框计算火运'

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

@@ -29,7 +29,8 @@ public interface TmsTrainFeign {
                                               @RequestParam("apiId") Integer apiId,
                                               @RequestParam("pageNum") Integer pageNum,
                                               @RequestParam("pageSize") Integer pageSize,
-                                              @RequestParam("resultType") Integer resultType);
+                                              @RequestParam("resultType") Integer resultType,
+                                                    @RequestParam("con") String con);
 
 
     @PostMapping(value = "api/v1/trainTms/tmstrainloadingresults/insertTmstrainLoadingResult")
@@ -74,7 +75,8 @@ public interface TmsTrainFeign {
                                                 @RequestParam("apiId") Integer apiId,
                                                 @RequestParam("pageNum") Integer pageNum,
                                                 @RequestParam("pageSize") Integer pageSize,
-                                                @RequestParam("resultType") Integer resultType);
+                                                @RequestParam("resultType") Integer resultType,
+                                                      @RequestParam("con") String con);
 
 
     @PostMapping(value = "api/v1/trainTms/tmstrainwagonunloadresults/deleteTmstrainWagonUnLoadResultByUnLoadingId")
@@ -93,7 +95,8 @@ public interface TmsTrainFeign {
     public Map<String, Object> getTmstrainresult(@RequestBody(required=false) Map<String,Object> mapValue,
                                            @RequestParam("apiId") Integer apiId,
                                            @RequestParam("pageNum") Integer pageNum,
-                                           @RequestParam("pageSize") Integer pageSize);
+                                           @RequestParam("pageSize") Integer pageSize,
+                                                 @RequestParam("con") String con);
 
 
     @PostMapping(value = "api/v1/trainTms/tmstrainwagonunloadresults/getTmstrainWagonUnLoadResultByUnLoadingId/{unloadingId}")
@@ -118,7 +121,8 @@ public interface TmsTrainFeign {
                                            @RequestParam("pageNum") Integer pageNum,
                                            @RequestParam("pageSize") Integer pageSize,
                                            @RequestParam("status") Integer status,
-                                                 @RequestParam("resultType") Integer resultType
+                                                 @RequestParam("resultType") Integer resultType,
+                                                 @RequestParam("con") String con
                                                  );
 
     @PostMapping ("api/v1/trainTms/tmstrainpleaseapproveresults/getWagonPleaseById/{resultId}")
@@ -152,7 +156,8 @@ public interface TmsTrainFeign {
                                                   @RequestParam("apiId") Integer apiId,
                                                   @RequestParam("pageNum") Integer pageNum,
                                                   @RequestParam("pageSize") Integer pageSize,
-                                                        @RequestParam("resultType") Integer resultType
+                                                        @RequestParam("resultType") Integer resultType,
+                                                        @RequestParam("con") String con
     );
 
     @PostMapping ("api/v1/trainTms/tmstrainpleaseapproveresults/getApproveWagonPleaseById/{resultId}")
@@ -176,8 +181,8 @@ public interface TmsTrainFeign {
     Map<String,Object> getTmstrainWagonLoadForConverted(@RequestBody(required=false)
                                                         @RequestParam("apiId") Integer apiId,
                                                         @RequestParam("pageNum") Integer pageNum,
-                                                        @RequestParam("pageSize") Integer pageSize
-                                                        );
+                                                        @RequestParam("pageSize") Integer pageSize,
+                                                        @RequestParam("con") String con);
     @PostMapping ("api/v1/trainTms/tmstrainpleaseapproveresults/getPleasePlanByResultId/{resultId}")
     Map<String,Object> getPleasePlanByResultId(@PathVariable("resultId")BigDecimal resultId);
     @PostMapping ("api/v1/trainTms/tmstrainpleaseapproveresults/getApproveByResultId/{resultId}")
@@ -187,11 +192,13 @@ public interface TmsTrainFeign {
     Map<String,Object>  selectWagonUnLoadResultForConverted(
                                                             @RequestParam("apiId") Integer apiId,
                                                             @RequestParam("pageNum") Integer pageNum,
-                                                            @RequestParam("pageSize") Integer pageSize);
+                                                            @RequestParam("pageSize") Integer pageSize,
+                                                            @RequestParam("con") String con);
     @PostMapping("api/v1/trainTms/tmstrainwagonunloadresults/selectTrainUnLoadResultForConverted")
     Map<String,Object>  selectTrainUnLoadResultForConverted(@RequestParam("apiId") Integer apiId,
                                                             @RequestParam("pageNum") Integer pageNum,
-                                                            @RequestParam("pageSize") Integer pageSize);
+                                                            @RequestParam("pageSize") Integer pageSize,
+                                                            @RequestParam("con") String con);
     @PostMapping ("api/v1/trainTms/tmstrainpleaseapproveresults/addWagonApprove")
     Map<String,Object> addWagonApprove(@RequestBody(required = false) Map<String, Object> tmstrainPleaseApproveResult);
 }

src/main/resources/bootstrap.yml

@@ -25,7 +25,7 @@ eureka:
 
 openfeign:
   ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:localhost:8083}
+    url: ${COLUMNDATAFEIGN_URL:192.168.1.102:8083}
   AmsFeign:
     url: ${AMSFEIGN_URL:localhost:8099}
   BmsshipFeign: