Merge remote-tracking branch 'origin/event_fusion' into event_fusion

src/main/java/com/zzsn/event/controller/common/InformationController.java

@@ -570,8 +570,8 @@ public class InformationController {
         if (StringUtils.isEmpty(subjectId) && CollectionUtils.isEmpty(ids)) {
             return Result.FAIL("专题id和资讯id集合不能同时为空");
         }
-        CompletableFuture.runAsync(() -> informationService.addToFavorites(searchCondition));
-        return Result.OK("资讯添加到精选中。。。");
+        informationService.addToFavorites(searchCondition);
+        return Result.OK();
     }
 
     /**
@@ -588,8 +588,8 @@ public class InformationController {
         if (StringUtils.isEmpty(subjectId) && CollectionUtils.isEmpty(ids)) {
             return Result.FAIL("专题id和资讯id集合不能同时为空");
         }
-        CompletableFuture.runAsync(() -> informationService.addToPend(searchCondition));
-        return Result.OK("资讯添加到待定中。。。");
+        informationService.addToPend(searchCondition);
+        return Result.OK();
     }
 
     /**
@@ -606,8 +606,8 @@ public class InformationController {
         if (StringUtils.isEmpty(subjectId) && CollectionUtils.isEmpty(ids)) {
             return Result.FAIL("专题id和资讯id集合不能同时为空");
         }
-        CompletableFuture.runAsync(() -> informationService.addToRemove(searchCondition));
-        return Result.OK("资讯添加到删除中。。。");
+        informationService.addToRemove(searchCondition);
+        return Result.OK();
     }
 
     /**
@@ -623,8 +623,8 @@ public class InformationController {
         if (StringUtils.isEmpty(subjectId)) {
             return Result.FAIL("专题id不能为空");
         }
-        CompletableFuture.runAsync(() -> informationService.initialData(searchCondition));
-        return Result.OK("数据初始化中。。。");
+        informationService.initialData(searchCondition);
+        return Result.OK();
     }
 
 
@@ -651,8 +651,8 @@ public class InformationController {
         if (CollectionUtils.isEmpty(searchWordList)) {
             return Result.FAIL("检索词不能为空");
         }
-        CompletableFuture.runAsync(() ->informationService.charReplace(searchCondition));
-        return Result.OK("数据替换中。。。");
+        informationService.charReplace(searchCondition);
+        return Result.OK();
     }
 
     /**
@@ -673,8 +673,8 @@ public class InformationController {
         if (CollectionUtils.isEmpty(markTags)) {
             return Result.FAIL("标签不能为空");
         }
-        CompletableFuture.runAsync(() -> informationService.markTag(searchCondition));
-        return Result.OK("批量打标中。。。");
+        informationService.markTag(searchCondition);
+        return Result.OK();
     }
 
     /**
@@ -695,8 +695,8 @@ public class InformationController {
         if (CollectionUtils.isEmpty(markTags)) {
             return Result.FAIL("标签不能为空");
         }
-        CompletableFuture.runAsync(() -> informationService.removeTag(searchCondition));
-        return Result.OK("批量删除标签中。。。");
+        informationService.removeTag(searchCondition);
+        return Result.OK();
     }