|
@@ -4,6 +4,9 @@ import java.util.ArrayList;
|
|
|
import java.util.Collection;
|
|
import java.util.Collection;
|
|
|
import java.util.Collections;
|
|
import java.util.Collections;
|
|
|
import java.util.List;
|
|
import java.util.List;
|
|
|
|
|
+
|
|
|
|
|
+import com.alibaba.druid.support.json.JSONUtils;
|
|
|
|
|
+import com.alibaba.fastjson2.JSONObject;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.security.access.prepost.PreAuthorize;
|
|
import org.springframework.security.access.prepost.PreAuthorize;
|
|
|
import org.springframework.web.bind.annotation.DeleteMapping;
|
|
import org.springframework.web.bind.annotation.DeleteMapping;
|
|
@@ -25,7 +28,7 @@ import com.ygtx.system.service.ISysUserOnlineService;
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
* 在线用户监控
|
|
* 在线用户监控
|
|
|
- *
|
|
|
|
|
|
|
+ *
|
|
|
* @author ruoyi
|
|
* @author ruoyi
|
|
|
*/
|
|
*/
|
|
|
@RestController
|
|
@RestController
|
|
@@ -46,7 +49,13 @@ public class SysUserOnlineController extends BaseController
|
|
|
List<SysUserOnline> userOnlineList = new ArrayList<SysUserOnline>();
|
|
List<SysUserOnline> userOnlineList = new ArrayList<SysUserOnline>();
|
|
|
for (String key : keys)
|
|
for (String key : keys)
|
|
|
{
|
|
{
|
|
|
- LoginUser user = redisCache.getCacheObject(key);
|
|
|
|
|
|
|
+ Object userCache = redisCache.getCacheObject(key);
|
|
|
|
|
+ LoginUser user;
|
|
|
|
|
+ if(userCache instanceof LoginUser){
|
|
|
|
|
+ user = (LoginUser)userCache;
|
|
|
|
|
+ }else{
|
|
|
|
|
+ user = JSONObject.parseObject(userCache.toString(), LoginUser.class);
|
|
|
|
|
+ }
|
|
|
if (StringUtils.isNotEmpty(ipaddr) && StringUtils.isNotEmpty(userName))
|
|
if (StringUtils.isNotEmpty(ipaddr) && StringUtils.isNotEmpty(userName))
|
|
|
{
|
|
{
|
|
|
userOnlineList.add(userOnlineService.selectOnlineByInfo(ipaddr, userName, user));
|
|
userOnlineList.add(userOnlineService.selectOnlineByInfo(ipaddr, userName, user));
|