去掉消息类

lift-common/src/main/java/cn.com.ty.lift.common/constants/WebSocketConstants.java

@@ -12,11 +12,6 @@ public class WebSocketConstants {
      */
     public static final String PUSH_MESSAGE_TO_PC = "pushMessageToPC";
 
-    /**
-     * 推送当前用户信息
-     */
-    public static final String CURRENT_TIMEY_USER = "currentTimeyUser";
-
     /**
      * 查看标识 已经查看
      */

lift-common/src/main/java/cn.com.ty.lift.common/model/TimeyUser.java

@@ -1,25 +0,0 @@
-package cn.com.ty.lift.common.model;
-
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * @author huangyuan
- * @date 2019-12-22
- * @description 实时消息用户信息类
- */
-@Data
-public class TimeyUser implements Serializable {
-
-    private static final long serialVersionUID = 4125096758372084309L;
-
-    /**
-     * 用户id
-     */
-    private Long userId;
-    /**
-     * 用户昵称
-     */
-    private String userName;
-}

lift-push/src/main/java/cn/com/ty/lift/push/websocket/config/WebSocketInterceptor.java

@@ -1,15 +1,11 @@
 package cn.com.ty.lift.push.websocket.config;
 
-import cn.com.ty.lift.common.constants.ApiConstants;
-import cn.com.ty.lift.common.constants.WebSocketConstants;
-import cn.com.ty.lift.common.model.TimeyUser;
 import org.springframework.http.server.ServerHttpRequest;
 import org.springframework.http.server.ServerHttpResponse;
 import org.springframework.http.server.ServletServerHttpRequest;
 import org.springframework.web.socket.WebSocketHandler;
 import org.springframework.web.socket.server.HandshakeInterceptor;
 
-import javax.servlet.http.HttpSession;
 import java.util.Map;
 
 public class WebSocketInterceptor implements HandshakeInterceptor {
@@ -22,12 +18,7 @@ public class WebSocketInterceptor implements HandshakeInterceptor {
                                    WebSocketHandler wsHandler, Map<String, Object> map) {
 
         if (request instanceof ServletServerHttpRequest) {
-            ServletServerHttpRequest serverHttpRequest = (ServletServerHttpRequest) request;
-            HttpSession session = serverHttpRequest.getServletRequest().getSession();
-            TimeyUser timeyUser = (TimeyUser) session.getAttribute(WebSocketConstants.CURRENT_TIMEY_USER);
-            if (timeyUser != null) {
-                map.put(ApiConstants.CURRENT_USER_ID, timeyUser.getUserId());
-            }
+            System.out.println("进入成功");
         }
         return true;
     }
@@ -35,14 +26,7 @@ public class WebSocketInterceptor implements HandshakeInterceptor {
     @Override
     public void afterHandshake(ServerHttpRequest request, ServerHttpResponse response, WebSocketHandler wsHandler,
                                Exception exception) {
-        ServletServerHttpRequest serverHttpRequest = (ServletServerHttpRequest) request;
-        HttpSession session = serverHttpRequest.getServletRequest().getSession();
-        TimeyUser timeyUser = (TimeyUser) session.getAttribute(WebSocketConstants.CURRENT_TIMEY_USER);
-        if (timeyUser != null) {
-            System.out.println("用户" + timeyUser.getUserName() + "连接进入系统");
-        } else {
-            System.out.println("当前连接为空");
-        }
+        System.out.println("进入成功");
     }
 
 }

lift-system-service/src/main/java/cn/com/ty/lift/system/user/service/impl/LoginService.java

@@ -2,8 +2,6 @@ package cn.com.ty.lift.system.user.service.impl;
 
 import cn.com.ty.lift.common.aliservice.constants.AliConstants;
 import cn.com.ty.lift.common.constants.ApiConstants;
-import cn.com.ty.lift.common.constants.WebSocketConstants;
-import cn.com.ty.lift.common.model.TimeyUser;
 import cn.com.ty.lift.common.utils.ProjectUtils;
 import cn.com.ty.lift.system.settings.dao.entity.MaintenanceCompany;
 import cn.com.ty.lift.system.settings.service.IMaintenanceCompanyService;
@@ -301,11 +299,6 @@ public class LoginService implements ILoginService {
         HttpSession session = request.getSession();
         //获取用户信息
         UserResponse userResponse = userService.getLoginUserInfo(userRequest.getUserId());
-        //将消息推送信息放入session中
-        TimeyUser timeyUser = new TimeyUser();
-        timeyUser.setUserId(userResponse.getUserId());
-        timeyUser.setUserName(userResponse.getName());
-        session.setAttribute(WebSocketConstants.CURRENT_TIMEY_USER, timeyUser);
         //将当前用户id放入session中
         session.setAttribute(ApiConstants.CURRENT_USER_ID, userResponse.getUserId());
         //将当前公司id放入session中