From 9a66aa395b78b5df07058560eec181a66d6db2b9 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 30 九月 2025 11:41:51 +0800
Subject: [PATCH] 优化指派逻辑
---
UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java | 28 +++++++++++++++++++---------
1 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java b/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
index f715723..9acdc9d 100644
--- a/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
+++ b/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
@@ -15,9 +15,12 @@
import com.stylefeng.guns.modular.system.service.IDriverService;
import com.stylefeng.guns.modular.system.util.GDMapElectricFenceUtil;
import com.stylefeng.guns.modular.system.util.GDMapGeocodingUtil;
+import com.stylefeng.guns.modular.system.util.GeodesyUtil;
import com.stylefeng.guns.modular.system.util.RedisUtil;
import com.stylefeng.guns.modular.system.warpper.BaseWarpper;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.geo.GeoResult;
+import org.springframework.data.redis.connection.RedisGeoCommands;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
@@ -43,6 +46,9 @@
@Autowired
private GDMapElectricFenceUtil gdMapElectricFenceUtil;
+
+ @Autowired
+ private GeodesyUtil geodesyUtil;
@Autowired
private ICompanyCityService companyCityService;
@@ -103,13 +109,11 @@
if(0 != count){
continue;
}
- String value = redisUtil.getValue("DRIVER" + String.valueOf(driver.getId()));
+ String value = redisUtil.getValue("DRIVER" + driver.getId());
if(null != value){
- /*Map<String, String> distance1 = gdMapElectricFenceUtil.getDistance(lon + "," + lat, value, 0);//计算距离
- double d = Double.valueOf(distance1.get("distance")).doubleValue();*/
-// double d = GDMapGeocodingUtil.getDistance(lat,lon,Double.parseDouble(value.split(",")[1]),Double.parseDouble(value.split(",")[0]));
- double d = gdMapElectricFenceUtil.getDrivingRoute(lat,lon,Double.parseDouble(value.split(",")[1]),Double.parseDouble(value.split(",")[0]));
- if(d < (distance * 1000)){
+ Map<String, Double> distance1 = geodesyUtil.getDistance(lon + "," + lat, value);
+ Double wgs84 = distance1.get("WGS84");
+ if(wgs84 < (distance * 1000)){
list.add(driver);
}
}
@@ -132,7 +136,9 @@
List<Driver> list = new ArrayList<>();
for(Driver driver : drivers){
int count = orderPrivateCarService.selectCount(new EntityWrapper<OrderPrivateCar>().eq("driverId", driver.getId())
- .in("state", Arrays.asList(2, 3, 4, 5, 6, 11)).eq("isDelete", 1));
+ .in("state", Arrays.asList(2, 3, 4, 11))
+ .ne("orderType",2)
+ .eq("isDelete", 1));
if(0 != count){
continue;
}
@@ -213,10 +219,14 @@
@Override
public List<Driver> queryDriverLimitTen(Integer type, Double lon, Double lat) {
- List<Driver> drivers = driverMapper.queryIdleDriver(type, null);
- if(CollectionUtils.isEmpty(drivers)){
+ List<GeoResult<RedisGeoCommands.GeoLocation<String>>> driverPosition = redisUtil.getNearGeoSortAscending("DRIVER_POSITION", lon, lat, 5000D);
+ if(CollectionUtils.isEmpty(driverPosition)){
return new ArrayList<>();
}
+ List<RedisGeoCommands.GeoLocation<String>> geoLocations = driverPosition.stream().map(GeoResult::getContent).collect(Collectors.toList());
+ driverPosition.stream().map(GeoResult::getContent).collect(Collectors.toList());
+ List<String> dis = geoLocations.stream().map(RedisGeoCommands.GeoLocation::getName).collect(Collectors.toList());
+ List<Driver> drivers = driverMapper.queryIdleDriverByIds(type, dis);
Iterator<Driver> iterator = drivers.iterator();
while (iterator.hasNext()){
Driver driver = iterator.next();
--
Gitblit v1.7.1