From b8143019423b5bb1344d26f6da594c9908783909 Mon Sep 17 00:00:00 2001
From: guyue <1721849008@qq.com>
Date: 星期一, 18 八月 2025 02:17:21 +0800
Subject: [PATCH] 优化

---
 UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java |   23 +++++++++++++++++++++++
 1 files changed, 23 insertions(+), 0 deletions(-)

diff --git a/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java b/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
index 2161e58..02fceb1 100644
--- a/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
+++ b/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
@@ -14,11 +14,13 @@
 import com.stylefeng.guns.modular.system.warpper.BaseWarpper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 @Service
 public class DriverServiceImpl extends ServiceImpl<DriverMapper, Driver> implements IDriverService {
@@ -88,6 +90,21 @@
         System.err.println("-----符合条件的司机"+list);
 
         return list;
+    }
+    @Override
+    public List<Driver> queryIdleDriverAllCall(Integer type, Double lon, Double lat, Double distance, List<Integer> companyIds) throws Exception {
+        if(CollectionUtils.isEmpty(companyIds)){
+            System.err.println("-----未查询到该区域分公司进行推单------");
+            return new ArrayList<>();
+        }
+        companyIds = companyIds.stream().distinct().collect(Collectors.toList());
+        List<Driver> allDrivers = new ArrayList<>();
+        for (Integer companyId : companyIds) {
+            List<Driver> drivers = driverMapper.queryIdleDriver(type, companyId);
+            allDrivers.addAll(drivers);
+        }
+        System.err.println("-----符合条件的司机"+allDrivers);
+        return allDrivers;
     }
 
 
@@ -177,4 +194,10 @@
         }
         return maps;
     }
+
+    @Override
+    public List<Driver> queryDriversByLineAndCarModel(Integer type,Integer serverCarModelId, Integer lineId) throws Exception {
+        List<Driver> drivers = driverMapper.queryDriversByLineAndCarModel( type,serverCarModelId, lineId);
+        return drivers;
+    }
 }

--
Gitblit v1.7.1