完成主要在线 session 的功能

src/main/java/cn/iocoder/dashboard/modules/system/service/auth/impl/SysUserSessionServiceImpl.java

@@ -1,19 +1,26 @@
 package cn.iocoder.dashboard.modules.system.service.auth.impl;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.StrUtil;
 import cn.iocoder.dashboard.common.pojo.PageResult;
 import cn.iocoder.dashboard.framework.security.config.SecurityProperties;
 import cn.iocoder.dashboard.framework.security.core.LoginUser;
 import cn.iocoder.dashboard.modules.system.controller.auth.vo.session.SysUserSessionPageReqVO;
 import cn.iocoder.dashboard.modules.system.dal.mysql.dao.auth.SysUserSessionMapper;
 import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.auth.SysUserSessionDO;
+import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.user.SysUserDO;
 import cn.iocoder.dashboard.modules.system.dal.redis.dao.auth.SysLoginUserRedisDAO;
 import cn.iocoder.dashboard.modules.system.service.auth.SysUserSessionService;
+import cn.iocoder.dashboard.modules.system.service.user.SysUserService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.Collection;
 import java.util.Date;
 
+import static cn.iocoder.dashboard.util.collection.CollectionUtils.convertSet;
+
 /**
  * 在线用户 Session Service 实现类
  *
@@ -27,10 +34,12 @@ public class SysUserSessionServiceImpl implements SysUserSessionService {
 
     @Resource
     private SysLoginUserRedisDAO loginUserRedisDAO;
-
     @Resource
     private SysUserSessionMapper userSessionMapper;
 
+    @Resource
+    private SysUserService userService;
+
     @Override
     public String createUserSession(LoginUser loginUser, String userIp, String userAgent) {
         // 生成 Session 编号
@@ -39,8 +48,8 @@ public class SysUserSessionServiceImpl implements SysUserSessionService {
         loginUser.setUpdateTime(new Date());
         loginUserRedisDAO.set(sessionId, loginUser);
         // 写入 DB 中
-        SysUserSessionDO userSession = SysUserSessionDO.builder().userId(loginUser.getId())
-                .userIp(userIp).userAgent(userAgent).build();
+        SysUserSessionDO userSession = SysUserSessionDO.builder().id(sessionId)
+                .userId(loginUser.getId()).userIp(userIp).userAgent(userAgent).build();
         userSessionMapper.insert(userSession);
         // 返回 Session 编号
         return sessionId;
@@ -59,7 +68,10 @@ public class SysUserSessionServiceImpl implements SysUserSessionService {
 
     @Override
     public void deleteUserSession(String sessionId) {
-
+        // 删除 Redis 缓存
+        loginUserRedisDAO.delete(sessionId);
+        // 删除 DB 记录
+        userSessionMapper.deleteById(sessionId);
     }
 
     @Override
@@ -74,7 +86,15 @@ public class SysUserSessionServiceImpl implements SysUserSessionService {
 
     @Override
     public PageResult<SysUserSessionDO> getUserSessionPage(SysUserSessionPageReqVO reqVO) {
-        return null;
+        // 处理基于用户昵称的查询
+        Collection<Long> userIds = null;
+        if (StrUtil.isNotEmpty(reqVO.getUsername())) {
+            userIds = convertSet(userService.listUsersByUsername(reqVO.getUsername()), SysUserDO::getId);
+            if (CollUtil.isEmpty(userIds)) {
+                return PageResult.empty();
+            }
+        }
+        return userSessionMapper.selectPage(reqVO, userIds);
     }
 
     /**

src/main/java/cn/iocoder/dashboard/modules/system/service/user/SysUserService.java

@@ -79,6 +79,14 @@ public interface SysUserService {
      */
     List<SysUserDO> listUsersByNickname(String nickname);
 
+    /**
+     * 获得用户列表，基于用户账号模糊匹配
+     *
+     * @param username 用户账号
+     * @return 用户列表
+     */
+    List<SysUserDO> listUsersByUsername(String username);
+
     /**
      * 创建用户
      *

src/main/java/cn/iocoder/dashboard/modules/system/service/user/SysUserServiceImpl.java

@@ -92,6 +92,11 @@ public class SysUserServiceImpl implements SysUserService {
         return userMapper.selectListByNickname(nickname);
     }
 
+    @Override
+    public List<SysUserDO> listUsersByUsername(String username) {
+        return userMapper.selectListByUsername(username);
+    }
+
     /**
      * 获得部门条件：查询指定部门的子部门编号们，包括自身
      *