From ccb2a08682a051a8936c45d74e0047186e436938 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 13 八月 2025 15:50:26 +0800
Subject: [PATCH] 修改bug
---
MessagePushTravel/src/main/java/com/sinata/push/util/echo/NettyServerController.java | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/MessagePushTravel/src/main/java/com/sinata/push/util/echo/NettyServerController.java b/MessagePushTravel/src/main/java/com/sinata/push/util/echo/NettyServerController.java
index e8c1a5f..a4bbdfb 100644
--- a/MessagePushTravel/src/main/java/com/sinata/push/util/echo/NettyServerController.java
+++ b/MessagePushTravel/src/main/java/com/sinata/push/util/echo/NettyServerController.java
@@ -5,6 +5,7 @@
import cn.hutool.http.HttpUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
+import com.sinata.push.config.QYTConfig;
import com.sinata.push.util.*;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
@@ -33,18 +34,25 @@
public static Hashtable<String, Hashtable<ChannelHandlerContext, String>> map = new Hashtable<String, Hashtable<ChannelHandlerContext,String>>();
public static Hashtable<String,String> table;
+
+ public static QYTConfig qytConfig;
private RedisUtil redisUtil = SpringUtil.getObject(RedisUtil.class);
private SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
-
+
static{
if(table == null){
table = new Hashtable<>();
}
+ }
+
+
+ public static void setQytConfig(QYTConfig qytConfig) {
+ NettyServerController.qytConfig = qytConfig;
}
public static boolean isdebug = false;
@@ -96,7 +104,7 @@
String device = jsonCon.getString("device");
String version = jsonCon.getString("version");
String businessType = jsonCon.getString("businessType");//1：打车，2=代驾
- String business = "1".equals(businessType) ? "dache" : "daijia";
+ String business = "2".equals(businessType) ? "daijia" : "dache";
if(StringUtil.isNotEmpty(userId1)){
//判断用户或者司机长连接
@@ -169,7 +177,7 @@
if(method.equals(Method.location)){
Integer driverId = jsonCon.getInteger("driverId");
String businessType = jsonCon.getString("businessType");//1：打车，2=代驾
- String business = "1".equals(businessType) ? "dache" : "daijia";
+ String business = "2".equals(businessType) || null==businessType ? "daijia" : "dache";
String fluid_control = redisUtil.getValue(business + ":location_" + driverId);
if(!StringUtils.hasLength(fluid_control)){
@@ -201,7 +209,7 @@
params.put("lat", String.valueOf(lat));
params.put("directionAngle", String.valueOf(computeAzimuth));
params.put("altitude", String.valueOf(altitude));
- HttpRequest post = HttpUtil.createPost(URLUtil.zuul + "/driver-server/base/savePosition");
+ HttpRequest post = HttpUtil.createPost(qytConfig.getChuxingUrl() + "/driver-server/base/savePosition");
post.contentType(MediaType.APPLICATION_FORM_URLENCODED_VALUE);
post.form(params);
HttpResponse execute = post.execute();
@@ -228,7 +236,7 @@
params.put("lat", String.valueOf(lat));
params.put("directionAngle", String.valueOf(computeAzimuth));
params.put("altitude", String.valueOf(altitude));
- HttpRequest post = HttpUtil.createPost(URLUtil.aj_zuul + "/driver-server/base/driver/addDriverPosition");
+ HttpRequest post = HttpUtil.createPost(qytConfig.getDaijiaurl() + "/driver-server/base/driver/addDriverPosition");
post.contentType(MediaType.APPLICATION_FORM_URLENCODED_VALUE);
post.form(params);
HttpResponse execute = post.execute();
--
Gitblit v1.7.1