Merge branch 'master_dev' into 'master'

fix: 报表导出存在数据异常的情况

See merge request yunteng/thingskit!270

@@ -12,4 +12,10 @@ public class CustomDataForExcelDTO {
   List<List<String>> sheetHeads;
   /** sheet的数据 */
   List<?> sheetData;
+
+  public CustomDataForExcelDTO(String sheetName, List<List<String>> sheetHeads, List<?> sheetData) {
+    this.sheetName = sheetName;
+    this.sheetHeads = sheetHeads;
+    this.sheetData = sheetData;
+  }
 }

@@ -48,8 +48,7 @@ import java.time.LocalDateTime;
 import java.time.ZoneOffset;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutionException;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 
 @Service
@@ -65,6 +64,7 @@ public class TkReportGenerateRecordServiceImpl
   private final TimeseriesService tsService;
   private final FileStorageService fileStorageService;
   private final UserOrganizationMappingService userOrganizationMappingService;
+  private volatile HashMap<String,List<CustomDataForExcelDTO>> excelReportMap = new HashMap<>();
 
   @Override
   public TkPageData<ReportGenerateRecordDTO> page(
@@ -179,11 +179,14 @@ public class TkReportGenerateRecordServiceImpl
   @Override
   public void generateExcelUpdateReportRecord(ReportFormConfigDTO formConfigDTO,List<ExecuteAttributesDTO> executeAttributes,
           String recordId){
-    List<CustomDataForExcelDTO> list = new ArrayList<>();
-    for(ExecuteAttributesDTO dto:executeAttributes){
-      Long startTs = formConfigDTO.getQueryCondition().getStartTs();
-      Long endTs = formConfigDTO.getQueryCondition().getEndTs();
-      //获取当前定时任务的执行时间,并计算新的开始时间、结束时间
+    String executeReportKey = formConfigDTO.getTenantId() + "_" + formConfigDTO.getName() + "_"
+            + System.currentTimeMillis();
+    //剩余执行次数
+    AtomicInteger remainTimes = new AtomicInteger(executeAttributes.size());
+    Long startTs = formConfigDTO.getQueryCondition().getStartTs();
+    Long endTs = formConfigDTO.getQueryCondition().getEndTs();
+    //如果是固定周期,均以执行定时任务的时间作为开始-结束时间
+    if (formConfigDTO.getQueryCondition().getQueryMode() == FastIotConstants.MagicNumber.ZERO){
       ReportGenerateRecordDTO recordDTO =
               findReportGenerateRecordById(recordId, formConfigDTO.getTenantId());
       long differenceTs = endTs - startTs;
@@ -191,26 +194,18 @@ public class TkReportGenerateRecordServiceImpl
       startTs = endTs - differenceTs;
       formConfigDTO.getQueryCondition().setStartTs(startTs);
       formConfigDTO.getQueryCondition().setEndTs(endTs);
-      CustomDataForExcelDTO result = getTsKvValuesOrGenerateExcel(formConfigDTO, dto).join();
-      list.add(result);
     }
-    // 获取所有结果
-    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);
+    for(ExecuteAttributesDTO dto:executeAttributes){
+      getTsKvValuesOrGenerateExcel(formConfigDTO, dto,executeReportKey,remainTimes,recordId);
+    }
   }
 
-  private CompletableFuture<CustomDataForExcelDTO> getTsKvValuesOrGenerateExcel(
+  private void getTsKvValuesOrGenerateExcel(
       ReportFormConfigDTO formConfigDTO,
-      ExecuteAttributesDTO dto) {
+      ExecuteAttributesDTO dto,
+      String executeReportKey,
+      AtomicInteger remainTimes,
+      String recordId) {
     QueryConditionDTO queryCondition = formConfigDTO.getQueryCondition();
     boolean useStrictDataTypes = queryCondition.isUseStrictDataTypes();
     Long interval = queryCondition.getInterval();
@@ -232,12 +227,10 @@ public class TkReportGenerateRecordServiceImpl
             .collect(Collectors.toList());
     queryCondition.setStartTs(finalStartTs);
     queryCondition.setEndTs(finalEndTs);
-    CustomDataForExcelDTO result = new CustomDataForExcelDTO();
     Futures.addCallback(
             tsService.findAll(tenantId, entityId, queries),
-            getTsKvListCallback(result, useStrictDataTypes, dto.getName(), keys),
+            getTsKvListCallback(useStrictDataTypes, dto.getName(), keys,executeReportKey,remainTimes,formConfigDTO,recordId),
             MoreExecutors.directExecutor());
-    return CompletableFuture.supplyAsync(()->result);
   }
 
   @Override
@@ -254,10 +247,13 @@ public class TkReportGenerateRecordServiceImpl
   }
 
   private FutureCallback<List<TsKvEntry>> getTsKvListCallback(
-      CustomDataForExcelDTO response,
       Boolean useStrictDataTypes,
       String deviceName,
-      List<String> keys) {
+      List<String> keys,
+      String executeReportKey,
+      AtomicInteger remainTimes,
+      ReportFormConfigDTO formConfigDTO,
+      String recordId) {
     return new FutureCallback<>() {
       @Override
       public void onSuccess(List<TsKvEntry> data) {
@@ -277,13 +273,44 @@ public class TkReportGenerateRecordServiceImpl
           }
         }
         generateExcelHeadAndValues(result, deviceName, heads, values);
-        response.setSheetName(deviceName);
-        response.setSheetHeads(heads);
-        response.setSheetData(values);
+        List<CustomDataForExcelDTO> list = excelReportMap.get(executeReportKey);
+        if(null == list){
+          list = new ArrayList<>();
+        }
+        list.add(new CustomDataForExcelDTO(deviceName,heads,values));
+        excelReportMap.put(executeReportKey,list);
+        if(remainTimes.get() == 1){
+          // 获取所有结果
+          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));
+          //移除数据
+          excelReportMap.remove(executeReportKey);
+          // 汇总所有数据,生成Excel并上传
+          generateExcelAndUpload(list,formConfigDTO.getName(),recordId,formConfigDTO.getTenantId(),
+                  executeCondition,true,null);
+        }else{
+          remainTimes.decrementAndGet();
+        }
       }
 
       @Override
       public void onFailure(@NotNull Throwable e) {
+        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));
+        generateExcelAndUpload(null,formConfigDTO.getName(),recordId,formConfigDTO.getTenantId(),
+                executeCondition,false,e.getMessage());
         log.error("Failed to fetch historical data", e);
       }
     };
