Merge remote-tracking branch 'origin/master'

aijinhui

2023-10-16 59fcc48c8589b9df2af744fd6c77854061a52f54

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java

@@ -1,9 +1,7 @@
package com.ruoyi.web.controller.monitor;

import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.*;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.DeleteMapping;
@@ -75,6 +73,9 @@
        }
        Collections.reverse(userOnlineList);
        userOnlineList.removeAll(Collections.singleton(null));
        //在线用户按登录时间逆序排序
        Comparator<SysUserOnline> comparator = Comparator.comparingLong(sysUserOnline -> sysUserOnline.getLoginTime()); // 使用Collections.sort方法进行排序 Collections.sort(personList, comparator);
        Collections.sort(userOnlineList, comparator.reversed());
        return getDataTable(userOnlineList);
    }