增加地图接口

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

@@ -213,8 +213,6 @@ public class OTMSController {
     public RESTfulResult getCurrentLocation(@RequestParam("capcityNumber") String capcityNumber) throws Exception{
         return otmsFeign.getCurrentLocation(capcityNumber);
     }
-
-<<<<<<< HEAD
     //获取地图顶点
     @GetMapping(value = "/mapvertexs/findAllAvailableVertex")
     public RESTfulResult findAllAvailableVertex(){
@@ -228,8 +226,6 @@ public class OTMSController {
     }
 
 
-
-=======
     //在途订单列表
     @PostMapping("/transportationPerformance")
     public RESTfulResult transportationPerformance(@RequestBody(required = false) Map<String,Object> mapValue,
@@ -238,6 +234,4 @@ public class OTMSController {
                                                    @RequestParam(required = false,name = "pageSize")Integer pageSize){
         return otmsFeign.transportationPerformance(mapValue!=null?mapValue:new HashMap<>(),apiId,pageNum,pageSize);
     }
-
->>>>>>> bbca852991e7e93de2d881fe866fef87ad72b0e2
 }

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

@@ -115,7 +115,6 @@ public interface OtmsFeign {
     @GetMapping("/api/v1/otms/pathDisplay/getCurrentLocation")
     public RESTfulResult getCurrentLocation(@RequestParam("capcityNumber") String capcityNumber) throws Exception;
 
-<<<<<<< HEAD
     //获取地图顶点
     @GetMapping(value = "/api/v1/otms/mapvertexs/findAllAvailableVertex")
     public RESTfulResult findAllAvailableVertex();
@@ -123,12 +122,13 @@ public interface OtmsFeign {
     //获取最佳路径
     @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;
->>>>>>> bbca852991e7e93de2d881fe866fef87ad72b0e2
 }

src/main/resources/application-dev.yml

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