合并分支 'event_fusion_dev' 到 'event_fusion'

【自定义专题】统计接口特殊处理，后续优化

查看合并请求 !14

src/main/java/com/zzsn/event/controller/SubjectManageController.java

@@ -142,6 +142,9 @@ public class SubjectManageController {
     @Value("${infoSource.commonLabel:}")
     private String commonSourceLabels;
 
+    @Value("${scheduling.yjzxEnable:false}")
+    Boolean yjzxEnable;
+
     /**
      * 专题列表-资讯转换时使用
      *
@@ -264,15 +267,17 @@ public class SubjectManageController {
      */
     @GetMapping(value = "/statisticInfo")
     private Result<?> statisticInfo(@RequestParam List<String> subjectIds) {
-        //List<SubjectStatisticInfo> statisticInfoList = subjectService.statisticInfo(subjectIds);
-        ////异步更新专题统计信息表的数据
-        //CompletableFuture.runAsync(() -> {
-        //    if (CollectionUtils.isNotEmpty(statisticInfoList)) {
-        //        subjectStatisticInfoService.batchModify(statisticInfoList);
-        //    }
-        //});
-        //return Result.OK(statisticInfoList);
-        return Result.OK(new ArrayList<>());
+        if(yjzxEnable){
+            return Result.OK(new ArrayList<>());
+        }
+        List<SubjectStatisticInfo> statisticInfoList = subjectService.statisticInfo(subjectIds);
+        //异步更新专题统计信息表的数据
+        CompletableFuture.runAsync(() -> {
+            if (CollectionUtils.isNotEmpty(statisticInfoList)) {
+                subjectStatisticInfoService.batchModify(statisticInfoList);
+            }
+        });
+        return Result.OK(statisticInfoList);
     }
 
     /**

src/main/java/com/zzsn/event/task/SubjectStatisticTask.java

@@ -32,8 +32,14 @@ public class SubjectStatisticTask {
     @Autowired
     private SubjectStatisticInfoService subjectStatisticInfoService;
 
-    //@Scheduled(cron = "0 30 0 * * ?")
+    @Value("${scheduling.yjzxEnable:false}")
+    Boolean yjzxEnable;
+
+    @Scheduled(cron = "0 30 0 * * ?")
     public void statistic() {
+        if(yjzxEnable){
+            return;
+        }
         LambdaQueryWrapper<Subject> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.select(Subject::getId).eq(Subject::getSubjectType, 1);
         List<Subject> list = subjectService.list(queryWrapper);