fix: fix many to many device generate excel bug

黄 x
1 parent c495fa5b
Showing 6 changed files with 246 additions and 175 deletions
application/src/main/java/org/thingsboard/server/controller/yunteng/YtReportGenerateRecordController.java
common/data/src/main/java/org/thingsboard/server/common/data/yunteng/utils/ExcelUtil.java
dao/src/main/java/org/thingsboard/server/dao/util/yunteng/task/ReportTask.java
dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/YtReportFromConfigServiceImpl.java
dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/YtReportGenerateRecordServiceImpl.java
dao/src/main/java/org/thingsboard/server/dao/yunteng/service/YtReportGenerateRecordService.java
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/YtReportGenerateRecordController.java
View file @33b6d59
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/YtReportGenerateRecordController.java
View file @33b6d59
@@ -34,7 +34,7 @@ public class YtReportGenerateRecordController extends BaseController {
           @RequestParam(PAGE_SIZE) int pageSize,
           @RequestParam(PAGE) int page,
           @RequestParam(value = "reportConfigName", required = false) String reportConfigName,
-          @RequestParam(value = "status", required = false) Integer status,
+          @RequestParam(value = "executeStatus", required = false) Integer executeStatus,
           @RequestParam(value = ORDER_FILED, required = false) String orderBy,
           @RequestParam(value = ORDER_TYPE, required = false) OrderTypeEnum orderType)
           throws ThingsboardException {
@@ -44,7 +44,7 @@ public class YtReportGenerateRecordController extends BaseController {
     queryMap.put(PAGE, page);
     queryMap.put(ORDER_FILED, orderBy);
     queryMap.put("reportConfigName", reportConfigName);
-    queryMap.put("status", status);
+    queryMap.put("executeStatus", executeStatus);
     queryMap.put("tenantId", getCurrentUser().getCurrentTenantId());
     if (orderType != null) {
       queryMap.put(ORDER_TYPE, orderType.name());
--- a/common/data/src/main/java/org/thingsboard/server/common/data/yunteng/utils/ExcelUtil.java
View file @33b6d59
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/yunteng/utils/ExcelUtil.java
View file @33b6d59
 package org.thingsboard.server.common.data.yunteng.utils;
 import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelWriter;
+import com.alibaba.excel.write.metadata.WriteSheet;
 import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
@@ -17,6 +19,7 @@ import java.util.List;
 public class ExcelUtil {
   private ExcelUtil() {}
+
   public static void exportExcel(
       HttpServletResponse response,
       String fileName,
@@ -54,14 +57,26 @@ public class ExcelUtil {
     exportExcel(response, fileName, sheetName, targetList, targetClass);
   }
-  public static ByteArrayOutputStream noModelWrite(String fileName, List<List<String>> heads, List<?> data) {
+  public static ByteArrayOutputStream noModelWrite(
+      String fileName, List<List<String>> heads, List<?> data) {
     ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
     EasyExcel.write(byteArrayOutputStream)
-            .head(heads)
-            .sheet(fileName)
-            // 自适应列宽
-            .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
-            .doWrite(data);
+        .head(heads)
+        .sheet(fileName)
+        // 自适应列宽
+        .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
+        .doWrite(data);
     return byteArrayOutputStream;
   }
+
+  public static void noModelWrite(
+      ExcelWriter excelWriter,
+      List<List<String>> heads,
+      List<?> data,
+      int sheetNo,
+      String newSheetName) {
+    WriteSheet writeSheet = EasyExcel.writerSheet(sheetNo, newSheetName).head(heads).build();
+    excelWriter.write(data, writeSheet);
+  }
+
 }
--- a/dao/src/main/java/org/thingsboard/server/dao/util/yunteng/task/ReportTask.java
View file @33b6d59
+++ b/dao/src/main/java/org/thingsboard/server/dao/util/yunteng/task/ReportTask.java
View file @33b6d59
 package org.thingsboard.server.dao.util.yunteng.task;
-import com.google.common.util.concurrent.FutureCallback;
-import com.google.common.util.concurrent.Futures;
-import com.google.common.util.concurrent.MoreExecutors;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.jetbrains.annotations.NotNull;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;
-import org.springframework.web.context.request.async.DeferredResult;
-import org.thingsboard.common.util.JacksonUtil;
-import org.thingsboard.server.common.data.id.DeviceId;
-import org.thingsboard.server.common.data.id.TenantId;
-import org.thingsboard.server.common.data.kv.*;
 import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
-import org.thingsboard.server.common.data.yunteng.core.utils.FileStorageService;
 import org.thingsboard.server.common.data.yunteng.dto.ReportFormConfigDTO;
-import org.thingsboard.server.common.data.yunteng.dto.ReportGenerateRecordDTO;
-import org.thingsboard.server.common.data.yunteng.dto.report.BasicData;
 import org.thingsboard.server.common.data.yunteng.dto.request.ExecuteAttributesDTO;
-import org.thingsboard.server.common.data.yunteng.dto.request.QueryConditionDTO;
-import org.thingsboard.server.common.data.yunteng.enums.StatusEnum;
-import org.thingsboard.server.common.data.yunteng.utils.ExcelUtil;
-import org.thingsboard.server.dao.timeseries.TimeseriesService;
 import org.thingsboard.server.dao.yunteng.service.YtReportFormConfigService;
 import org.thingsboard.server.dao.yunteng.service.YtReportGenerateRecordService;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-import java.sql.Timestamp;
-import java.time.format.DateTimeFormatter;
 import java.util.*;
-import java.util.stream.Collectors;
 @Component("reportTask")
 @RequiredArgsConstructor
 @Slf4j
 public class ReportTask {
-  private static final String CONTENT_TYPE =
-      "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
   private final YtReportFormConfigService ytReportFormConfigService;
-  private final TimeseriesService tsService;
-  private final FileStorageService fileStorageService;
+
   private final YtReportGenerateRecordService ytReportGenerateRecordService;
   public void multipleParams(String s, Boolean b, Long l, Double d, Integer i) {
@@ -68,147 +40,22 @@ public class ReportTask {
       if (dtoList.size() == FastIotConstants.MagicNumber.ONE) {
         try {
           ExecuteAttributesDTO attributesDTO = dtoList.get(0);
-          getTsKv(formConfigDTO, attributesDTO, reportGenerateRecordId);
+          getTsKvForGenerateExcel(formConfigDTO, attributesDTO, reportGenerateRecordId);
         } catch (Exception e) {
           log.error(e.getMessage());
         }
       } else {
         for (ExecuteAttributesDTO dto : dtoList) {
-          getTsKv(formConfigDTO, dto, reportGenerateRecordId);
+          getTsKvForGenerateExcel(formConfigDTO, dto, reportGenerateRecordId);
         }
       }
     }
   }
-  private void getTsKv(
+  private void getTsKvForGenerateExcel(
       ReportFormConfigDTO formConfigDTO, ExecuteAttributesDTO dto, String reportGenerateRecordId) {
-    Long startTs = formConfigDTO.getStartTs();
-    Long endTs = formConfigDTO.getEndTs();
-    QueryConditionDTO queryCondition = formConfigDTO.getQueryCondition();
-    boolean useStrictDataTypes = queryCondition.isUseStrictDataTypes();
-    Long interval = queryCondition.getInterval();
-    int limit = queryCondition.getLimit();
-    Aggregation agg = queryCondition.getAgg();
-    String orderBy = queryCondition.getOrderBy();
-    List<String> keys = dto.getAttributes();
-    DeviceId entityId = DeviceId.fromString(dto.getDevice());
-    String reportTenantId = formConfigDTO.getTenantId();
-    TenantId tenantId = TenantId.fromUUID(UUID.fromString(reportTenantId));
-    final DeferredResult<ResponseEntity> result = new DeferredResult<>();
-    List<ReadTsKvQuery> queries =
-        keys.stream()
-            .map(key -> new BaseReadTsKvQuery(key, startTs, endTs, interval, limit, agg, orderBy))
-            .collect(Collectors.toList());
-
-    Futures.addCallback(
-        tsService.findAll(tenantId, entityId, queries),
-        getTsKvListCallback(
-            result,
-            useStrictDataTypes,
-            formConfigDTO.getName(),
-            dto.getName(),
-            reportGenerateRecordId,
-            reportTenantId),
-        MoreExecutors.directExecutor());
-  }
-
-  private FutureCallback<List<TsKvEntry>> getTsKvListCallback(
-      final DeferredResult<ResponseEntity> response,
-      Boolean useStrictDataTypes,
-      String reportFormName,
-      String deviceName,
-      String reportGenerateRecordId,
-      String tenantId) {
-    return new FutureCallback<>() {
-      @Override
-      public void onSuccess(List<TsKvEntry> data) {
-        Map<String, List<BasicData>> result = new LinkedHashMap<>();
-        for (TsKvEntry entry : data) {
-          Object value = useStrictDataTypes ? getKvValue(entry) : entry.getValueAsString();
-          result
-              .computeIfAbsent(entry.getKey(), k -> new ArrayList<>())
-              .add(new BasicData(entry.getTs(), value));
-        }
-        response.setResult(new ResponseEntity<>(result, HttpStatus.OK));
-        generateExcel(deviceName, reportFormName, result, reportGenerateRecordId, tenantId);
-      }
-
-      @Override
-      public void onFailure(@NotNull Throwable e) {
-        log.error("Failed to fetch historical data", e);
-      }
-    };
-  }
-
-  private Object getKvValue(KvEntry entry) {
-    if (entry.getDataType() == DataType.JSON) {
-      Optional<String> json = entry.getJsonValue();
-      return json.map(JacksonUtil::toJsonNode).orElse(null);
-    }
-    return entry.getValue();
-  }
-
-  private void generateExcel(
-      String deviceName,
-      String reportFormName,
-      Map<String, List<BasicData>> result,
-      String reportGenerateRecordId,
-      String tenantId) {
-    List<List<String>> heads = new ArrayList<>();
-    List<List<Object>> values = new ArrayList<>();
-    int firstKey = 0;
-    for (String key : result.keySet()) {
-      List<String> headValue = new ArrayList<>();
-      headValue.add(deviceName);
-      headValue.add(key + "采集值");
-      List<String> tsValue = new ArrayList<>();
-      tsValue.add(deviceName);
-      tsValue.add(key + "采集时间");
-      heads.add(headValue);
-      heads.add(tsValue);
-      List<BasicData> basicData = result.get(key);
-      for (int i = 0; i < basicData.size(); i++) {
-        BasicData item = basicData.get(i);
-        List<Object> listValue;
-        if (firstKey == 0) {
-          listValue = new ArrayList<>();
-        } else {
-          listValue = values.get(i);
-        }
-        Object value = item.getValue();
-        listValue.add(value);
-        DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-        Timestamp t = new Timestamp(item.getTs());
-        listValue.add(t.toLocalDateTime().format(dtf));
-        if (firstKey == 0) {
-          values.add(listValue);
-        }
-      }
-      firstKey++;
-    }
-    ByteArrayOutputStream byteArrayOutputStream =
-        ExcelUtil.noModelWrite(reportFormName, heads, values);
-    String fileName = reportFormName + System.currentTimeMillis() + ".xlsx";
-    int status = StatusEnum.SUCCESS.getIndex();
-    InputStream inputStream = new ByteArrayInputStream(byteArrayOutputStream.toByteArray());
-    String response = null;
-    try {
-      response = fileStorageService.uploadFile(fileName, CONTENT_TYPE, inputStream);
-    } catch (Exception e) {
-      log.error(e.getMessage());
-    }
-    ReportGenerateRecordDTO recordDTO =
-        ytReportGenerateRecordService.findReportGenerateRecordById(
-            reportGenerateRecordId, tenantId);
-    if (null != recordDTO) {
-      if (response != null) {
-        recordDTO.setReportPath(response);
-      } else {
-        status = StatusEnum.FAIL.getIndex();
-      }
-      recordDTO.setExecuteStatus(status);
-      ytReportGenerateRecordService.saveOrUpdateReportGenerateRecord(recordDTO);
-    }
+    ytReportGenerateRecordService.generateExcelUpdateReportRecord(
+        formConfigDTO, dto, reportGenerateRecordId);
   }
 }
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/YtReportFromConfigServiceImpl.java
View file @33b6d59
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/YtReportFromConfigServiceImpl.java
View file @33b6d59
@@ -24,6 +24,7 @@ import org.thingsboard.server.dao.yunteng.mapper.OrganizationMapper;
 import org.thingsboard.server.dao.yunteng.mapper.ReportFormConfigMapper;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
 import org.thingsboard.server.dao.yunteng.service.YtReportFormConfigService;
+import org.thingsboard.server.dao.yunteng.service.YtReportGenerateRecordService;
 import org.thingsboard.server.dao.yunteng.service.YtSysJobService;
 import java.util.*;
@@ -37,6 +38,7 @@ public class YtReportFromConfigServiceImpl
     implements YtReportFormConfigService {
   private final OrganizationMapper organizationMapper;
   private final YtSysJobService ytSysJobService;
+  private final YtReportGenerateRecordService ytReportGenerateRecordService;
   @Override
   public YtPageData<ReportFormConfigDTO> page(Map<String, Object> queryMap) {
@@ -161,7 +163,7 @@ public class YtReportFromConfigServiceImpl
   @Override
   public ReportFormConfigDTO findReportFormConfigById(String id) {
     return Optional.ofNullable(baseMapper.selectById(id))
-        .map(obj -> getReportFormConfigDTOByEntity(obj))
+        .map(this::getReportFormConfigDTOByEntity)
         .orElseThrow(
             () -> {
               throw new YtDataValidationException(ErrorMessage.INTERNAL_ERROR.getMessage());
@@ -174,6 +176,8 @@ public class YtReportFromConfigServiceImpl
     if (isNowExecute) {
       if (Objects.equals(reportFormConfig.getStatus(), StatusEnum.ENABLE.getIndex())) {
         // 立即执行报表生成，并创建一条报表执行记录
+        // 生成Excel,并更新报表执行记录
+        generateExcelUpdateReportRecord(reportFormConfig.getDTO(ReportFormConfigDTO.class));
       }
     } else {
       createSysJob(reportFormConfig);
@@ -195,7 +199,8 @@ public class YtReportFromConfigServiceImpl
         ytSysJobService.deleteJob(sysJobDTO);
         if (enableStatus) {
           // 立即执行报表生成，并创建一条报表执行记录
-          // TODO hxp
+          // 生成Excel,并更新报表执行记录
+          generateExcelUpdateReportRecord(reportFormConfig.getDTO(ReportFormConfigDTO.class));
         }
       } else {
         // 修改cron表达式
@@ -207,7 +212,8 @@ public class YtReportFromConfigServiceImpl
       if (isNowExecute) {
         if (enableStatus) {
           // 立即执行报表生成，并创建一条报表执行记录
-          // TODO hxp
+          // 生成Excel,并更新报表执行记录
+          generateExcelUpdateReportRecord(reportFormConfig.getDTO(ReportFormConfigDTO.class));
         }
       } else {
         createSysJob(reportFormConfig);
@@ -272,6 +278,7 @@ public class YtReportFromConfigServiceImpl
       for (JsonNode key : attribute) {
         attributes.add(JacksonUtil.convertValue(key, String.class));
       }
+      assert attributesDTO != null;
       attributesDTO.setAttributes(attributes);
       list.add(attributesDTO);
     }
@@ -281,4 +288,19 @@ public class YtReportFromConfigServiceImpl
     dto.setQueryCondition(queryCondition);
     return dto;
   }
+
+  private void generateExcelUpdateReportRecord(ReportFormConfigDTO reportFormConfigDTO) {
+    if (reportFormConfigDTO == null) {
+      throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
+    }
+    // 立即执行报表生成，并创建一条报表执行记录
+    ReportGenerateRecordDTO recordDTO =
+        ytReportGenerateRecordService.generateReportRecord(
+            reportFormConfigDTO.getId(), reportFormConfigDTO.getTenantId(), null);
+    // 生成Excel,并更新报表执行记录
+    for (ExecuteAttributesDTO dto : reportFormConfigDTO.getExecuteAttributes()) {
+      ytReportGenerateRecordService.generateExcelUpdateReportRecord(
+          reportFormConfigDTO, dto, recordDTO.getId());
+    }
+  }
 }
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/YtReportGenerateRecordServiceImpl.java
View file @33b6d59
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/YtReportGenerateRecordServiceImpl.java
View file @33b6d59
@@ -2,18 +2,36 @@ package org.thingsboard.server.dao.yunteng.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.google.common.util.concurrent.FutureCallback;
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.MoreExecutors;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.jetbrains.annotations.NotNull;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
+import org.springframework.web.context.request.async.DeferredResult;
+import org.thingsboard.common.util.JacksonUtil;
+import org.thingsboard.server.common.data.id.DeviceId;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.kv.*;
 import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
 import org.thingsboard.server.common.data.yunteng.core.exception.YtDataValidationException;
 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
+import org.thingsboard.server.common.data.yunteng.core.utils.FileStorageService;
 import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
 import org.thingsboard.server.common.data.yunteng.dto.OrganizationDTO;
 import org.thingsboard.server.common.data.yunteng.dto.ReportFormConfigDTO;
 import org.thingsboard.server.common.data.yunteng.dto.ReportGenerateRecordDTO;
+import org.thingsboard.server.common.data.yunteng.dto.report.BasicData;
+import org.thingsboard.server.common.data.yunteng.dto.request.ExecuteAttributesDTO;
+import org.thingsboard.server.common.data.yunteng.dto.request.QueryConditionDTO;
 import org.thingsboard.server.common.data.yunteng.enums.StatusEnum;
+import org.thingsboard.server.common.data.yunteng.utils.ExcelUtil;
 import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
+import org.thingsboard.server.dao.timeseries.TimeseriesService;
 import org.thingsboard.server.dao.yunteng.entities.ReportGenerateRecord;
 import org.thingsboard.server.dao.yunteng.mapper.ReportGenerateRecordMapper;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
@@ -21,18 +39,29 @@ import org.thingsboard.server.dao.yunteng.service.YtOrganizationService;
 import org.thingsboard.server.dao.yunteng.service.YtReportFormConfigService;
 import org.thingsboard.server.dao.yunteng.service.YtReportGenerateRecordService;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+import java.sql.Timestamp;
 import java.time.LocalDateTime;
-import java.util.Map;
-import java.util.Optional;
+import java.time.ZoneOffset;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
+import java.util.stream.Collectors;
 @Service
 @RequiredArgsConstructor
+@Slf4j
 public class YtReportGenerateRecordServiceImpl
     extends AbstractBaseService<ReportGenerateRecordMapper, ReportGenerateRecord>
     implements YtReportGenerateRecordService {
+  private static final String CONTENT_TYPE =
+      "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
   private final YtReportFormConfigService ytReportFormConfigService;
   private final YtOrganizationService ytOrganizationService;
+  private final TimeseriesService tsService;
+  private final FileStorageService fileStorageService;
   @Override
   public YtPageData<ReportGenerateRecordDTO> page(Map<String, Object> queryMap) {
@@ -42,8 +71,8 @@ public class YtReportGenerateRecordServiceImpl
         (LocalDateTime) Optional.ofNullable(queryMap.get("startTime")).orElse(null);
     LocalDateTime endTime =
         (LocalDateTime) Optional.ofNullable(queryMap.get("endTime")).orElse(null);
-    Integer status =
-        Optional.ofNullable(queryMap.get("status"))
+    Integer executeStatus =
+        Optional.ofNullable(queryMap.get("executeStatus"))
             .map(obj -> Integer.valueOf(obj.toString()))
             .orElse(null);
     IPage<ReportGenerateRecord> iPage =
@@ -54,7 +83,7 @@ public class YtReportGenerateRecordServiceImpl
                     StringUtils.isNotEmpty(reportConfigName),
                     ReportGenerateRecord::getReportConfigName,
                     reportConfigName)
-                .eq(null != status, ReportGenerateRecord::getExecuteStatus, status)
+                .eq(null != executeStatus, ReportGenerateRecord::getExecuteStatus, executeStatus)
                 .eq(ReportGenerateRecord::getTenantId, queryMap.get("tenantId").toString())
                 .between(
                     null != startTime && null != endTime,
@@ -126,4 +155,152 @@ public class YtReportGenerateRecordServiceImpl
     dto.setExecuteWay(reportFormConfigDTO.getExecuteWay());
     return saveOrUpdateReportGenerateRecord(dto);
   }
+
+  @Override
+  public void generateExcelUpdateReportRecord(
+      ReportFormConfigDTO formConfigDTO, ExecuteAttributesDTO dto, String recordId) {
+    Long startTs = formConfigDTO.getStartTs();
+    Long endTs = formConfigDTO.getEndTs();
+    QueryConditionDTO queryCondition = formConfigDTO.getQueryCondition();
+    boolean useStrictDataTypes = queryCondition.isUseStrictDataTypes();
+    Long interval = queryCondition.getInterval();
+    int limit = queryCondition.getLimit();
+    Aggregation agg = queryCondition.getAgg();
+    String orderBy = queryCondition.getOrderBy();
+    List<String> keys = dto.getAttributes();
+    DeviceId entityId = DeviceId.fromString(dto.getDevice());
+    String reportTenantId = formConfigDTO.getTenantId();
+    TenantId tenantId = TenantId.fromUUID(UUID.fromString(reportTenantId));
+    final DeferredResult<ResponseEntity> result = new DeferredResult<>();
+    // 如果报表配置是定时执行,获取当前定时任务的执行时间,并计算新的开始时间、结束时间
+    if (formConfigDTO.getExecuteWay() == FastIotConstants.MagicNumber.ONE) {
+      long differenceTs = endTs - startTs;
+      endTs = LocalDateTime.now().toInstant(ZoneOffset.of("+8")).toEpochMilli();
+      startTs = endTs - differenceTs;
+    }
+    Long finalStartTs = startTs;
+    Long finalEndTs = endTs;
+    List<ReadTsKvQuery> queries =
+        keys.stream()
+            .map(
+                key ->
+                    new BaseReadTsKvQuery(
+                        key, finalStartTs, finalEndTs, interval, limit, agg, orderBy))
+            .collect(Collectors.toList());
+
+    Futures.addCallback(
+        tsService.findAll(tenantId, entityId, queries),
+        getTsKvListCallback(
+            result,
+            useStrictDataTypes,
+            formConfigDTO.getName(),
+            dto.getName(),
+            recordId,
+            reportTenantId),
+        MoreExecutors.directExecutor());
+  }
+
+  private FutureCallback<List<TsKvEntry>> getTsKvListCallback(
+      final DeferredResult<ResponseEntity> response,
+      Boolean useStrictDataTypes,
+      String reportFormName,
+      String deviceName,
+      String reportGenerateRecordId,
+      String tenantId) {
+    return new FutureCallback<>() {
+      @Override
+      public void onSuccess(List<TsKvEntry> data) {
+        Map<String, List<BasicData>> result = new LinkedHashMap<>();
+        for (TsKvEntry entry : data) {
+          Object value = useStrictDataTypes ? getKvValue(entry) : entry.getValueAsString();
+          result
+              .computeIfAbsent(entry.getKey(), k -> new ArrayList<>())
+              .add(new BasicData(entry.getTs(), value));
+        }
+        response.setResult(new ResponseEntity<>(result, HttpStatus.OK));
+        generateExcel(deviceName, reportFormName, result, reportGenerateRecordId, tenantId);
+      }
+
+      @Override
+      public void onFailure(@NotNull Throwable e) {
+        log.error("Failed to fetch historical data", e);
+      }
+    };
+  }
+
+  private Object getKvValue(KvEntry entry) {
+    if (entry.getDataType() == DataType.JSON) {
+      Optional<String> json = entry.getJsonValue();
+      return json.map(JacksonUtil::toJsonNode).orElse(null);
+    }
+    return entry.getValue();
+  }
+
+  private void generateExcel(
+      String deviceName,
+      String reportFormName,
+      Map<String, List<BasicData>> result,
+      String reportGenerateRecordId,
+      String tenantId) {
+    List<List<String>> heads = new ArrayList<>();
+    List<List<Object>> values = new ArrayList<>();
+    int firstKey = 0;
+    for (String key : result.keySet()) {
+      List<String> headValue = new ArrayList<>();
+      headValue.add(deviceName);
+      headValue.add(key + "采集值");
+      List<String> tsValue = new ArrayList<>();
+      tsValue.add(deviceName);
+      tsValue.add(key + "采集时间");
+      heads.add(headValue);
+      heads.add(tsValue);
+      List<BasicData> basicData = result.get(key);
+      for (int i = 0; i < basicData.size(); i++) {
+        BasicData item = basicData.get(i);
+        List<Object> listValue;
+        if (firstKey == 0) {
+          listValue = new ArrayList<>();
+        } else {
+          listValue = values.get(i);
+        }
+        Object value = item.getValue();
+        listValue.add(value);
+        DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        Timestamp t = new Timestamp(item.getTs());
+        listValue.add(t.toLocalDateTime().format(dtf));
+        if (firstKey == 0) {
+          values.add(listValue);
+        }
+      }
+      firstKey++;
+    }
+    ByteArrayOutputStream byteArrayOutputStream =
+        ExcelUtil.noModelWrite(reportFormName, heads, values);
+    String fileName = reportFormName + System.currentTimeMillis() + ".xlsx";
+    int status = StatusEnum.SUCCESS.getIndex();
+    InputStream inputStream = new ByteArrayInputStream(byteArrayOutputStream.toByteArray());
+    String response = null;
+    try {
+      response = fileStorageService.uploadFile(fileName, CONTENT_TYPE, inputStream);
+    } catch (Exception e) {
+      log.error(e.getMessage());
+    }
+    ReportGenerateRecordDTO recordDTO =
+        findReportGenerateRecordById(reportGenerateRecordId, tenantId);
+    if (null != recordDTO) {
+      if (response != null) {
+        String reportPath = recordDTO.getReportPath();
+        if (null != reportPath) {
+          reportPath += "," + response;
+        } else {
+          reportPath = response;
+        }
+        recordDTO.setReportPath(reportPath);
+      } else {
+        status = StatusEnum.FAIL.getIndex();
+      }
+      recordDTO.setExecuteStatus(status);
+      saveOrUpdateReportGenerateRecord(recordDTO);
+    }
+  }
 }
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/service/YtReportGenerateRecordService.java
View file @33b6d59
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/service/YtReportGenerateRecordService.java
View file @33b6d59
 package org.thingsboard.server.dao.yunteng.service;
 import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
+import org.thingsboard.server.common.data.yunteng.dto.ReportFormConfigDTO;
 import org.thingsboard.server.common.data.yunteng.dto.ReportGenerateRecordDTO;
+import org.thingsboard.server.common.data.yunteng.dto.request.ExecuteAttributesDTO;
 import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
 import java.util.Map;
@@ -25,4 +27,12 @@ public interface YtReportGenerateRecordService {
    * @return 报表生成记录
    */
   ReportGenerateRecordDTO generateReportRecord(String sourceId, String tenantId, String jobId);
+
+  /**
+   * 生成报表记录
+   * @param formConfigDTO 报表配置
+   * @param dto 执行属性
+   * @param recordId recordId 记录ID
+   */
+  void generateExcelUpdateReportRecord(ReportFormConfigDTO formConfigDTO, ExecuteAttributesDTO dto, String recordId);
 }