From 98d63d51c8488dadd819d540350f578e025e02c1 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 23 九月 2025 14:49:28 +0800
Subject: [PATCH] 更新代码

---
 UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 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 b54efa8..799d8b3 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
@@ -18,6 +18,8 @@
 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;
 
@@ -215,10 +217,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