From e5b1876012fc76f7ea273fa35e1262b067891bac Mon Sep 17 00:00:00 2001
From: gaofw189 <gaofw189@chinatelecom.cn>
Date: 星期四, 02 二月 2023 18:24:32 +0800
Subject: [PATCH] 修复WVP作为下级平台接收上级平台DeviceControl信令不做处理的问题。-修改日志备注
---
src/main/java/com/genersoft/iot/vmp/utils/redis/RedisUtil.java | 17 ++---------------
1 files changed, 2 insertions(+), 15 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 c5be52c..50152cd 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
@@ -864,16 +864,12 @@
* @param query 鏌ヨ鍙傛暟
* @return
*/
- public static List<Object> scan(String query, Integer count) {
+ public static List<Object> scan(String query) {
if (redisTemplate == null) {
redisTemplate = SpringBeanFactory.getBean("redisTemplate");
}
Set<String> resultKeys = (Set<String>) redisTemplate.execute((RedisCallback<Set<String>>) connection -> {
- ScanOptions.ScanOptionsBuilder match = ScanOptions.scanOptions().match("*" + query + "*");
- if (count != null) {
- match.count(count);
- }
- ScanOptions scanOptions = match.build();
+ ScanOptions scanOptions = ScanOptions.scanOptions().match("*" + query + "*").count(1000).build();
Cursor<byte[]> scan = connection.scan(scanOptions);
Set<String> keys = new HashSet<>();
while (scan.hasNext()) {
@@ -884,15 +880,6 @@
});
return new ArrayList<>(resultKeys);
- }
-
- /**
- * 妯＄硦鏌ヨ
- * @param query 鏌ヨ鍙傛暟
- * @return
- */
- public static List<Object> scan(String query) {
- return scan(query, null);
}
// ============================== 娑堟伅鍙戦�佷笌璁㈤槄 ==============================
--
Gitblit v1.8.0