From 9d5309c820d525b46e65490475957b641707db51 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期三, 16 八月 2023 15:57:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/OrderPositionServiceImpl.java | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/OrderPositionServiceImpl.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/OrderPositionServiceImpl.java
index 00b1cd2..4ee5ef9 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/OrderPositionServiceImpl.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/OrderPositionServiceImpl.java
@@ -7,6 +7,7 @@
import com.supersavedriving.driver.modular.system.model.Order;
import com.supersavedriving.driver.modular.system.service.IOrderService;
import com.supersavedriving.driver.modular.system.util.GeodesyUtil;
+import com.supersavedriving.driver.modular.system.util.PushUtil;
import com.supersavedriving.driver.modular.system.util.RedisUtil;
import com.supersavedriving.driver.modular.system.warpper.DriverPositionWarpper;
import com.supersavedriving.driver.modular.system.warpper.OrderPositionWarpper;
@@ -34,6 +35,9 @@
@Autowired
private IOrderService orderService;
+ @Autowired
+ private PushUtil pushUtil;
+
private Map<String, Integer> map = new HashMap<>();
@@ -53,6 +57,17 @@
if(null == order.getDriverId() || order.getDriverId().compareTo(driverId) != 0){
return;
}
+ //开始服务提醒
+ if(order.getState() == 104){
+ String fromLonLat = order.getStartLng() + "," + order.getStartLat();
+ String toLonLat = driverPositionWarpper.getLon() + "," + driverPositionWarpper.getLat();
+ Map<String, Double> distance = GeodesyUtil.getDistance(fromLonLat, toLonLat);
+ Double wgs84 = distance.get("WGS84");
+ if(wgs84.compareTo(200D) >= 0){
+ pushUtil.pushStartServer(2, driverId);
+ }
+ }
+
if(order.getState() != 105 && order.getState() != 401){
return;
}
--
Gitblit v1.7.1