From 6502f2107229bd0e19a0ce5dd748b9e6e5e11367 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期五, 26 十一月 2021 13:57:28 +0800
Subject: [PATCH] update 修改不规范命名

---
 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java |   62 +++++++++++++++----------------
 1 files changed, 30 insertions(+), 32 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java
index f80a877..874f76c 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java
@@ -1,31 +1,35 @@
 package com.ruoyi.system.service.impl;
 
-import org.springframework.stereotype.Service;
+import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.system.domain.SysUserOnline;
 import com.ruoyi.system.service.ISysUserOnlineService;
+import com.ruoyi.system.service.ISysUserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
 /**
  * 鍦ㄧ嚎鐢ㄦ埛 鏈嶅姟灞傚鐞�
- * 
- * @author ruoyi
+ *
+ * @author Lion Li
  */
 @Service
-public class SysUserOnlineServiceImpl implements ISysUserOnlineService
-{
+public class SysUserOnlineServiceImpl implements ISysUserOnlineService {
+
+    @Autowired
+    private ISysUserService userService;
+
     /**
      * 閫氳繃鐧诲綍鍦板潃鏌ヨ淇℃伅
-     * 
+     *
      * @param ipaddr 鐧诲綍鍦板潃
-     * @param user 鐢ㄦ埛淇℃伅
+     * @param user   鐢ㄦ埛淇℃伅
      * @return 鍦ㄧ嚎鐢ㄦ埛淇℃伅
      */
     @Override
-    public SysUserOnline selectOnlineByIpaddr(String ipaddr, LoginUser user)
-    {
-        if (StringUtils.equals(ipaddr, user.getIpaddr()))
-        {
+    public SysUserOnline selectOnlineByIpaddr(String ipaddr, LoginUser user) {
+        if (StringUtils.equals(ipaddr, user.getIpaddr())) {
             return loginUserToUserOnline(user);
         }
         return null;
@@ -33,16 +37,14 @@
 
     /**
      * 閫氳繃鐢ㄦ埛鍚嶇О鏌ヨ淇℃伅
-     * 
+     *
      * @param userName 鐢ㄦ埛鍚嶇О
-     * @param user 鐢ㄦ埛淇℃伅
+     * @param user     鐢ㄦ埛淇℃伅
      * @return 鍦ㄧ嚎鐢ㄦ埛淇℃伅
      */
     @Override
-    public SysUserOnline selectOnlineByUserName(String userName, LoginUser user)
-    {
-        if (StringUtils.equals(userName, user.getUsername()))
-        {
+    public SysUserOnline selectOnlineByUserName(String userName, LoginUser user) {
+        if (StringUtils.equals(userName, user.getUsername())) {
             return loginUserToUserOnline(user);
         }
         return null;
@@ -50,17 +52,15 @@
 
     /**
      * 閫氳繃鐧诲綍鍦板潃/鐢ㄦ埛鍚嶇О鏌ヨ淇℃伅
-     * 
-     * @param ipaddr 鐧诲綍鍦板潃
+     *
+     * @param ipaddr   鐧诲綍鍦板潃
      * @param userName 鐢ㄦ埛鍚嶇О
-     * @param user 鐢ㄦ埛淇℃伅
+     * @param user     鐢ㄦ埛淇℃伅
      * @return 鍦ㄧ嚎鐢ㄦ埛淇℃伅
      */
     @Override
-    public SysUserOnline selectOnlineByInfo(String ipaddr, String userName, LoginUser user)
-    {
-        if (StringUtils.equals(ipaddr, user.getIpaddr()) && StringUtils.equals(userName, user.getUsername()))
-        {
+    public SysUserOnline selectOnlineByInfo(String ipaddr, String userName, LoginUser user) {
+        if (StringUtils.equals(ipaddr, user.getIpaddr()) && StringUtils.equals(userName, user.getUsername())) {
             return loginUserToUserOnline(user);
         }
         return null;
@@ -68,17 +68,16 @@
 
     /**
      * 璁剧疆鍦ㄧ嚎鐢ㄦ埛淇℃伅
-     * 
+     *
      * @param user 鐢ㄦ埛淇℃伅
      * @return 鍦ㄧ嚎鐢ㄦ埛
      */
     @Override
-    public SysUserOnline loginUserToUserOnline(LoginUser user)
-    {
-        if (StringUtils.isNull(user) || StringUtils.isNull(user.getUser()))
-        {
+    public SysUserOnline loginUserToUserOnline(LoginUser user) {
+        if (StringUtils.isNull(user)) {
             return null;
         }
+        SysUser sysUser = userService.selectUserById(user.getUserId());
         SysUserOnline sysUserOnline = new SysUserOnline();
         sysUserOnline.setTokenId(user.getToken());
         sysUserOnline.setUserName(user.getUsername());
@@ -87,9 +86,8 @@
         sysUserOnline.setBrowser(user.getBrowser());
         sysUserOnline.setOs(user.getOs());
         sysUserOnline.setLoginTime(user.getLoginTime());
-        if (StringUtils.isNotNull(user.getUser().getDept()))
-        {
-            sysUserOnline.setDeptName(user.getUser().getDept().getDeptName());
+        if (StringUtils.isNotNull(sysUser.getDept())) {
+            sysUserOnline.setDeptName(sysUser.getDept().getDeptName());
         }
         return sysUserOnline;
     }

--
Gitblit v1.9.3