From 8675ddc7e76f418ee47adc50ee7bac35171a9620 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期日, 15 六月 2025 01:59:48 +0800
Subject: [PATCH] 更新司机端中台接口

---
 DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushUtil.java |   20 ++++++++++++--------
 1 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushUtil.java b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushUtil.java
index 86ac869..b0cea43 100644
--- a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushUtil.java
+++ b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushUtil.java
@@ -12,6 +12,7 @@
 import com.stylefeng.guns.modular.taxi.model.OrderTaxi;
 import com.stylefeng.guns.modular.taxi.service.IOrderTaxiService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
@@ -23,7 +24,10 @@
 import java.math.BigDecimal;
 import java.math.MathContext;
 import java.math.RoundingMode;
-import java.util.*;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Timer;
+import java.util.TimerTask;
 
 /**
  * socket推单处理类
@@ -45,9 +49,9 @@
 
     @Autowired
     private IOrderCrossCityService orderCrossCityService;
-
+    
     @Autowired
-    private RedisUtil redisUtil;
+    private RedisTemplate redisTemplate;
 
     @Autowired
     private IOrderLogisticsService orderLogisticsService;
@@ -159,9 +163,9 @@
         JSONObject data = new JSONObject();
         data.put("id", userId);
         data.put("type", 1);
-        String value = redisUtil.getValue(orderId + "_" + orderType);
+        String value = (String) redisTemplate.opsForValue().get(orderId + "_" + orderType);
         if(ToolUtil.isEmpty(value)){
-            redisUtil.setStrValue(orderId + "_" + orderType, data.toJSONString());
+            redisTemplate.opsForValue().set(orderId + "_" + orderType, data.toJSONString());
             createTask(orderId, orderType);
         }
     }
@@ -276,7 +280,7 @@
             return;
         }
         //计算预计距离和剩余时间
-        String value = redisUtil.getValue("DRIVER" + String.valueOf(driverId));
+        String value = (String) redisTemplate.opsForValue().get("DRIVER" + String.valueOf(driverId));
         if(null == value || "".equals(value)){
             return;
         }
@@ -342,7 +346,7 @@
         // 以表单的方式提交
         headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
         //将请求头部和参数合成一个请求
-        String value1 = redisUtil.getValue(orderId + "_" + orderType);
+        String value1 = (String) redisTemplate.opsForValue().get(orderId + "_" + orderType);
         if(ToolUtil.isEmpty(value1)){
             this.removeTask(orderId, orderType);
             return;
@@ -477,7 +481,7 @@
         if (null != timer){
             timer.cancel();
             taskMap.remove(orderId + "_" + orderType);
-            redisUtil.remove(orderId + "_" + orderType);
+            redisTemplate.delete(orderId + "_" + orderType);
         }
     }
 }

--
Gitblit v1.7.1