From ab9bc35f9f3e6fe2e57fe054aa0dc898fe9a8d2c Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 02 九月 2021 15:45:57 +0800
Subject: [PATCH] update MP字段验证策略更改为 NOT_NULL 个别特殊字段使用注解单独处理
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java
index 8c06d01..f1442cc 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java
@@ -1,7 +1,5 @@
package com.ruoyi.web.controller.monitor;
-import cn.hutool.core.lang.Validator;
-import cn.hutool.core.util.StrUtil;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.core.controller.BaseController;
@@ -10,6 +8,8 @@
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.PageUtils;
+import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.domain.SysUserOnline;
import com.ruoyi.system.service.ISysUserOnlineService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -23,7 +23,7 @@
/**
* 鍦ㄧ嚎鐢ㄦ埛鐩戞帶
- *
+ *
* @author ruoyi
*/
@RestController
@@ -45,23 +45,23 @@
for (String key : keys)
{
LoginUser user = redisCache.getCacheObject(key);
- if (Validator.isNotEmpty(ipaddr) && Validator.isNotEmpty(userName))
+ if (StringUtils.isNotEmpty(ipaddr) && StringUtils.isNotEmpty(userName))
{
- if (StrUtil.equals(ipaddr, user.getIpaddr()) && StrUtil.equals(userName, user.getUsername()))
+ if (StringUtils.equals(ipaddr, user.getIpaddr()) && StringUtils.equals(userName, user.getUsername()))
{
userOnlineList.add(userOnlineService.selectOnlineByInfo(ipaddr, userName, user));
}
}
- else if (Validator.isNotEmpty(ipaddr))
+ else if (StringUtils.isNotEmpty(ipaddr))
{
- if (StrUtil.equals(ipaddr, user.getIpaddr()))
+ if (StringUtils.equals(ipaddr, user.getIpaddr()))
{
userOnlineList.add(userOnlineService.selectOnlineByIpaddr(ipaddr, user));
}
}
- else if (Validator.isNotEmpty(userName) && Validator.isNotNull(user.getUser()))
+ else if (StringUtils.isNotEmpty(userName) && StringUtils.isNotNull(user.getUser()))
{
- if (StrUtil.equals(userName, user.getUsername()))
+ if (StringUtils.equals(userName, user.getUsername()))
{
userOnlineList.add(userOnlineService.selectOnlineByUserName(userName, user));
}
@@ -73,7 +73,7 @@
}
Collections.reverse(userOnlineList);
userOnlineList.removeAll(Collections.singleton(null));
- return getDataTable(userOnlineList);
+ return PageUtils.buildDataInfo(userOnlineList);
}
/**
--
Gitblit v1.9.3