Explorar o código

新增地图接口

liyg %!s(int64=3) %!d(string=hai) anos
pai
achega
94ec7114d6

+ 14 - 0
src/main/java/com/steerinfo/dil/controller/OTMSController.java

@@ -214,4 +214,18 @@ public class OTMSController {
         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);
+    }
+
+
+
 }

+ 10 - 2
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 {
     //在途订单列表
@@ -107,4 +107,12 @@ 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;
 }

+ 1 - 1
src/main/resources/application-dev.yml

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