@@ -339,15 +366,18 @@ public class TkReportGenerateRecordServiceImpl
       String reportFormName,
       String reportGenerateRecordId,
       String tenantId,
-      JsonNode executeCondition) {
+      JsonNode executeCondition,
+      boolean needUpload,
+      String errorMessage) {
     String response = null;
-    String errorMessage = null;
     int status = StatusEnum.SUCCESS.getIndex();
     try {
-      ByteArrayOutputStream byteArrayOutputStream = ExcelUtil.manySheetWrite(list);
-      String fileName = reportFormName + System.currentTimeMillis() + ".xlsx";
-      InputStream inputStream = new ByteArrayInputStream(byteArrayOutputStream.toByteArray());
-      response = fileStorageService.uploadFile(fileName, CONTENT_TYPE, inputStream);
+      if(needUpload){
+        ByteArrayOutputStream byteArrayOutputStream = ExcelUtil.manySheetWrite(list);
+        String fileName = reportFormName + System.currentTimeMillis() + ".xlsx";
+        InputStream inputStream = new ByteArrayInputStream(byteArrayOutputStream.toByteArray());
+        response = fileStorageService.uploadFile(fileName, CONTENT_TYPE, inputStream);
+      }
     } catch (Exception e) {
       errorMessage = e.getLocalizedMessage();
     }