Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/DAL-DAZHOU-API

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

@@ -214,4 +214,13 @@ public class OTMSController {
         return otmsFeign.getCurrentLocation(capcityNumber);
     }
 
+    //在途订单列表
+    @PostMapping("/transportationPerformance")
+    public RESTfulResult transportationPerformance(@RequestBody(required = false) Map<String,Object> mapValue,
+                                                   @RequestParam(required = true,defaultValue = "479",name = "apiId")Integer apiId,
+                                                   @RequestParam(required = false,name = "pageNum")Integer pageNum,
+                                                   @RequestParam(required = false,name = "pageSize")Integer pageSize){
+        return otmsFeign.transportationPerformance(mapValue!=null?mapValue:new HashMap<>(),apiId,pageNum,pageSize);
+    }
+
 }

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

@@ -1,6 +1,7 @@
 package com.steerinfo.dil.controller;
 
 
+import com.steerinfo.dil.feign.OtmsFeign;
 import com.steerinfo.dil.feign.TmsTruckFeign;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -14,26 +15,27 @@ import java.util.Map;
 @RequestMapping("apis")
 public class ZhongJiaoXingLuContoller {
 
-    private TmsTruckFeign tmsTruckFeign;
+    @Autowired
+    private OtmsFeign otmsFeign;
 
     //偏离预警回调示例
     @PostMapping("/abnormalLineWarn")
     public String abnormalLineWarn(@RequestParam(value = "data") String data) throws Exception {
-        tmsTruckFeign.abnormalLineWarn(data);
+        otmsFeign.abnormalLineWarn(data);
 
         return "success";
     }
     //停车预警回调示例
     @PostMapping("/parkWarn")
     public String parkWarn(@RequestParam(value = "data") String data) throws Exception {
-        tmsTruckFeign.parkWarn(data);
+        otmsFeign.parkWarn(data);
         return "success";
     }
     //离线预警回调示例
     @PostMapping("/offLineWarn")
     public String offLineWarn(@RequestParam(value = "data") String data) throws Exception {
 
-        tmsTruckFeign.offLineWarn(data);
+        otmsFeign.offLineWarn(data);
         return "success";
     }
 

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

@@ -17,6 +17,13 @@ public interface OtmsFeign {
                                                     @RequestParam(required = true,defaultValue = "468",name = "apiId")Integer apiId,
                                                     @RequestParam(required = false,name = "pageNum")Integer pageNum,
                                                     @RequestParam(required = false,name = "pageSize")Integer pageSize);
+
+    //在途订单列表
+    @PostMapping("/api/v1/otms/pathDisplay/transportationPerformance")
+    public RESTfulResult transportationPerformance(@RequestBody Map<String,Object> mapValue,
+                                                    @RequestParam(required = true,defaultValue = "468",name = "apiId")Integer apiId,
+                                                    @RequestParam(required = false,name = "pageNum")Integer pageNum,
+                                                    @RequestParam(required = false,name = "pageSize")Integer pageSize);
     //已完成订单列表
     @PostMapping("/api/v1/otms/pathDisplay/getFinishTruckOrderInfo")
     public RESTfulResult getFinishTruckOrderInfo(@RequestBody Map<String,Object> mapValue,
@@ -107,4 +114,11 @@ public interface OtmsFeign {
     );
     @GetMapping("/api/v1/otms/pathDisplay/getCurrentLocation")
     public RESTfulResult getCurrentLocation(@RequestParam("capcityNumber") String capcityNumber) throws Exception;
+
+    @PostMapping("/api/v1/otms/pathDisplay/offLineWarn")
+    public String offLineWarn(@RequestParam(value = "data") String data) throws Exception;
+    @PostMapping("/api/v1/otms/pathDisplay/parkWarn")
+    public String parkWarn(@RequestParam(value = "data",required = false) String data) throws Exception;
+    @PostMapping("/api/v1/otms/pathDisplay/abnormalLineWarn")
+    public String abnormalLineWarn(@RequestParam(value = "data") String data) throws Exception;
 }

src/main/resources/application-dev.yml

@@ -40,8 +40,7 @@ openfeign:
     url: ${OTMSFEIGN_URL:172.16.33.162:8038}
     #url: ${OTMSFEIGN_URL:localhost:8038}
 piction:
-  #path: /usr/share/nginx/html/image
-  #path: /test/data/nginx/html/image
+  #path: C:\Users\24390\Desktop\work\a
   #path: D:\Code\work\jpg
   path: /shared
 

src/main/resources/application-prod.yml

@@ -23,7 +23,7 @@ openfeign:
   TmsTrainFeign:
     url: ${TMSTRAINFEIGN_URL:172.16.33.166:8086}
   TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8088}
+    url: ${TMSTRUCKFEIGN_URL:localhost:8088}
   TmsshipFeign:
     url: ${TMSSHIPFEIGN_URL:172.16.33.166:8090}
   WMSHFeign: