From 868942e202aeb967b8ce47b38cc2433a636a128d Mon Sep 17 00:00:00 2001
From: phanes <5411232+phanes@user.noreply.gitee.com>
Date: 星期日, 16 一月 2022 17:46:24 +0800
Subject: [PATCH] update 格式化代码结构 统一编码格式

---
 ruoyi-common/src/main/java/com/ruoyi/common/utils/LoginUtils.java |   77 ++++++++++++++++++++++++++++++--------
 1 files changed, 60 insertions(+), 17 deletions(-)

diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/LoginUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/LoginUtils.java
index 9cd759f..a452386 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/LoginUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/LoginUtils.java
@@ -1,9 +1,13 @@
 package com.ruoyi.common.utils;
 
 import cn.dev33.satoken.stp.StpUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.enums.DeviceType;
 import com.ruoyi.common.enums.UserType;
 import com.ruoyi.common.exception.UtilException;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
 
 /**
  * 鐧诲綍閴存潈宸ュ叿
@@ -11,41 +15,80 @@
  *
  * @author Lion Li
  */
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
 public class LoginUtils {
+
+    private static final String LOGIN_USER_KEY = "loginUser";
 
     /**
      * 鐧诲綍绯荤粺
      * 閽堝涓ゅ鐢ㄦ埛浣撶郴
-     * @param userId 鐢ㄦ埛id
+     *
+     * @param loginUser 鐧诲綍鐢ㄦ埛淇℃伅
      */
-    public static void login(Long userId, UserType userType) {
-        StpUtil.login(userType.getUserType() + userId);
+    public static void login(LoginUser loginUser, UserType userType) {
+        StpUtil.login(userType.getUserType() + loginUser.getUserId());
+        setLoginUser(loginUser);
     }
 
     /**
      * 鐧诲綍绯荤粺 鍩轰簬 璁惧绫诲瀷
      * 閽堝涓�濂楃敤鎴蜂綋绯�
-     * @param userId 鐢ㄦ埛id
+     *
+     * @param loginUser 鐧诲綍鐢ㄦ埛淇℃伅
      */
-    public static void loginByDevice(Long userId, UserType userType, DeviceType deviceType) {
-        StpUtil.login(userType.getUserType() + userId, deviceType.getDevice());
+    public static void loginByDevice(LoginUser loginUser, UserType userType, DeviceType deviceType) {
+        StpUtil.login(userType.getUserType() + loginUser.getUserId(), deviceType.getDevice());
+        setLoginUser(loginUser);
+    }
+
+    /**
+     * 璁剧疆鐢ㄦ埛鏁版嵁
+     */
+    public static void setLoginUser(LoginUser loginUser) {
+        StpUtil.getTokenSession().set(LOGIN_USER_KEY, loginUser);
+    }
+
+    /**
+     * 鑾峰彇鐢ㄦ埛
+     **/
+    public static LoginUser getLoginUser() {
+        return (LoginUser) StpUtil.getTokenSession().get(LOGIN_USER_KEY);
     }
 
     /**
      * 鑾峰彇鐢ㄦ埛id
      */
     public static Long getUserId() {
-        String loginId = StpUtil.getLoginIdAsString();
-        String userId;
-        String replace = "";
-        if (StringUtils.contains(loginId, UserType.SYS_USER.getUserType())) {
-            userId = StringUtils.replace(loginId, UserType.SYS_USER.getUserType(), replace);
-        } else if (StringUtils.contains(loginId, UserType.APP_USER.getUserType())){
-            userId = StringUtils.replace(loginId, UserType.APP_USER.getUserType(), replace);
-        } else {
-            throw new UtilException("鐧诲綍鐢ㄦ埛: LoginId寮傚父 => " + loginId);
+        LoginUser loginUser = getLoginUser();
+        if (ObjectUtil.isNull(loginUser)) {
+            String loginId = StpUtil.getLoginIdAsString();
+            String userId;
+            String replace = "";
+            if (StringUtils.contains(loginId, UserType.SYS_USER.getUserType())) {
+                userId = StringUtils.replace(loginId, UserType.SYS_USER.getUserType(), replace);
+            } else if (StringUtils.contains(loginId, UserType.APP_USER.getUserType())) {
+                userId = StringUtils.replace(loginId, UserType.APP_USER.getUserType(), replace);
+            } else {
+                throw new UtilException("鐧诲綍鐢ㄦ埛: LoginId寮傚父 => " + loginId);
+            }
+            return Long.parseLong(userId);
         }
-        return Long.parseLong(userId);
+        return loginUser.getUserId();
+    }
+
+    /**
+     * 鑾峰彇閮ㄩ棬ID
+     **/
+    public static Long getDeptId() {
+        return getLoginUser().getDeptId();
+    }
+
+    /**
+     * 鑾峰彇鐢ㄦ埛璐︽埛
+     **/
+    public static String getUsername() {
+        return getLoginUser().getUsername();
     }
 
     /**
@@ -59,7 +102,7 @@
     public static UserType getUserType(Object loginId) {
         if (StringUtils.contains(loginId.toString(), UserType.SYS_USER.getUserType())) {
             return UserType.SYS_USER;
-        } else if (StringUtils.contains(loginId.toString(), UserType.APP_USER.getUserType())){
+        } else if (StringUtils.contains(loginId.toString(), UserType.APP_USER.getUserType())) {
             return UserType.APP_USER;
         } else {
             throw new UtilException("鐧诲綍鐢ㄦ埛: LoginId寮傚父 => " + loginId);

--
Gitblit v1.9.3