Merge remote-tracking branch 'origin/dev_2.0.0' into dev_2.0.0

virtual-patient-web/src/main/java/com/supervision/VirtualPatientApplication.java

@@ -3,6 +3,8 @@ package com.supervision;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.ComponentScans;
 import org.springframework.web.socket.config.annotation.EnableWebSocket;
 
 @SpringBootApplication

virtual-patient-web/src/main/java/com/supervision/controller/WebSocketServer.java

@@ -4,6 +4,7 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.supervision.constant.UserTokenConstant;
 import com.supervision.usermanage.UserResourceCheck;
+import com.supervision.util.SpringBeanUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -21,17 +22,22 @@ import java.util.concurrent.ConcurrentHashMap;
 @ServerEndpoint("/webSocket/{uid}")
 public class WebSocketServer {
 
-    @Autowired
-    private RedisTemplate<String, String> redisTemplate;
+    private static RedisTemplate<String, String> redisTemplate ;
 
     //concurrent包的线程安全Set，用来存放每个客户端对应的WebSocketServer对象。
-    private static final ConcurrentHashMap<String, Session> SESSION_POOL = new ConcurrentHashMap<>();
+    public static final ConcurrentHashMap<String, Session> SESSION_POOL = new ConcurrentHashMap<>();
 
-    @Value("${human.resourceMaxNumber}")
-    private String resourceNumber;
+    private static UserResourceCheck userResourceCheck ;
 
     @Autowired
-    private UserResourceCheck userResourceCheck;
+    public void setUserResourceCheck(UserResourceCheck userResourceCheck) {
+        WebSocketServer.userResourceCheck = userResourceCheck;
+    }
+
+    @Autowired
+    public void setRedisTemplate(RedisTemplate<String, String> redisTemplate) {
+        WebSocketServer.redisTemplate = redisTemplate;
+    }
 
     /**
      * 有客户端连接成功
@@ -40,6 +46,7 @@ public class WebSocketServer {
     public void onOpen(Session session, @PathParam(value = "uid") String uid) {
         userResourceCheck.achieveDiagnoseResourceAndOpenConnection(uid, session);
         SESSION_POOL.put(uid, session);
+        log.info("用户:{}登录成功", uid);
     }
 
     /**
@@ -62,17 +69,5 @@ public class WebSocketServer {
         log.error("用户:{}发生错误，从Redis中移除,当前连接数为：{}", uid, redisTemplate.opsForHash().size(UserTokenConstant.USER_WEBSOCKET_CACHE), throwable);
     }
 
-    // 实现一个方法用于踢下线用户,走的是Redis的消息队列
-    public void kickUser(String userId, String ignoreSessionId) throws IOException {
-        log.info("尝试主动踢用户:{}下线", userId);
-        Session session = SESSION_POOL.get(userId);
-        // 只有不是忽略剔除的sessionId才可以踢下线
-        if (ObjectUtil.isNotEmpty(session) && !StrUtil.equals(ignoreSessionId, session.getId())) {
-            session.close(new CloseReason(CloseReason.CloseCodes.NORMAL_CLOSURE, "用户被踢下线"));
-            SESSION_POOL.remove(userId);
-            log.info("主动踢用户:{},sessionId:{} 下线成功", userId, session.getId());
-            return;
-        }
-        log.info("主动踢用户:{}下线,未找到用户,踢下线失败", userId);
-    }
+
 }

virtual-patient-web/src/main/java/com/supervision/usermanage/KickUserListener.java

@@ -17,7 +17,7 @@ import java.io.IOException;
 public class KickUserListener implements MessageListener {
 
     @Autowired
-    private WebSocketServer webSocketServer;
+    private UserResourceCheck userResourceCheck;
 
     @Override
     public void onMessage(Message message, byte[] pattern) {
@@ -25,7 +25,7 @@ public class KickUserListener implements MessageListener {
         UserWebSocketDTO user = JSONUtil.toBean(messageString, UserWebSocketDTO.class);
         log.info("Redis的Channel:{}收到踢用户{}下线消息", UserTokenConstant.KICK_CHANNEL, user.getUserId());
         try {
-            webSocketServer.kickUser(user.getUserId(), user.getIgnoreSessionId());
+            userResourceCheck.kickUser(user.getUserId(), user.getIgnoreSessionId());
         } catch (IOException e) {
             throw new RuntimeException(e);
         }

virtual-patient-web/src/main/java/com/supervision/usermanage/UserResourceCheck.java

@@ -1,8 +1,11 @@
 package com.supervision.usermanage;
 
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
 import com.baomidou.lock.annotation.Lock4j;
 import com.supervision.constant.UserTokenConstant;
+import com.supervision.controller.WebSocketServer;
 import com.supervision.exception.BusinessException;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -12,6 +15,8 @@ import javax.websocket.*;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Component;
 
+import java.io.IOException;
+
 @Slf4j
 @Component
 @RequiredArgsConstructor
@@ -36,10 +41,25 @@ public class UserResourceCheck {
         if (!achieveDiagnoseResource()) {
             throw new BusinessException("暂时没有资源,建立连接失败");
         }
-        log.info("用户:{}登录,缓存到Redis", uid);
+        log.info("用户:{}开始登录,缓存到Redis,并尝试把该用户已有客户端踢下线", uid);
         // 链接之前先把之前的用户踢下线(ignoreSessionId防止把当前用户踢下线)
         // 注意,这里如果用户没有进到问诊页面,只是在问诊大厅时,是不会被踢掉的.(因为这时没有建立websocket连接)
         redisTemplate.convertAndSend(UserTokenConstant.KICK_CHANNEL, JSONUtil.toJsonStr(new UserWebSocketDTO(uid, session.getId())));
         redisTemplate.opsForHash().put(UserTokenConstant.USER_WEBSOCKET_CACHE, uid, session.getId());
     }
+
+    // 实现一个方法用于踢下线用户,走的是Redis的消息队列
+    public void kickUser(String userId, String ignoreSessionId) throws IOException {
+        log.info("尝试主动踢用户:{}下线", userId);
+        Session session = WebSocketServer.SESSION_POOL.get(userId);
+        // 只有不是忽略剔除的sessionId才可以踢下线
+        if (ObjectUtil.isNotEmpty(session) && !StrUtil.equals(ignoreSessionId, session.getId())) {
+            session.close(new CloseReason(CloseReason.CloseCodes.NORMAL_CLOSURE, "用户被踢下线"));
+            WebSocketServer.SESSION_POOL.remove(userId);
+            log.info("主动踢用户:{},sessionId:{} 下线成功", userId, session.getId());
+            return;
+        }
+        log.info("主动踢用户:{}下线,未找到用户,踢下线失败", userId);
+    }
+
 }