From d09ea16f466b15c330872dd59d1c9d4f1020ebfa Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期六, 04 二月 2023 14:46:05 +0800
Subject: [PATCH] fix 修复 SysUserMapper vo 泛型未更改 导致无法查询vo问题
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/monitor/CacheController.java | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/monitor/CacheController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/monitor/CacheController.java
index 85692b3..03fc761 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/monitor/CacheController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/monitor/CacheController.java
@@ -5,11 +5,13 @@
import com.ruoyi.common.core.constant.CacheConstants;
import com.ruoyi.common.core.constant.CacheNames;
import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.utils.JsonUtils;
+import com.ruoyi.common.core.utils.StreamUtils;
import com.ruoyi.common.core.utils.StringUtils;
+import com.ruoyi.common.json.utils.JsonUtils;
import com.ruoyi.common.redis.utils.CacheUtils;
import com.ruoyi.common.redis.utils.RedisUtils;
import com.ruoyi.system.domain.SysCache;
+import com.ruoyi.system.domain.vo.CacheListInfoVo;
import lombok.RequiredArgsConstructor;
import org.redisson.spring.data.connection.RedissonConnectionFactory;
import org.springframework.data.redis.connection.RedisConnection;
@@ -48,7 +50,7 @@
*/
@SaCheckPermission("monitor:cache:list")
@GetMapping()
- public R<Map<String, Object>> getInfo() throws Exception {
+ public R<CacheListInfoVo> getInfo() throws Exception {
RedisConnection connection = connectionFactory.getConnection();
Properties commandStats = connection.commands().info("commandstats");
@@ -62,11 +64,12 @@
pieList.add(data);
});
}
- return R.ok(Map.of(
- "info", connection.commands().info(),
- "dbSize", connection.commands().dbSize(),
- "commandStats", pieList
- ));
+
+ CacheListInfoVo infoVo = new CacheListInfoVo();
+ infoVo.setInfo(connection.commands().info());
+ infoVo.setDbSize(connection.commands().dbSize());
+ infoVo.setCommandStats(pieList);
+ return R.ok(infoVo);
}
/**
@@ -90,7 +93,7 @@
if (isCacheNames(cacheName)) {
Set<Object> keys = CacheUtils.keys(cacheName);
if (CollUtil.isNotEmpty(keys)) {
- cacheKeys = keys.stream().map(Object::toString).toList();
+ cacheKeys = StreamUtils.toList(keys, Object::toString);
}
} else {
cacheKeys = RedisUtils.keys(cacheName + "*");
--
Gitblit v1.9.3