From 8522e469e00e1cf6c0410165b0f76c806c13ca83 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期六, 16 八月 2025 09:17:04 +0800
Subject: [PATCH] 合并代码
---
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushUtil.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushUtil.java b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushUtil.java
index 372be92..8774fb2 100644
--- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushUtil.java
+++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushUtil.java
@@ -13,6 +13,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.beans.factory.annotation.Value;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Component;
@@ -29,7 +30,9 @@
@Component
public class PushUtil {
- private final String socket_uri = "http://172.21.35.142:6000";
+ @Value("${qyt.socket_uri}")
+ private String socket_uri;
+
@Autowired
private IOrderTaxiService orderTaxiService;
@@ -81,6 +84,7 @@
params.put("msg", jsonObject.toJSONString());
params.put("id", uid);
params.put("type", type);
+ params.put("bussinessType", "dache");
post.form(params);
HttpResponse execute = post.execute();
if (200 != execute.getStatus()) {
@@ -119,6 +123,7 @@
params.put("msg", jsonObject.toJSONString());
params.put("id", uid);
params.put("type", type);
+ params.put("bussinessType", "dache");
post.form(params);
HttpResponse execute = post.execute();
if (200 != execute.getStatus()) {
@@ -243,7 +248,7 @@
}
//计算预计距离和剩余时间
- 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;
}
@@ -312,6 +317,7 @@
params.put("msg", msg.toJSONString());
params.put("id", jsonObject.getIntValue("id"));
params.put("type", jsonObject.getIntValue("type"));
+ params.put("bussinessType", "dache");
post.form(params);
HttpResponse execute = post.execute();
if (200 != execute.getStatus()) {
@@ -361,6 +367,7 @@
params.put("msg", msg.toJSONString());
params.put("id", id);
params.put("type", type);
+ params.put("bussinessType", "dache");
post.form(params);
HttpResponse execute = post.execute();
if (200 != execute.getStatus()) {
@@ -401,6 +408,7 @@
params.put("msg", jsonObject.toJSONString());
params.put("id", uid);
params.put("type", type);
+ params.put("bussinessType", "dache");
post.form(params);
HttpResponse execute = post.execute();
if (200 != execute.getStatus()) {
--
Gitblit v1.7.1