From b6472f34695dccdc88055b66cc54169e8366cb10 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期日, 04 四月 2021 11:27:42 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/JavaLionLi/RuoYi-Vue-Plus
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 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 67862a3..dda0dab 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,10 +1,11 @@
package com.ruoyi.system.service.impl;
-import org.springframework.stereotype.Service;
+import cn.hutool.core.lang.Validator;
+import cn.hutool.core.util.StrUtil;
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 org.springframework.stereotype.Service;
/**
* 鍦ㄧ嚎鐢ㄦ埛 鏈嶅姟灞傚鐞�
@@ -24,7 +25,7 @@
@Override
public SysUserOnline selectOnlineByIpaddr(String ipaddr, LoginUser user)
{
- if (StringUtils.equals(ipaddr, user.getIpaddr()))
+ if (StrUtil.equals(ipaddr, user.getIpaddr()))
{
return loginUserToUserOnline(user);
}
@@ -41,7 +42,7 @@
@Override
public SysUserOnline selectOnlineByUserName(String userName, LoginUser user)
{
- if (StringUtils.equals(userName, user.getUsername()))
+ if (StrUtil.equals(userName, user.getUsername()))
{
return loginUserToUserOnline(user);
}
@@ -59,7 +60,7 @@
@Override
public SysUserOnline selectOnlineByInfo(String ipaddr, String userName, LoginUser user)
{
- if (StringUtils.equals(ipaddr, user.getIpaddr()) && StringUtils.equals(userName, user.getUsername()))
+ if (StrUtil.equals(ipaddr, user.getIpaddr()) && StrUtil.equals(userName, user.getUsername()))
{
return loginUserToUserOnline(user);
}
@@ -75,7 +76,7 @@
@Override
public SysUserOnline loginUserToUserOnline(LoginUser user)
{
- if (StringUtils.isNull(user) && StringUtils.isNull(user.getUser()))
+ if (Validator.isNull(user) || Validator.isNull(user.getUser()))
{
return null;
}
@@ -87,7 +88,7 @@
sysUserOnline.setBrowser(user.getBrowser());
sysUserOnline.setOs(user.getOs());
sysUserOnline.setLoginTime(user.getLoginTime());
- if (StringUtils.isNotNull(user.getUser().getDept()))
+ if (Validator.isNotNull(user.getUser().getDept()))
{
sysUserOnline.setDeptName(user.getUser().getDept().getDeptName());
}
--
Gitblit v1.9.3