From 11538d6abad42153bc022425be53de11506ecf27 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 25 Mar 2021 16:51:16 +0800
Subject: [PATCH] 用户心跳调整,解除冲突

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/webscoket/WebSocketHandler.java |   28 +++++++++++++++-------------
 1 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/webscoket/WebSocketHandler.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/webscoket/WebSocketHandler.java
index 8bbc651..3d6b0cd 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/webscoket/WebSocketHandler.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/webscoket/WebSocketHandler.java
@@ -64,11 +64,13 @@
 		System.out.println("客户端断开连接:" + ctx.channel());
 		//用户离线状态
 		String name = ChannelSupervise.findName(ctx.channel().id().asShortText());
-		String num="0";
-		//工作状态(0闲置,1工作中)
-		String workSt = "0";
-		webSocketHandler.suserService.updateUser(num,name,workSt);
-		ChannelSupervise.removeChannel(ctx.channel());
+		if ( name != null &&!name.equals("ping") ){
+			String num="0";
+			//工作状态(0闲置,1工作中)
+			String workSt = "0";
+			webSocketHandler.suserService.updateUser(num,name,workSt);
+			ChannelSupervise.removeChannel(ctx.channel());
+		}
 	}
 
 	@Override
@@ -96,16 +98,16 @@
 		}
 		// 返回应答消息
 		String request = ((TextWebSocketFrame) frame).text();
-		//把用户信息添加到通道里
-		ChannelSupervise.addChannel(ctx.channel(),request);
-		//用户在线状态
-		this.on=request;
-		//在线状态(0掉线,1在线)
-		String num="1";
-		//工作状态(0闲置,1工作中)
-		String workSt = "0";
 
 		if (!request.equals("ping")){
+			//把用户信息添加到通道里
+			ChannelSupervise.addChannel(ctx.channel(),request);
+			//用户在线状态
+			this.on=request;
+			//在线状态(0掉线,1在线)
+			String num="1";
+			//工作状态(0闲置,1工作中)
+			String workSt = "0";
 			webSocketHandler.suserService.updateUser(num,request,workSt);
 		}
 

--
Gitblit v1.9.3