From 4b9ce145161497fee34615dff6e659b0fb33b8b5 Mon Sep 17 00:00:00 2001
From: hzj <826100833@qq.com>
Date: Wed, 6 Aug 2025 13:25:26 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E6=97=A5=E5=BF=97=E7=AD=89to?=
 =?UTF-8?q?pic=E4=B8=8D=E5=81=9A=E9=87=8D=E5=A4=8D=E6=B6=88=E8=B4=B9?=
 =?UTF-8?q?=E7=82=92=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../consumer/DeviceRunFlagDataConsumer.java        |  2 +-
 .../njcn/message/consumer/FrontDataConsumer.java   |  4 ++--
 .../message/consumer/FrontHeartBeatConsumer.java   | 14 +++++++-------
 .../message/consumer/RealTimeDataConsumer.java     |  4 ++--
 .../njcn/message/consumer/TopicLogsConsumer.java   | 14 +++++++-------
 .../njcn/message/consumer/TopicReplyConsumer.java  | 12 ++++++------
 6 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/message/message-boot/src/main/java/com/njcn/message/consumer/DeviceRunFlagDataConsumer.java b/message/message-boot/src/main/java/com/njcn/message/consumer/DeviceRunFlagDataConsumer.java
index 69386dd..e6df7ce 100644
--- a/message/message-boot/src/main/java/com/njcn/message/consumer/DeviceRunFlagDataConsumer.java
+++ b/message/message-boot/src/main/java/com/njcn/message/consumer/DeviceRunFlagDataConsumer.java
@@ -76,7 +76,7 @@ public class DeviceRunFlagDataConsumer extends EnhanceConsumerMessageHandler<Dev
      */
     @Override
     protected void consumeSuccess(DevComFlagDTO message) {
-        redisUtil.saveByKeyWithExpire(RedisKeyPrefix.DEVICE_RUN_FLAG.concat(message.getKey()), MessageStatus.SUCCESS, RedisKeyEnum.ROCKET_MQ_KEY.getTime());
+        redisUtil.saveByKeyWithExpire(RedisKeyPrefix.DEVICE_RUN_FLAG.concat(message.getKey()), MessageStatus.SUCCESS, 5*60L);
     }
 
 
diff --git a/message/message-boot/src/main/java/com/njcn/message/consumer/FrontDataConsumer.java b/message/message-boot/src/main/java/com/njcn/message/consumer/FrontDataConsumer.java
index 9cb4278..a60a78c 100644
--- a/message/message-boot/src/main/java/com/njcn/message/consumer/FrontDataConsumer.java
+++ b/message/message-boot/src/main/java/com/njcn/message/consumer/FrontDataConsumer.java
@@ -94,11 +94,11 @@ public class FrontDataConsumer extends EnhanceConsumerMessageHandler<MessageData
         return true;
     }
     /**
-     * 消费成功，缓存到redis72小时，避免重复消费
+     * 消费成功，缓存到redis5分钟，避免重复消费
      */
     @Override
     protected void consumeSuccess(MessageDataDTO message) {
-        redisUtil.saveByKeyWithExpire(RedisKeyPrefix.HARMMONIC_TOPIC.concat(message.getKey()), MessageStatus.SUCCESS, RedisKeyEnum.ROCKET_MQ_KEY.getTime());
+        redisUtil.saveByKeyWithExpire(RedisKeyPrefix.HARMMONIC_TOPIC.concat(message.getKey()), MessageStatus.SUCCESS, 5*60L);
     }
 
 
diff --git a/message/message-boot/src/main/java/com/njcn/message/consumer/FrontHeartBeatConsumer.java b/message/message-boot/src/main/java/com/njcn/message/consumer/FrontHeartBeatConsumer.java
index c46d68c..988aa35 100644
--- a/message/message-boot/src/main/java/com/njcn/message/consumer/FrontHeartBeatConsumer.java
+++ b/message/message-boot/src/main/java/com/njcn/message/consumer/FrontHeartBeatConsumer.java
@@ -55,7 +55,7 @@ public class FrontHeartBeatConsumer extends EnhanceConsumerMessageHandler<FrontH
     }
 
 
