From b4048fbe80dba8e7756ae557a15ab60b4f80a44b Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 04 四月 2023 09:09:07 +0800
Subject: [PATCH] 合并开源主线
---
src/main/java/com/genersoft/iot/vmp/utils/redis/RedisUtil.java | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/utils/redis/RedisUtil.java b/src/main/java/com/genersoft/iot/vmp/utils/redis/RedisUtil.java
index 0034c39..e54ed53 100644
--- a/src/main/java/com/genersoft/iot/vmp/utils/redis/RedisUtil.java
+++ b/src/main/java/com/genersoft/iot/vmp/utils/redis/RedisUtil.java
@@ -1,12 +1,12 @@
package com.genersoft.iot.vmp.utils.redis;
-import java.util.*;
-import java.util.concurrent.TimeUnit;
-
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSONObject;
import com.genersoft.iot.vmp.utils.SpringBeanFactory;
import org.springframework.data.redis.core.*;
import org.springframework.util.CollectionUtils;
+
+import java.util.*;
+import java.util.concurrent.TimeUnit;
/**
* Redis宸ュ叿绫�
@@ -238,7 +238,7 @@
* @param time 鏃堕棿
* @return true / false
*/
- public static boolean hmset(String key, Map<Object, Object> map, long time) {
+ public static boolean hmset(String key, Map<?, ?> map, long time) {
if (redisTemplate == null) {
redisTemplate = SpringBeanFactory.getBean("redisTemplate");
}
@@ -881,7 +881,13 @@
return new ArrayList<>(resultKeys);
}
-
+ public static List<Object> scan2(String query) {
+ if (redisTemplate == null) {
+ redisTemplate = SpringBeanFactory.getBean("redisTemplate");
+ }
+ Set<String> keys = redisTemplate.keys(query);
+ return new ArrayList<>(keys);
+ }
// ============================== 娑堟伅鍙戦�佷笌璁㈤槄 ==============================
public static void convertAndSend(String channel, JSONObject msg) {
if (redisTemplate == null) {
--
Gitblit v1.8.0