From ece8284538e800b3a230d038fb01c243df08713e Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Wed, 24 Mar 2021 11:41:08 +0800
Subject: [PATCH] websocket修改

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/webscoket/WebSocketHandler.java          |    9 +++++++--
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/suser/service/impl/SuserServiceImpl.java |    4 ++--
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/suser/mapper/SuserMapper.java            |    2 +-
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/suser/service/ISuserService.java         |    2 +-
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/suser/mapper/SuserMapper.xml             |    2 +-
 5 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/suser/mapper/SuserMapper.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/suser/mapper/SuserMapper.java
index 42c91b0..8f03669 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/suser/mapper/SuserMapper.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/suser/mapper/SuserMapper.java
@@ -44,7 +44,7 @@
 	List<SuserVOs> selectName();
 	String selectNames(String ud);
 	void updateOne(Integer id, String ynumber, String yname, String phone, String address, String type, String dj, String information, String jd, String wd, String createtime, String addvcd);
-	void updateUser(String online_status,String account);
+	void updateUser(String online_status,String account,String workSt);
 
 	void s(String ynumber, String yname, String phone, String address, String type, String dj, String information, String jd, String wd, String createtime, String addvcd);
 
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/suser/mapper/SuserMapper.xml b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/suser/mapper/SuserMapper.xml
index f46ac29..bba55f4 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/suser/mapper/SuserMapper.xml
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/suser/mapper/SuserMapper.xml
@@ -119,7 +119,7 @@
     </select>
 
     <update id="updateUser">
-        update jfpth.blade_user SET online_status=#{online_status} where account=#{account}
+        update jfpth.blade_user SET online_status=#{online_status},work_status=#{workSt} where id=#{account}
     </update>
 
 </mapper>
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/suser/service/ISuserService.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/suser/service/ISuserService.java
index c4d783a..be4553c 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/suser/service/ISuserService.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/suser/service/ISuserService.java
@@ -45,7 +45,7 @@
 	String selectNames(String ud);
 	void updateOne(Integer id, String ynumber, String yname, String phone, String address, String type, String dj, String information, String jd, String wd, String createtime, String addvcd);
 	void s(String ynumber, String yname, String phone, String address, String type, String dj, String information, String jd, String wd, String createtime, String addvcd);
-	void updateUser(String online_status,String account);
+	void updateUser(String online_status,String account,String workSt);
 	/**
 	 * 查询业主总数
 	 * @return
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/suser/service/impl/SuserServiceImpl.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/suser/service/impl/SuserServiceImpl.java
index 8249edb..a08fdb1 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/suser/service/impl/SuserServiceImpl.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/suser/service/impl/SuserServiceImpl.java
@@ -72,8 +72,8 @@
 	}
 
 	@Override
-	public void updateUser(String online_status, String account) {
-		baseMapper.updateUser(online_status, account);
+	public void updateUser(String online_status, String account,String workSt) {
+		baseMapper.updateUser(online_status, account , workSt);
 	}
 
 
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 42794ea..19d15be 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
@@ -65,7 +65,9 @@
 		//用户离线状态
 		String name = ChannelSupervise.findName(ctx.channel().id().asShortText());
 		String num="0";
-		webSocketHandler.suserService.updateUser(num,name);
+		//工作状态(0闲置,1工作中)
+		String workSt = "0";
+		webSocketHandler.suserService.updateUser(num,name,workSt);
 		ChannelSupervise.removeChannel(ctx.channel());
 	}
 
@@ -98,8 +100,11 @@
 		ChannelSupervise.addChannel(ctx.channel(),request);
 		//用户在线状态
 		this.on=request;
+		//在线状态(0掉线,1在线)
 		String num="1";
-		webSocketHandler.suserService.updateUser(num,request);
+		//工作状态(0闲置,1工作中)
+		String workSt = "0";
+		webSocketHandler.suserService.updateUser(num,request,workSt);
 		TextWebSocketFrame tws = new TextWebSocketFrame(new Date().toString()
 			+ ctx.channel().id() + ":" + ctx.channel());
 		// 返回【谁发的发给谁】

--
Gitblit v1.9.3