-
+    //本消息不需要控制重复消费
     /***
      * 通过redis分布式锁判断当前消息所处状态
      * 1、null 查不到该key的数据，属于第一次消费，放行
@@ -65,11 +65,11 @@ public class FrontHeartBeatConsumer extends EnhanceConsumerMessageHandler<FrontH
      */
     @Override
     public boolean filter(FrontHeartBeatDTO message) {
-        String keyStatus = redisUtil.getStringByKey(AppRedisKey.RMQ_CONSUME_KEY.concat(message.getKey()));
-        if (Objects.isNull(keyStatus) || keyStatus.equalsIgnoreCase(MessageStatus.FAIL)) {
-            redisUtil.saveByKeyWithExpire(RedisKeyPrefix.HEART_BEAT.concat(message.getKey()), MessageStatus.BEING_PROCESSED, 30L);
-            return false;
-        }
+//        String keyStatus = redisUtil.getStringByKey(AppRedisKey.RMQ_CONSUME_KEY.concat(message.getKey()));
+//        if (Objects.isNull(keyStatus) || keyStatus.equalsIgnoreCase(MessageStatus.FAIL)) {
+//            redisUtil.saveByKeyWithExpire(RedisKeyPrefix.HEART_BEAT.concat(message.getKey()), MessageStatus.BEING_PROCESSED, 30L);
+//            return false;
+//        }
         return true;
     }
     /**
@@ -77,7 +77,7 @@ public class FrontHeartBeatConsumer extends EnhanceConsumerMessageHandler<FrontH
      */
     @Override
     protected void consumeSuccess(FrontHeartBeatDTO message) {
-        redisUtil.saveByKeyWithExpire(RedisKeyPrefix.HEART_BEAT.concat(message.getKey()), MessageStatus.SUCCESS, RedisKeyEnum.ROCKET_MQ_KEY.getTime());
+//        redisUtil.saveByKeyWithExpire(RedisKeyPrefix.HEART_BEAT.concat(message.getKey()), MessageStatus.SUCCESS, RedisKeyEnum.ROCKET_MQ_KEY.getTime());
     }
 
 
diff --git a/message/message-boot/src/main/java/com/njcn/message/consumer/RealTimeDataConsumer.java b/message/message-boot/src/main/java/com/njcn/message/consumer/RealTimeDataConsumer.java
index 12ef05d..ec93a63 100644
--- a/message/message-boot/src/main/java/com/njcn/message/consumer/RealTimeDataConsumer.java
+++ b/message/message-boot/src/main/java/com/njcn/message/consumer/RealTimeDataConsumer.java
@@ -70,11 +70,11 @@ public class RealTimeDataConsumer extends EnhanceConsumerMessageHandler<MessageD
         return true;
     }
     /**
-     * 消费成功，缓存到redis72小时，避免重复消费
+     * 消费成功，缓存到redis5分钟，避免重复消费
      */
     @Override
     protected void consumeSuccess(MessageDataDTO message) {
-        redisUtil.saveByKeyWithExpire(RedisKeyPrefix.REAL_TIME_DATA.concat(message.getKey()), MessageStatus.SUCCESS, RedisKeyEnum.ROCKET_MQ_KEY.getTime());
+        redisUtil.saveByKeyWithExpire(RedisKeyPrefix.REAL_TIME_DATA.concat(message.getKey()), MessageStatus.SUCCESS, 5*60L);
     }
 
 
