From a3698ecb84be4192754d7b2092491e727dbccec7 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 27 六月 2025 16:51:02 +0800
Subject: [PATCH] 修改bug

---
 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java |   30 ++++++++++++++----------------
 1 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
index ed6484a..250b4de 100644
--- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
+++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
@@ -3,16 +3,15 @@
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import com.stylefeng.guns.modular.system.dao.DriverMapper;
 import com.stylefeng.guns.modular.system.dao.DriverServiceMapper;
-import com.stylefeng.guns.modular.system.model.Company;
 import com.stylefeng.guns.modular.system.model.Driver;
 import com.stylefeng.guns.modular.system.model.DriverService;
 import com.stylefeng.guns.modular.system.service.ICompanyCityService;
 import com.stylefeng.guns.modular.system.service.IDriverService;
 import com.stylefeng.guns.modular.system.util.GDMapElectricFenceUtil;
 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.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -22,27 +21,26 @@
 
 @Service
 public class DriverServiceImpl extends ServiceImpl<DriverMapper, Driver> implements IDriverService {
-
+    
     @Resource
     private DriverMapper driverMapper;
-
+    
     @Resource
     private DriverServiceMapper driverServiceMapper;
-
-    @Autowired
-    private RedisUtil redisUtil;
-
+    
+    @Resource
+    private RedisTemplate<String, Object> redisTemplate;
+    
     @Autowired
     private GDMapElectricFenceUtil gdMapElectricFenceUtil;
-
+    
     @Autowired
     private ICompanyCityService companyCityService;
-
+    
     @Autowired
     private GeodesyUtil geodesyUtil;
-
-
-
+    
+    
     /**
      * 获取distance公里内空闲司机数量
      * @param type  业务类型(1=专车,2=出租车,3=城际,4=小件物流-同城,5=小件物流-跨城,6=包车)
@@ -56,7 +54,7 @@
         List<Driver> drivers = driverMapper.queryIdleDriver(type, companyId);
         List<Driver> list = new ArrayList<>();
         for(Driver driver : drivers){
-            String value = redisUtil.getValue("DRIVER" + String.valueOf(driver.getId()));
+            String value = (String) redisTemplate.opsForValue().get("DRIVER" + String.valueOf(driver.getId()));
             if(null != value){
                 Map<String, Double> distance1 = geodesyUtil.getDistance(lon + "," + lat, value);
                 double d = Double.valueOf(distance1.get("WGS84")).doubleValue();
@@ -85,7 +83,7 @@
         List<Driver> drivers = driverMapper.queryIdleDriver_(type, serverCarModelId, companyId);
         List<Driver> list = new ArrayList<>();
         for(Driver driver : drivers){
-            String value = redisUtil.getValue("DRIVER" + String.valueOf(driver.getId()));
+            String value = (String) redisTemplate.opsForValue().get("DRIVER" + String.valueOf(driver.getId()));
             if(null != value){
                 Map<String, Double> distance1 = geodesyUtil.getDistance(lon + "," + lat, value);
                 double d = Double.valueOf(distance1.get("WGS84")).doubleValue();
@@ -102,7 +100,7 @@
         List<Driver> drivers = driverMapper.queryIdleDriver1(type, companyId);
         List<Driver> list = new ArrayList<>();
         for(Driver driver : drivers){
-            String value = redisUtil.getValue("DRIVER" + String.valueOf(driver.getId()));
+            String value = (String) redisTemplate.opsForValue().get("DRIVER" + String.valueOf(driver.getId()));
             if(null != value){
                 Map<String, Double> distance1 = geodesyUtil.getDistance(lon + "," + lat, value);
                 double d = Double.valueOf(distance1.get("WGS84")).doubleValue();

--
Gitblit v1.7.1