From 4231cb0417322b6b974210d31ff4cbd8a842da96 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 12 八月 2025 10:42:39 +0800
Subject: [PATCH] 合并代码
---
DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushUtil.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 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 e893605..a9d5cac 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
@@ -15,10 +15,10 @@
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.beans.factory.annotation.Value;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Component;
-import org.springframework.web.client.RestTemplate;
import java.math.BigDecimal;
import java.math.MathContext;
@@ -33,9 +33,6 @@
*/
@Component
public class PushUtil {
-
- @Autowired
- private RestTemplate internalRestTemplate;
@Autowired
private IOrderTaxiService orderTaxiService;
@@ -57,7 +54,11 @@
private Map<String, Timer> taskMap = new HashMap<>();//存储定时推送的定时器
- private final String socket_uri = "http://127.0.0.1:6000";
+ @Value("${qyt.socket_uri}")
+ private String socket_uri;
+
+
+
// qyt 改派重新推单
@@ -363,7 +364,7 @@
return;
}
//计算预计距离和剩余时间
- String value = (String) redisTemplate.opsForValue().get("DRIVER" + String.valueOf(driverId));
+ String value = (String) redisTemplate.opsForValue().get("dache:DRIVER" + String.valueOf(driverId));
if(null == value || "".equals(value)){
return;
}
--
Gitblit v1.7.1