Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev

疯狂的狮子li

2021-12-13 29c46a15f9cb4fa3ea0f417cca0ac76ff35bd135

 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;
    }