Merge remote-tracking branch 'origin/v2.3.1' into dev

community-service/src/main/java/com/tanpu/community/manager/ConJobManager.java

 package com.tanpu.community.manager;
 
+import com.tanpu.common.redis.RedisHelper;
+import com.tanpu.common.uuid.UuidGenHelper;
 import com.tanpu.community.service.*;
 import com.tanpu.community.service.quartz.TopicReportService;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+import java.time.Duration;
+
 @Slf4j
 @Service
 @Configuration
@@ -31,6 +37,12 @@ public class ConJobManager {
     @Autowired
     private TopicReportService topicReportService;
 
+    @Resource
+    private RedisHelper redisHelper;
+
+    @Resource
+    private UuidGenHelper uuidGenHelper;
+
     /**
      * 定时统计 话题 访问数据，并刷到redis
      */
@@ -72,16 +84,46 @@ public class ConJobManager {
      */
     @Scheduled(cron = "0 30 9 ? * *")
     public void reportTopicWeekday() {
+        String key = "community:lock:reportTopicWeekday";
+        String uuid = uuidGenHelper.getUuidStr();
+        Boolean locked = null;
+        try {
+            locked = redisHelper.setIfAbsent(key, uuid, Duration.ofSeconds(60));
+            if (locked) {
                 log.info("reportTopicWeekday start");
                 topicReportService.reportTopicWeekday();
             }
+        } finally {
+            if (Boolean.TRUE.equals(locked)) {
+                String value = redisHelper.get(key);
+                if (StringUtils.equals(uuid, value)) {
+                    redisHelper.delete(key);
+                }
+            }
+        }
+    }
 
     /**
      * 每周六早上09:00汇报 topic数据
      */
     @Scheduled(cron = "0 0 9 ? * SAT")
     public void reportTopicSaturday() {
+        String key = "community:lock:reportTopicSaturday";
+        String uuid = uuidGenHelper.getUuidStr();
+        Boolean locked = null;
+        try {
+            locked = redisHelper.setIfAbsent(key, uuid, Duration.ofSeconds(60));
+            if (locked) {
                 log.info("reportTopicSaturday start");
                 topicReportService.reportTopicSaturday();
             }
+        } finally {
+            if (Boolean.TRUE.equals(locked)) {
+                String value = redisHelper.get(key);
+                if (StringUtils.equals(uuid, value)) {
+                    redisHelper.delete(key);
+                }
+            }
+        }
+    }
 }