From 5ca038d888922e93bf45c7bd37f3c6dce849dcff Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 24 十二月 2021 11:36:02 +0800
Subject: [PATCH] update 调整监控依赖 从 common 迁移到 framework
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 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 fd1384d..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,19 +1,25 @@
package com.ruoyi.system.service.impl;
-import cn.hutool.core.lang.Validator;
-import com.ruoyi.common.utils.StringUtils;
+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 {
+
+ @Autowired
+ private ISysUserService userService;
+
/**
* 閫氳繃鐧诲綍鍦板潃鏌ヨ淇℃伅
*
@@ -68,9 +74,10 @@
*/
@Override
public SysUserOnline loginUserToUserOnline(LoginUser user) {
- if (Validator.isNull(user) || Validator.isNull(user.getUser())) {
+ if (StringUtils.isNull(user)) {
return null;
}
+ SysUser sysUser = userService.selectUserById(user.getUserId());
SysUserOnline sysUserOnline = new SysUserOnline();
sysUserOnline.setTokenId(user.getToken());
sysUserOnline.setUserName(user.getUsername());
@@ -79,8 +86,8 @@
sysUserOnline.setBrowser(user.getBrowser());
sysUserOnline.setOs(user.getOs());
sysUserOnline.setLoginTime(user.getLoginTime());
- if (Validator.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