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

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

@@ -213,6 +213,18 @@ public class OTMSController {
     public RESTfulResult getCurrentLocation(@RequestParam("capcityNumber") String capcityNumber) throws Exception{
         return otmsFeign.getCurrentLocation(capcityNumber);
     }
+    //获取地图顶点
+    @GetMapping(value = "/mapvertexs/findAllAvailableVertex")
+    public RESTfulResult findAllAvailableVertex(){
+        return  otmsFeign.findAllAvailableVertex();
+    }
+
+    //获取最佳路径
+    @GetMapping(value = "/mapvertexs/getObtainTheOptimalPath")
+    public RESTfulResult getObtainTheOptimalPath(@RequestParam("startPoint") String startPoint,@RequestParam("endPoint")  String endPoint) throws Exception{
+        return otmsFeign.getObtainTheOptimalPath(startPoint,endPoint);
+    }
+
 
     //在途订单列表
     @PostMapping("/transportationPerformance")
@@ -222,5 +234,4 @@ public class OTMSController {
                                                    @RequestParam(required = false,name = "pageSize")Integer pageSize){
         return otmsFeign.transportationPerformance(mapValue!=null?mapValue:new HashMap<>(),apiId,pageNum,pageSize);
     }
-
 }

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

@@ -7,8 +7,8 @@ import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.util.HashMap;
-import java.util.Map;
+import java.util.*;
+
 @FeignClient(value = "DAL-OTMS-API-DEV", url = "${openfeign.OTMSFeign.url}")
 public interface OtmsFeign {
     //在途订单列表
@@ -115,10 +115,20 @@ public interface OtmsFeign {
     @GetMapping("/api/v1/otms/pathDisplay/getCurrentLocation")
     public RESTfulResult getCurrentLocation(@RequestParam("capcityNumber") String capcityNumber) throws Exception;
 
+    //获取地图顶点
+    @GetMapping(value = "/api/v1/otms/mapvertexs/findAllAvailableVertex")
+    public RESTfulResult findAllAvailableVertex();
+
+    //获取最佳路径
+    @GetMapping(value = "/api/v1/otms/mapvertexs/getObtainTheOptimalPath")
+    public RESTfulResult getObtainTheOptimalPath(@RequestParam("startPoint") String startPoint,@RequestParam("endPoint")  String endPoint) 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

@@ -23,6 +23,7 @@ openfeign:
     url: ${TMSTRAINFEIGN_URL:172.16.33.162:8004}
   TmsTruckFeign:
     url: ${TMSTRUCKFEIGN_URL:172.16.33.162:8008}
+    #url: ${TMSTRUCKFEIGN_URL:localhost:8088}
   TmsshipFeign:
     url: ${TMSSHIPFEIGN_URL:172.16.33.162:8003}
   WMSHFeign: