修改

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

@@ -1957,8 +1957,20 @@ public class TMSController extends BaseRESTfulController {
     public Map<String, Object> getLoadResultToSendMC( @RequestBody(required = false) Map<String, Object> mapValue,
             Integer apiId,
             Integer pageNum,
-            Integer pageSize,Integer resultType,String con) {
-        return tmsTrainFeign.getLoadResultToSendMC(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, resultType,con);
+            Integer pageSize, String startTime, String endTime,Integer resultType,String con) {
+        return tmsTrainFeign.getLoadResultToSendMC(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, resultType,startTime,endTime,con);
+    }
+
+    @ApiOperation(value = "查询计量数据")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId(209)", value = "表头", required = false, dataType = "Interger")
+    })
+    @PostMapping(value = "/getWeightResult")
+    public Map<String, Object> getWeightResult( @RequestBody(required = false) Map<String, Object> mapValue,
+                                                      Integer apiId,
+                                                      Integer pageNum,
+                                                      Integer pageSize,String startTime, String endTime,Integer resultType,String con) {
+        return tmsTrainFeign.getLoadResultToSendMC(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, resultType,startTime,endTime,con);
     }
 
     @ApiOperation(value = "批量新增计量委托")

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

@@ -252,9 +252,22 @@ public interface TmsTrainFeign {
                                                @RequestParam("pageNum") Integer pageNum,
                                                @RequestParam("pageSize") Integer pageSize,
                                                @RequestParam("resultType") Integer resultType,
+                                               @RequestParam("startTime") String startTime,
+                                               @RequestParam("endTime") String endTime,
                                                @RequestParam("con") String con
                                                );
 
+    @PostMapping(value = "api/v1/trainTms/tmstrainmeasurecommissions/getWeightResult")
+    Map<String, Object> getWeightResult( @RequestBody(required = false) Map<String, Object> mapValue,
+                                               @RequestParam("apiId") Integer apiId,
+                                               @RequestParam("pageNum") Integer pageNum,
+                                               @RequestParam("pageSize") Integer pageSize,
+                                               @RequestParam("resultType") Integer resultType,
+                                               @RequestParam("startTime") String startTime,
+                                               @RequestParam("endTime") String endTime,
+                                               @RequestParam("con") String con
+    );
+
     @ApiOperation(value = "批量新增计量委托")
     @PostMapping(value = "api/v1/trainTms/tmstrainmeasurecommissions/batchSendMeasureCommission")
     Map<String, Object> batchSendMeasureCommission(@RequestBody(required = false) Map<String, Object> map);

src/main/resources/application-prod.yml

@@ -9,7 +9,7 @@ spring:
 
 openfeign:
   ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
+    url: ${COLUMNDATAFEIGN_URL:172.16.33.161:8083}
   AmsFeign:
     url: ${AMSFEIGN_URL:172.16.33.166:8079}
   BmsshipFeign:
@@ -21,7 +21,7 @@ openfeign:
   QmsTruckFeign:
     url: ${QMSTRUCKFEIGN_URL:172.16.33.166:8047}
   TmsTrainFeign:
-    url: ${TMSTRAINFEIGN_URL:172.16.33.166:8086}
+    url: ${TMSTRAINFEIGN_URL:localhost:8086}
   TmsTruckFeign:
     url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8088}
   TmsshipFeign: