Merge remote-tracking branch 'origin/develop' into develop

project-dispatch/src/main/java/com/dituhui/pea/dispatch/controller/PathController.java

@@ -25,7 +25,7 @@ public class PathController implements IPath {
 
 	@Autowired
 	OrderInfoRepository orderInfoRepository;
-	
+
 	@Autowired
 	RoadDistanceUtils roadDistanceUtils;
 
@@ -49,13 +49,17 @@ public class PathController implements IPath {
 					|| StringUtils.isEmpty(toOrders.get(0).getX()) || StringUtils.isEmpty(toOrders.get(0).getY())) {
 				return Result.failure("missing coordinates");
 			}
+			float fromX = Float.parseFloat(fromOrders.get(0).getX()),
+					fromY = Float.parseFloat(fromOrders.get(0).getY()), toX = Float.parseFloat(toOrders.get(0).getX()),
+					toY = Float.parseFloat(toOrders.get(0).getY());
+			if (fromX < 1 || fromY < 1 || toX < 1 || toY < 1) {
+				System.out.println(fromX + "," + fromY + ";" + toX + "," + toY);
+				return Result.failure("invalid coordinates");
+			}
+
 			// 获取距离
-			Distance distance = roadDistanceUtils.getDistance2(
-					new Location(0L, Float.parseFloat(fromOrders.get(0).getX()),
-							Float.parseFloat(fromOrders.get(0).getY())),
-					new Location(0L, Float.parseFloat(toOrders.get(0).getX()),
-							Float.parseFloat(toOrders.get(0).getY())),
-					vehicleType);
+			Distance distance = roadDistanceUtils.getDistance2(new Location(0L, null, null, fromX, fromY),
+					new Location(0L, null, null, fromX, fromY), vehicleType);
 			DistanceDTO dto = new DistanceDTO();
 			dto.setDis(distance.getDis());
 			dto.setTime(distance.getTime());

project-dispatch/src/main/java/com/dituhui/pea/dispatch/utils/RoadDistanceUtils.java

@@ -13,7 +13,6 @@ import java.util.Map;
 import org.springframework.stereotype.Component;
 
 import com.dituhui.pea.dispatch.pojo.Location;
-import com.dituhui.pea.dispatch.service.impl.SolveServiceImpl;
 import com.google.common.collect.Maps;
 import com.google.gson.Gson;