From 807176145fd1572c209931e03579dc3b916ea362 Mon Sep 17 00:00:00 2001 From: malx Date: Fri, 9 Dec 2022 03:35:38 +0800 Subject: [PATCH] x123 --- .../QuestionSettingRedisDelayQueueImpl.java | 5 ++--- .../questionSettingQueue/RedisDelayQueue.java | 14 +++++++++++--- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/web/src/main/java/com/ibeetl/jlw/service/questionSettingQueue/QuestionSettingRedisDelayQueueImpl.java b/web/src/main/java/com/ibeetl/jlw/service/questionSettingQueue/QuestionSettingRedisDelayQueueImpl.java index 1b173b94..231e3288 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/questionSettingQueue/QuestionSettingRedisDelayQueueImpl.java +++ b/web/src/main/java/com/ibeetl/jlw/service/questionSettingQueue/QuestionSettingRedisDelayQueueImpl.java @@ -14,8 +14,7 @@ import java.util.List; import java.util.stream.Collectors; import static com.ibeetl.jlw.enums.QuestionLogAddTypeEnum.PRE_SUBMIT; -import static com.ibeetl.jlw.service.questionSettingQueue.RedisDelayQueue.QuestionQueueTypeEnum.QUESTION_SETTING; - +import static com.ibeetl.jlw.service.questionSettingQueue.RedisDelayQueue.QuestionQueueTypeEnum.questionSetting; /** * 功能描述:
@@ -61,7 +60,7 @@ public class QuestionSettingRedisDelayQueueImpl extends RedisDelayQueue { // 为了走异步 - questionSettingRedisDelayQueue.loop(QUESTION_SETTING.name()); + questionSettingRedisDelayQueue.loop(questionSetting.name()); }).start(); } } diff --git a/web/src/main/java/com/ibeetl/jlw/service/questionSettingQueue/RedisDelayQueue.java b/web/src/main/java/com/ibeetl/jlw/service/questionSettingQueue/RedisDelayQueue.java index 53521541..227d9622 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/questionSettingQueue/RedisDelayQueue.java +++ b/web/src/main/java/com/ibeetl/jlw/service/questionSettingQueue/RedisDelayQueue.java @@ -5,10 +5,13 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.TypeReference; import com.ibeetl.admin.core.util.PlatformException; import lombok.Data; +import lombok.Getter; import lombok.RequiredArgsConstructor; +import lombok.Setter; import lombok.extern.slf4j.Slf4j; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.core.ZSetOperations; +import org.springframework.data.redis.serializer.RedisSerializer; import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.annotation.EnableAsync; @@ -32,10 +35,15 @@ public abstract class RedisDelayQueue { private ZSetOperations zSetOperations; public RedisDelayQueue(RedisTemplate redisTemplate) { + redisTemplate.setKeySerializer(RedisSerializer.string()); + redisTemplate.setValueSerializer(RedisSerializer.string()); + redisTemplate.setHashKeySerializer(RedisSerializer.string()); + redisTemplate.setHashValueSerializer(RedisSerializer.string()); zSetOperations = redisTemplate.opsForZSet(); } - @Data + @Setter + @Getter @RequiredArgsConstructor public static class QuestionSettingTaskItem { final public String id; @@ -43,7 +51,7 @@ public abstract class RedisDelayQueue { } public enum QuestionQueueTypeEnum { - QUESTION_SETTING + questionSetting } /** @@ -97,7 +105,7 @@ public abstract class RedisDelayQueue { */ public boolean isExists(String queueKey, String otherKey) { Set objects = zSetOperations.rangeByScore(queueKey, 0, -1); - return objects.stream().anyMatch(item -> JSON.parseObject(item.toString()).containsValue(otherKey)); + return objects.stream().anyMatch(item -> item.toString().contains(otherKey)); } /**