From b8dd269fc4a0824db2dbf8ab1b6fffbcfc9ba199 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 12 八月 2025 10:44:25 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/QianYunTong
---
MessagePushTravel/src/main/java/com/sinata/push/util/echo/NettyServerController.java | 4 ++--
1 files changed, 2 insertions(+), 2 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..97bc8f0 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
@@ -96,7 +96,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 +169,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)){
--
Gitblit v1.7.1