完善交互

stdiet-admin/src/main/java/com/stdiet/web/controller/custom/WebSocketController.java

@@ -3,11 +3,10 @@ package com.stdiet.web.controller.custom;
 import com.alibaba.fastjson.JSONObject;
 import com.stdiet.common.core.controller.BaseController;
 import com.stdiet.custom.utils.WsUtils;
-import com.stdiet.web.server.WebSocketServer;
+import com.stdiet.custom.server.WebSocketServer;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
@@ -39,16 +38,16 @@ public class WebSocketController extends BaseController {
 
     }
 
-    @Scheduled(fixedRate = 30000)
-    public void boardCast() {
-        try {
-            JSONObject heartBeat = new JSONObject();
-            heartBeat.put("type", WsUtils.WS_TYPE_HEART_BEAT);
-            heartBeat.put("msg", "ping");
-
-            WebSocketServer.sendInfo(heartBeat.toJSONString(), null);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
+//    @Scheduled(fixedRate = 30000)
+//    public void boardCast() {
+//        try {
+//            JSONObject heartBeat = new JSONObject();
+//            heartBeat.put("type", WsUtils.WS_TYPE_HEART_BEAT);
+//            heartBeat.put("msg", "ping");
+//
+//            WebSocketServer.sendInfo(heartBeat.toJSONString(), null);
+//        } catch (IOException e) {
+//            e.printStackTrace();
+//        }
+//    }
 }

stdiet-admin/src/main/java/com/stdiet/web/server/WebSocketServer.java

@@ -1,122 +0,0 @@
-package com.stdiet.web.server;
-
-import com.alibaba.fastjson.JSONObject;
-import com.stdiet.common.core.domain.model.LoginUser;
-import com.stdiet.custom.utils.WsUtils;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
-import org.springframework.stereotype.Component;
-
-import javax.websocket.*;
-import javax.websocket.server.ServerEndpoint;
-import java.io.IOException;
-import java.util.concurrent.CopyOnWriteArraySet;
-
-@ServerEndpoint(value = "/ws")
-@Component
-@Slf4j
-public class WebSocketServer {
-
-    // concurrent包的线程安全Set，用来存放每个客户端对应的MyWebSocket对象。
-    private static CopyOnWriteArraySet<WebSocketServer> webSocketSet = new CopyOnWriteArraySet<WebSocketServer>();
-    //private static ConcurrentHashMap<String,WebSocketServer> websocketList = new ConcurrentHashMap<>();
-    // 与某个客户端的连接会话，需要通过它来给客户端发送数据
-    private Session session;
-    // 接收sid
-    private String sid = "";
-
-    public static CopyOnWriteArraySet<WebSocketServer> getWebSocketSet() {
-        return webSocketSet;
-    }
-
-    /**
-     * 群发自定义消息
-     */
-    public static void sendInfo(String message, String sid) throws IOException {
-        log.info("推送消息到窗口" + sid + "，推送内容:" + message + "目标:" + webSocketSet.size());
-        for (WebSocketServer item : webSocketSet) {
-            try {
-                // 这里可以设定只推送给这个sid的，为null则全部推送
-                if (sid == null) {
-                    item.sendMessage(message);
-                } else if (item.sid.equals(sid)) {
-                    item.sendMessage(message);
-                }
-            } catch (IOException e) {
-                // 清理断开的连接
-                webSocketSet.remove(item);
-                continue;
-            }
-        }
-    }
-
-    // * 连接建立成功调用的方法*
-    @OnOpen
-    public void onOpen(Session session) {
-        this.session = session;
-        this.sid = String.valueOf(getUserId(session));
-
-        webSocketSet.add(this); // 加入set中
-
-        try {
-            JSONObject object = new JSONObject();
-            object.put("type", WsUtils.WS_TYPE_SYSTEM_MESSAGE);
-            object.put("msg", "连接成功");
-            sendMessage(object.toJSONString());
-        } catch (IOException e) {
-            log.error("websocket IO异常");
-        }
-    }
-
-    @OnClose
-    public void onClose() {
-        webSocketSet.remove(this); // 从set中删除
-        log.info("有一连接关闭！");
-    }
-
-    // */
-    /// **
-    // * 收到客户端消息后调用的方法
-    // *
-    // * @param message 客户端发送过来的消息*//*
-    @OnMessage
-    public void onMessage(String message, Session session) {
-        log.info("收到来自窗口" + sid + "的信息:" + message);
-//        // 群发消息
-//        for (WebSocketServer item : webSocketSet) {
-//            try {
-//                item.sendMessage(message);
-//            } catch (IOException e) {
-//                e.printStackTrace();
-//            }
-//        }
-    }
-
-    /**
-     * @param session
-     * @param error
-     */
-    @OnError
-    public void onError(Session session, Throwable error) {
-        log.error("发生错误");
-        error.printStackTrace();
-    }
-
-    /**
-     * 实现服务器主动推送
-     */
-    public void sendMessage(String message) throws IOException {
-        log.info("服务器消息推送：" + message);
-        this.session.getBasicRemote().sendText(message);
-    }
-
-    public Long getUserId(Session session) {
-        try {
-            return ((LoginUser) ((UsernamePasswordAuthenticationToken) session.getUserPrincipal()).getPrincipal()).getUser().getUserId();
-        } catch (Exception e) {
-            return 0L;
-        }
-    }
-
-
-}