考生端websocket

themis-backend/src/main/java/com/qmth/themis/backend/websocket/WebSocketServer.java → themis-backend/src/main/java/com/qmth/themis/backend/websocket/WebSocketAdminServer.java

@@ -2,7 +2,7 @@ package com.qmth.themis.backend.websocket;
 
 import com.alibaba.fastjson.JSONObject;
 import com.qmth.themis.backend.config.DictionaryConfig;
-import com.qmth.themis.backend.websocketTemplete.WebSocketOeMessageTemplete;
+import com.qmth.themis.backend.websocketTemplete.WebSocketAdminMessageTemplete;
 import com.qmth.themis.business.constant.SpringContextHolder;
 import com.qmth.themis.business.constant.SystemConstant;
 import com.qmth.themis.business.entity.TBSession;
@@ -43,11 +43,11 @@ import java.util.concurrent.ConcurrentHashMap;
  */
 @ServerEndpoint("/admin")
 @Component
-public class WebSocketServer
+public class WebSocketAdminServer
 //        implements MessageListenerConcurrently
 {
-    private final static Logger log = LoggerFactory.getLogger(WebSocketServer.class);
-    private volatile static ConcurrentHashMap<String, WebSocketServer> webSocketMap = new ConcurrentHashMap<>();
+    private final static Logger log = LoggerFactory.getLogger(WebSocketAdminServer.class);
+    private volatile static ConcurrentHashMap<String, WebSocketAdminServer> webSocketMap = new ConcurrentHashMap<>();
     /**
      * 与某个客户端的连接会话，需要通过它来给客户端发送数据
      */
@@ -178,12 +178,12 @@ public class WebSocketServer
                 JSONObject jsonObject = JSONObject.parseObject(message);
                 log.info("onMessage:{}", jsonObject.toJSONString());
                 if (Objects.nonNull(jsonObject)) {
-                    WebSocketOeMessageTemplete webSocketOeMessageTemplete = SpringContextHolder.getBean(WebSocketOeMessageTemplete.class);
+                    WebSocketAdminMessageTemplete webSocketAdminMessageTemplete = SpringContextHolder.getBean(WebSocketAdminMessageTemplete.class);
                     String type = String.valueOf(jsonObject.get("type"));
                     Long time = Long.parseLong(String.valueOf(jsonObject.get("time")));
                     //todo 加入当前时间和time比较的校验
-                    Method method = webSocketOeMessageTemplete.getClass().getDeclaredMethod(WebsocketTypeEnum.valueOf(type).getDesc(), String.class);
-                    Result result = (Result) method.invoke(webSocketOeMessageTemplete, String.valueOf(jsonObject.get("body")));
+                    Method method = webSocketAdminMessageTemplete.getClass().getDeclaredMethod(WebsocketTypeEnum.valueOf(type).getDesc(), String.class);
+                    Result result = (Result) method.invoke(webSocketAdminMessageTemplete, String.valueOf(jsonObject.get("body")));
                     this.sendMessage(JSONObject.toJSONString(result));
                 }
             } catch (Exception e) {

themis-backend/src/main/java/com/qmth/themis/backend/websocketTemplete/WebSocketOeMessageTemplete.java → themis-backend/src/main/java/com/qmth/themis/backend/websocketTemplete/WebSocketAdminMessageTemplete.java

@@ -2,11 +2,6 @@ package com.qmth.themis.backend.websocketTemplete;
 
 import com.alibaba.fastjson.JSONObject;
 import com.qmth.themis.business.constant.SystemConstant;
-import com.qmth.themis.business.entity.TOeExamRecord;
-import com.qmth.themis.business.service.TOeExamRecordService;
-import com.qmth.themis.business.util.JacksonUtil;
-import com.qmth.themis.common.enums.ExceptionResultEnum;
-import com.qmth.themis.common.exception.BusinessException;
 import com.qmth.themis.common.util.Result;
 import com.qmth.themis.common.util.ResultUtil;
 import org.slf4j.Logger;
@@ -14,10 +9,8 @@ import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.annotation.Resource;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Objects;
 
 /**
  * @Description: 管理端websocket模版
@@ -27,8 +20,8 @@ import java.util.Objects;
  * @Date: 2020/7/24
  */
 @Component
-public class WebSocketOeMessageTemplete {
-    private final static Logger log = LoggerFactory.getLogger(WebSocketOeMessageTemplete.class);
+public class WebSocketAdminMessageTemplete {
+    private final static Logger log = LoggerFactory.getLogger(WebSocketAdminMessageTemplete.class);
 
     /**
      * 状态同步

themis-exam/src/main/java/com/qmth/themis/exam/websocket/WebSocketServer.java → themis-exam/src/main/java/com/qmth/themis/exam/websocket/WebSocketOeServer.java

@@ -43,11 +43,11 @@ import java.util.concurrent.ConcurrentHashMap;
  */
 @ServerEndpoint("/oe")
 @Component
-public class WebSocketServer
+public class WebSocketOeServer
 //        implements MessageListenerConcurrently
 {
-    private final static Logger log = LoggerFactory.getLogger(WebSocketServer.class);
-    private volatile static ConcurrentHashMap<String, WebSocketServer> webSocketMap = new ConcurrentHashMap<>();
+    private final static Logger log = LoggerFactory.getLogger(WebSocketOeServer.class);
+    private volatile static ConcurrentHashMap<String, WebSocketOeServer> webSocketMap = new ConcurrentHashMap<>();
     /**
      * 与某个客户端的连接会话，需要通过它来给客户端发送数据
      */