fix: 报表导出取消使用CompletableFuture<Void>

@@ -178,8 +178,8 @@ public class TkReportGenerateRecordServiceImpl
 
 
   @Override
   @Override
   public void generateExcelUpdateReportRecord(ReportFormConfigDTO formConfigDTO,List<ExecuteAttributesDTO> executeAttributes,
   public void generateExcelUpdateReportRecord(ReportFormConfigDTO formConfigDTO,List<ExecuteAttributesDTO> executeAttributes,
-          String recordId) {
-    List<CompletableFuture<CustomDataForExcelDTO>> list = new ArrayList<>();
+          String recordId){
+    List<CustomDataForExcelDTO> list = new ArrayList<>();
     for(ExecuteAttributesDTO dto:executeAttributes){
     for(ExecuteAttributesDTO dto:executeAttributes){
       Long startTs = formConfigDTO.getQueryCondition().getStartTs();
       Long startTs = formConfigDTO.getQueryCondition().getStartTs();
       Long endTs = formConfigDTO.getQueryCondition().getEndTs();
       Long endTs = formConfigDTO.getQueryCondition().getEndTs();
@@ -191,29 +191,21 @@ public class TkReportGenerateRecordServiceImpl
       startTs = endTs - differenceTs;
       startTs = endTs - differenceTs;
       formConfigDTO.getQueryCondition().setStartTs(startTs);
       formConfigDTO.getQueryCondition().setStartTs(startTs);
       formConfigDTO.getQueryCondition().setEndTs(endTs);
       formConfigDTO.getQueryCondition().setEndTs(endTs);
-      list.add(getTsKvValuesOrGenerateExcel(formConfigDTO, dto));
+      CustomDataForExcelDTO result = getTsKvValuesOrGenerateExcel(formConfigDTO, dto).join();
+      list.add(result);
     }
     }
-    CompletableFuture<Void> future = CompletableFuture.allOf(list.toArray(new CompletableFuture[0]));
-    // 在所有异步任务完成后进行下一步处理
-    future.thenRun(() -> {
-      // 获取所有结果
-      List<CustomDataForExcelDTO> results = new ArrayList<>();
-      for (CompletableFuture<CustomDataForExcelDTO> futureResult : list) {
-        CustomDataForExcelDTO dto = futureResult.join();
-        results.add(dto);
-      }
-      ObjectNode executeCondition = JacksonUtil.newObjectNode();
-      QueryConditionDTO queryCondition = formConfigDTO.getQueryCondition();
-      executeCondition.replace(
-              FastIotConstants.CHART_EXECUTE_CONDITION,
-              JacksonUtil.convertValue(queryCondition, JsonNode.class));
-      executeCondition.replace(
-              FastIotConstants.CHART_EXECUTE_ATTRIBUTES,
-              JacksonUtil.convertValue(formConfigDTO.getExecuteAttributes(), JsonNode.class));
-      // 汇总所有数据,生成Excel并上传
-      generateExcelAndUpload(results,formConfigDTO.getName(),recordId,formConfigDTO.getTenantId(),
-              executeCondition);
-    });
+    // 获取所有结果
+    ObjectNode executeCondition = JacksonUtil.newObjectNode();
+    QueryConditionDTO queryCondition = formConfigDTO.getQueryCondition();
+    executeCondition.replace(
+            FastIotConstants.CHART_EXECUTE_CONDITION,
+            JacksonUtil.convertValue(queryCondition, JsonNode.class));
+    executeCondition.replace(
+            FastIotConstants.CHART_EXECUTE_ATTRIBUTES,
+            JacksonUtil.convertValue(formConfigDTO.getExecuteAttributes(), JsonNode.class));
+    // 汇总所有数据,生成Excel并上传
+    generateExcelAndUpload(list,formConfigDTO.getName(),recordId,formConfigDTO.getTenantId(),
+            executeCondition);
   }
   }
 
 
   private CompletableFuture<CustomDataForExcelDTO> getTsKvValuesOrGenerateExcel(
   private CompletableFuture<CustomDataForExcelDTO> getTsKvValuesOrGenerateExcel(