diff --git a/message/message-boot/src/main/java/com/njcn/message/consumer/TopicLogsConsumer.java b/message/message-boot/src/main/java/com/njcn/message/consumer/TopicLogsConsumer.java
index 4385a73..439a8a9 100644
--- a/message/message-boot/src/main/java/com/njcn/message/consumer/TopicLogsConsumer.java
+++ b/message/message-boot/src/main/java/com/njcn/message/consumer/TopicLogsConsumer.java
@@ -65,19 +65,19 @@ public class TopicLogsConsumer extends EnhanceConsumerMessageHandler<FrontLogslM
      */
     @Override
     public boolean filter(FrontLogslMessage message) {
-        String keyStatus = redisUtil.getStringByKey(AppRedisKey.RMQ_CONSUME_KEY.concat(message.getKey()));
-        if (Objects.isNull(keyStatus) || keyStatus.equalsIgnoreCase(MessageStatus.FAIL)) {
-            redisUtil.saveByKeyWithExpire(RedisKeyPrefix.TOPIC_REPLY.concat(message.getKey()), MessageStatus.BEING_PROCESSED, 30L);
-            return false;
-        }
-        return true;
+//        String keyStatus = redisUtil.getStringByKey(AppRedisKey.RMQ_CONSUME_KEY.concat(message.getKey()));
+//        if (Objects.isNull(keyStatus) || keyStatus.equalsIgnoreCase(MessageStatus.FAIL)) {
+//            redisUtil.saveByKeyWithExpire(RedisKeyPrefix.TOPIC_REPLY.concat(message.getKey()), MessageStatus.BEING_PROCESSED, 30L);
+//            return false;
+//        }
+        return false;
     }
     /**
      * 消费成功，缓存到redis72小时，避免重复消费
      */
     @Override
     protected void consumeSuccess(FrontLogslMessage message) {
-        redisUtil.saveByKeyWithExpire(RedisKeyPrefix.TOPIC_REPLY.concat(message.getKey()), MessageStatus.SUCCESS, RedisKeyEnum.ROCKET_MQ_KEY.getTime());
+//        redisUtil.saveByKeyWithExpire(RedisKeyPrefix.TOPIC_REPLY.concat(message.getKey()), MessageStatus.SUCCESS, RedisKeyEnum.ROCKET_MQ_KEY.getTime());
     }
 
 
diff --git a/message/message-boot/src/main/java/com/njcn/message/consumer/TopicReplyConsumer.java b/message/message-boot/src/main/java/com/njcn/message/consumer/TopicReplyConsumer.java
index 9acc3e8..f607230 100644
--- a/message/message-boot/src/main/java/com/njcn/message/consumer/TopicReplyConsumer.java
+++ b/message/message-boot/src/main/java/com/njcn/message/consumer/TopicReplyConsumer.java
@@ -64,12 +64,12 @@ public class TopicReplyConsumer extends EnhanceConsumerMessageHandler<TopicReply
      */
     @Override
     public boolean filter(TopicReplyDTO message) {
-        String keyStatus = redisUtil.getStringByKey(AppRedisKey.RMQ_CONSUME_KEY.concat(message.getKey()));
-        if (Objects.isNull(keyStatus) || keyStatus.equalsIgnoreCase(MessageStatus.FAIL)) {
-            redisUtil.saveByKeyWithExpire(RedisKeyPrefix.TOPIC_REPLY.concat(message.getKey()), MessageStatus.BEING_PROCESSED, 30L);
-            return false;
-        }
-        return true;
+//        String keyStatus = redisUtil.getStringByKey(AppRedisKey.RMQ_CONSUME_KEY.concat(message.getKey()));
+//        if (Objects.isNull(keyStatus) || keyStatus.equalsIgnoreCase(MessageStatus.FAIL)) {
+//            redisUtil.saveByKeyWithExpire(RedisKeyPrefix.TOPIC_REPLY.concat(message.getKey()), MessageStatus.BEING_PROCESSED, 30L);
+//            return false;
+//        }
+        return false;
     }
     /**
      * 消费成功，缓存到redis72小时，避免重复消费