liyg %!s(int64=2) %!d(string=hai) anos
pai
achega
81be66fc96

+ 20 - 1
src/main/java/com/steerinfo/route/service/impl/RouteServiceImpl.java

@@ -833,12 +833,31 @@ public class RouteServiceImpl implements RouteService {
                 //已经完成路线点集合
                 //已经完成路线点集合
                 startAndEndRoute.setRunRoute(routes);
                 startAndEndRoute.setRunRoute(routes);
             }
             }
+            //初始化预估轨迹
+            if (to.getResult().getEstimateRoute()!=null){
+                List<Point> routes =new ArrayList();
+                List<Double[]> routesPath =new ArrayList();
+                for(Point item : to.getResult().getEstimateRoute()){
+                    Point point=item;
+                    //将已行驶轨迹转义数据格式
+                    Double[] points = LngLonUtil.gps84_To_Gcj02((Double.valueOf(item.getLat()) / 600000), (Double.valueOf(item.getLon()) / 600000));
+                    routesPath.add(new Double[]{points[1],points[0]});
+                    //经纬度
+                    point.setLat(points[0]+"");
+                    point.setLon(points[1]+"");
+                    //坐标点
+                    routes.add(point);
+                }
+                //点集合
+                startAndEndRoute.setEstimatePath(routesPath);
+                //预定轨迹路线点集合
+                startAndEndRoute.setEstimateRoute(routes);
+            }
             //当前所行驶历程数
             //当前所行驶历程数
             String mil=to.getResult().getRunDistance()+"km";
             String mil=to.getResult().getRunDistance()+"km";
             startAndEndRoute.setMiled(mil);
             startAndEndRoute.setMiled(mil);
             startAndEndRouteList.add(startAndEndRoute);
             startAndEndRouteList.add(startAndEndRoute);
             vo.setStartAndEndRoutes(startAndEndRouteList);
             vo.setStartAndEndRoutes(startAndEndRouteList);
-            //
             //设置返回值对象
             //设置返回值对象
             return CompletableFuture.completedFuture(vo) ;
             return CompletableFuture.completedFuture(vo) ;
         }else {
         }else {