fix: fix bug [DEFECT-591]

@@ -23,6 +23,7 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.service.YtReportFormConfigService;
 
+import java.sql.Timestamp;
 import java.util.HashMap;
 
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
@@ -45,6 +46,8 @@ public class YtReportFormConfigController extends BaseController {
       @RequestParam(value = "name", required = false) String name,
       @RequestParam(value = "organizationId", required = false) String organizationId,
       @RequestParam(value = "status", required = false) Integer status,
+      @RequestParam(value = "startTime", required = false) Long startTime,
+      @RequestParam(value = "endTime", required = false) Long endTime,
       @RequestParam(value = ORDER_FILED, required = false) String orderBy,
       @RequestParam(value = ORDER_TYPE, required = false) OrderTypeEnum orderType)
       throws ThingsboardException {
@@ -60,6 +63,14 @@ public class YtReportFormConfigController extends BaseController {
     if (orderType != null) {
       queryMap.put(ORDER_TYPE, orderType.name());
     }
+    if (null != startTime && null != endTime) {
+      if (startTime > endTime) {
+        throw new YtDataValidationException(
+            ErrorMessage.START_TIME_NOT_MORE_THAN_END_TIME.getMessage());
+      }
+      queryMap.put("startTime", new Timestamp(startTime).toLocalDateTime());
+      queryMap.put("endTime", new Timestamp(endTime).toLocalDateTime());
+    }
     return reportFormConfigService.page(queryMap);
   }
 

 package org.thingsboard.server.controller.yunteng;
 
+import com.fasterxml.jackson.databind.JsonNode;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
+import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.yunteng.common.DeleteGroup;
 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.dto.DeleteDTO;
 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.dto.request.QueryConditionDTO;
 import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum;
 import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult;
 import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
 import org.thingsboard.server.controller.BaseController;
+import org.thingsboard.server.dao.yunteng.service.YtReportFormConfigService;
 import org.thingsboard.server.dao.yunteng.service.YtReportGenerateRecordService;
 
+import java.sql.Timestamp;
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
 
@@ -28,18 +41,31 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
 public class YtReportGenerateRecordController extends BaseController {
 
   private final YtReportGenerateRecordService reportFormGenerateRecordService;
+  private final YtReportFormConfigService ytReportFormConfigService;
 
   @GetMapping(params = {PAGE_SIZE, PAGE})
+  @ApiOperation("分页")
   public YtPageData<ReportGenerateRecordDTO> page(
-          @RequestParam(PAGE_SIZE) int pageSize,
-          @RequestParam(PAGE) int page,
-          @RequestParam(value = "reportConfigName", required = false) String reportConfigName,
-          @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 {
+      @RequestParam(PAGE_SIZE) int pageSize,
+      @RequestParam(PAGE) int page,
+      @RequestParam(value = "reportConfigName", required = false) String reportConfigName,
+      @RequestParam(value = "executeStatus", required = false) Integer executeStatus,
+      @RequestParam(value = "startTime", required = false) Long startTime,
+      @RequestParam(value = "endTime", required = false) Long endTime,
+      @RequestParam(value = ORDER_FILED, required = false) String orderBy,
+      @RequestParam(value = ORDER_TYPE, required = false) OrderTypeEnum orderType)
+      throws ThingsboardException {
 
     HashMap<String, Object> queryMap = new HashMap<>();
+    if (null != startTime && null != endTime) {
+      if (startTime > endTime) {
+        throw new YtDataValidationException(
+            ErrorMessage.START_TIME_NOT_MORE_THAN_END_TIME.getMessage());
+      }
+
+      queryMap.put("startTime", new Timestamp(startTime).toLocalDateTime());
+      queryMap.put("endTime", new Timestamp(endTime).toLocalDateTime());
+    }
     queryMap.put(PAGE_SIZE, pageSize);
     queryMap.put(PAGE, page);
     queryMap.put(ORDER_FILED, orderBy);
@@ -53,10 +79,34 @@ public class YtReportGenerateRecordController extends BaseController {
   }
 
   @DeleteMapping
+  @ApiOperation("删除")
   public ResponseResult<Boolean> deleteReportGenerateRecord(
-          @Validated({DeleteGroup.class}) @RequestBody DeleteDTO deleteDTO) {
+      @Validated({DeleteGroup.class}) @RequestBody DeleteDTO deleteDTO) {
     return reportFormGenerateRecordService.deleteReportGenerateRecord(deleteDTO)
-            ? ResponseResult.success(FastIotConstants.StateValue.DELETE_SUCCESS)
-            : ResponseResult.failed(FastIotConstants.StateValue.DELETE_FAILED);
+        ? ResponseResult.success(FastIotConstants.StateValue.DELETE_SUCCESS)
+        : ResponseResult.failed(FastIotConstants.StateValue.DELETE_FAILED);
+  }
+
+  @GetMapping("chart/{id}")
+  @ApiOperation("获取报表查询条件")
+  public ResponseEntity getChartQueryCondition(@PathVariable("id") String id)
+      throws ThingsboardException {
+
+    Map<String, Object> map = new HashMap<>();
+    JsonNode json =
+        reportFormGenerateRecordService.getChartQueryCondition(
+            id, getCurrentUser().getCurrentTenantId());
+    if (json != null) {
+      QueryConditionDTO queryConditionDTO =
+          JacksonUtil.convertValue(
+              json.get(FastIotConstants.CHART_EXECUTE_CONDITION), QueryConditionDTO.class);
+      List<ExecuteAttributesDTO> list = new ArrayList<>();
+      ytReportFormConfigService.getExecuteConditionAndAttribute(
+          json.get(FastIotConstants.CHART_EXECUTE_ATTRIBUTES), list);
+
+      map.put(FastIotConstants.CHART_EXECUTE_CONDITION, queryConditionDTO);
+      map.put(FastIotConstants.CHART_EXECUTE_ATTRIBUTES, list);
+    }
+    return ResponseEntity.ok(map);
   }
 }

@@ -9,6 +9,8 @@ public interface FastIotConstants {
   Integer MOBILE_TYPE = 0;
   Integer PC_TYPE = 1;
   String FIRST_PAGE_NAME = "第 1 页";
+  String CHART_EXECUTE_CONDITION = "executeCondition";
+  String CHART_EXECUTE_ATTRIBUTES = "executeAttributes";
   class DefaultOrder {
     public static final String CREATE_TIME="create_time";
   }

@@ -71,6 +71,7 @@ public enum ErrorMessage {
   INVALID_PARAMETER_OR_NOT_MATCH_TENANT(400051,"参数错误或该条数据不属于当前租户"),
   CRON_INVALID(400052,"cron表达式无效"),
   EXPORT_CONFIG_NON_EXISTENT(400053,"报表配置不存在或已被删除"),
+  START_TIME_NOT_MORE_THAN_END_TIME(400054,"开始时间不能大于结束时间"),
   HAVE_NO_PERMISSION(500002,"没有修改权限");
   private final int code;
   private String message;

 package org.thingsboard.server.common.data.yunteng.dto;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -38,25 +39,14 @@ public class ReportFormConfigDTO extends TenantDTO {
 
   /** 设备：json数组格式 */
   @ApiModelProperty(value = "执行设备及属性", required = true)
-  @Size(message = "至少需要一个执行设备及属性", min = 1,groups = AddGroup.class)
+  @Size(message = "至少需要一个执行设备及属性", min = 1, groups = AddGroup.class)
   private List<ExecuteAttributesDTO> executeAttributes;
 
-
   /** 数据类型：0历史数据 1聚合数据 */
   @ApiModelProperty(value = "数据类型：0原始数据 1聚合数据", required = true)
   @NotNull(message = "数据类型不能为空", groups = AddGroup.class)
   private Integer dataType;
 
-  /** 数据周期：单位毫秒 */
-  @ApiModelProperty(value = "开始时间", required = true)
-  @NotNull(message = "开始时间不能为空", groups = AddGroup.class)
-  private Long startTs;
-
-  /** 时间间隔：单位毫秒 */
-  @ApiModelProperty(value = "结束时间", required = true)
-  @NotNull(message = "结束时间不能为空", groups = AddGroup.class)
-  private Long endTs ;
-
   @ApiModelProperty(value = "查询条件", required = true)
   @NotNull(message = "查询条件不能为空", groups = AddGroup.class)
   private QueryConditionDTO queryCondition;

 package org.thingsboard.server.common.data.yunteng.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
 import io.swagger.annotations.ApiModelProperty;
@@ -35,6 +36,9 @@ public class ReportGenerateRecordDTO extends TenantDTO {
   @ApiModelProperty(value = "报表导出地址")
   private String reportPath;
 
+  @ApiModelProperty(value = "执行条件")
+  private JsonNode executeCondition;
+
   @ApiModelProperty(value = "定时任务ID")
   private String jobId;
 }

@@ -13,6 +13,9 @@ public class ChartReportDTO {
   /** 报表查询：结束时间 */
   private Long endTs;
 
+  /** 报表配置名称 */
+  private String reportFormName;
+
   /** 查询返回的数据 */
   private List<ReportDataSourceDTO> data;
 }

@@ -4,6 +4,9 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.thingsboard.server.common.data.kv.Aggregation;
+import org.thingsboard.server.common.data.yunteng.common.AddGroup;
+
+import javax.validation.constraints.NotNull;
 
 @Data
 @ApiModel(value = "查询条件")
@@ -22,4 +25,14 @@ public class QueryConditionDTO {
 
   @ApiModelProperty("启用/禁用遥测值到字符串的转换。默认情况下启用转换。设置参数为'true'以禁用转换")
   private boolean useStrictDataTypes;
+
+  /** 数据周期：单位毫秒 */
+  @ApiModelProperty(value = "开始时间", required = true)
+  @NotNull(message = "开始时间不能为空", groups = AddGroup.class)
+  private Long startTs;
+
+  /** 时间间隔：单位毫秒 */
+  @ApiModelProperty(value = "结束时间", required = true)
+  @NotNull(message = "结束时间不能为空", groups = AddGroup.class)
+  private Long endTs ;
 }

 package org.thingsboard.server.dao.util.yunteng;
 
 import org.apache.commons.lang3.StringUtils;
+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.enums.JobGroupEnum;
 import org.thingsboard.server.common.data.yunteng.utils.SpringBeanUtils;
 import org.thingsboard.server.dao.yunteng.entities.SysJob;
+import org.thingsboard.server.dao.yunteng.service.YtReportFormConfigService;
 import org.thingsboard.server.dao.yunteng.service.YtReportGenerateRecordService;
 
 import java.lang.reflect.InvocationTargetException;
@@ -27,9 +29,12 @@ public class JobInvokeUtil {
     if (StringUtils.isNotEmpty(sysJob.getSourceId())
         && sysJob.getJobGroup().equals(JobGroupEnum.REPORT.toString())) {
       // 写入报表生成记录
+      ReportFormConfigDTO formConfigDTO =
+          SpringBeanUtils.getBean(YtReportFormConfigService.class)
+              .findReportFormConfigById(sysJob.getSourceId(), sysJob.getTenantId());
       ReportGenerateRecordDTO dto =
           SpringBeanUtils.getBean(YtReportGenerateRecordService.class)
-              .generateReportRecord(sysJob.getSourceId(), sysJob.getTenantId(), sysJob.getId());
+              .generateReportRecord(formConfigDTO, sysJob.getId());
       reportGenerateRecordId = dto.getId();
     }
     List<Object[]> methodParams = getMethodParams(invokeTarget, reportGenerateRecordId);

@@ -40,22 +40,28 @@ public class ReportTask {
       if (dtoList.size() == FastIotConstants.MagicNumber.ONE) {
         try {
           ExecuteAttributesDTO attributesDTO = dtoList.get(0);
-          getTsKvForGenerateExcel(formConfigDTO, attributesDTO, reportGenerateRecordId);
+          getTsKvForGenerateExcel(
+              formConfigDTO, attributesDTO, reportGenerateRecordId, dtoList.size());
 
         } catch (Exception e) {
           log.error(e.getMessage());
         }
       } else {
+        int surplus = dtoList.size();
         for (ExecuteAttributesDTO dto : dtoList) {
-          getTsKvForGenerateExcel(formConfigDTO, dto, reportGenerateRecordId);
+          getTsKvForGenerateExcel(formConfigDTO, dto, reportGenerateRecordId, surplus);
+          surplus--;
         }
       }
     }
   }
 
   private void getTsKvForGenerateExcel(
-      ReportFormConfigDTO formConfigDTO, ExecuteAttributesDTO dto, String reportGenerateRecordId) {
+      ReportFormConfigDTO formConfigDTO,
+      ExecuteAttributesDTO dto,
+      String reportGenerateRecordId,
+      int surplus) {
     ytReportGenerateRecordService.generateExcelUpdateReportRecord(
-        formConfigDTO, dto, reportGenerateRecordId);
+        formConfigDTO, dto, reportGenerateRecordId, surplus);
   }
 }

@@ -36,12 +36,6 @@ public class ReportFormConfig extends TenantBaseEntity {
   /** 数据对比：0原始数据 1聚合数据 */
   private Integer dataType;
 
-  /** 查询开始时间：单位毫秒 */
-  private Long startTs;
-
-  /** 查询结束时间：单位毫秒 */
-  private Long endTs ;
-
   @TableField(typeHandler = JacksonTypeHandler.class)
   private JsonNode queryCondition;
 

 package org.thingsboard.server.dao.yunteng.entities;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
+import com.fasterxml.jackson.databind.JsonNode;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.thingsboard.server.common.data.yunteng.constant.ModelConstants;
@@ -32,6 +35,10 @@ public class ReportGenerateRecord extends TenantBaseEntity {
   /** 报表导出地址 */
   private String reportPath;
 
+  /** 执行条件 */
+  @TableField(typeHandler = JacksonTypeHandler.class)
+  private JsonNode executeCondition;
+
   /** 定时任务ID */
   private String jobId;
 }

@@ -200,6 +200,10 @@ public class SysJobServiceImpl extends AbstractBaseService<SysJobMapper, SysJob>
     } else {
       SysJob job = baseMapper.selectById(jobDTO.getId());
       SysJob newJob = jobDTO.getEntity(SysJob.class);
+      if (null == job) {
+        throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
+      }
+      newJob.setSourceId(job.getSourceId());
       baseMapper.updateById(newJob);
       updateSchedulerJob(newJob, job.getJobGroup());
     }

@@ -26,7 +26,6 @@ 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.*;
 import java.util.stream.Collectors;
 
@@ -176,8 +175,8 @@ public class YtReportFromConfigServiceImpl
     if (isNowExecute) {
       if (Objects.equals(reportFormConfig.getStatus(), StatusEnum.ENABLE.getIndex())) {
         // 立即执行报表生成，并创建一条报表执行记录
-        // 生成Excel,并更新报表执行记录
-        generateExcelUpdateReportRecord(reportFormConfig.getDTO(ReportFormConfigDTO.class));
+        // 生成Excel,并更新报表执行记录;
+        generateExcelUpdateReportRecord(getDTOByReportFormConfig(reportFormConfig));
       }
     } else {
       createSysJob(reportFormConfig);
@@ -200,7 +199,7 @@ public class YtReportFromConfigServiceImpl
         if (enableStatus) {
           // 立即执行报表生成，并创建一条报表执行记录
           // 生成Excel,并更新报表执行记录
-          generateExcelUpdateReportRecord(reportFormConfig.getDTO(ReportFormConfigDTO.class));
+          generateExcelUpdateReportRecord(getDTOByReportFormConfig(reportFormConfig));
         }
       } else {
         // 修改cron表达式
@@ -213,7 +212,7 @@ public class YtReportFromConfigServiceImpl
         if (enableStatus) {
           // 立即执行报表生成，并创建一条报表执行记录
           // 生成Excel,并更新报表执行记录
-          generateExcelUpdateReportRecord(reportFormConfig.getDTO(ReportFormConfigDTO.class));
+          generateExcelUpdateReportRecord(getDTOByReportFormConfig(reportFormConfig));
         }
       } else {
         createSysJob(reportFormConfig);
@@ -267,21 +266,10 @@ public class YtReportFromConfigServiceImpl
 
   private ReportFormConfigDTO getReportFormConfigDTOByEntity(ReportFormConfig obj) {
     ReportFormConfigDTO dto = new ReportFormConfigDTO();
-    obj.copyToDTO(dto, "executeAttributes");
+    obj.copyToDTO(dto, FastIotConstants.CHART_EXECUTE_ATTRIBUTES);
     JsonNode jsonNode = obj.getExecuteAttributes();
     List<ExecuteAttributesDTO> list = new ArrayList<>();
-    for (JsonNode node : jsonNode) {
-      ExecuteAttributesDTO attributesDTO =
-          JacksonUtil.convertValue(node, ExecuteAttributesDTO.class);
-      List<String> attributes = new ArrayList<>();
-      JsonNode attribute = node.get("attributes");
-      for (JsonNode key : attribute) {
-        attributes.add(JacksonUtil.convertValue(key, String.class));
-      }
-      assert attributesDTO != null;
-      attributesDTO.setAttributes(attributes);
-      list.add(attributesDTO);
-    }
+    getExecuteConditionAndAttribute(jsonNode, list);
     QueryConditionDTO queryCondition =
         JacksonUtil.convertValue(obj.getQueryCondition(), QueryConditionDTO.class);
     dto.setExecuteAttributes(list);
@@ -295,12 +283,42 @@ public class YtReportFromConfigServiceImpl
     }
     // 立即执行报表生成，并创建一条报表执行记录
     ReportGenerateRecordDTO recordDTO =
-        ytReportGenerateRecordService.generateReportRecord(
-            reportFormConfigDTO.getId(), reportFormConfigDTO.getTenantId(), null);
+        ytReportGenerateRecordService.generateReportRecord(reportFormConfigDTO, null);
     // 生成Excel,并更新报表执行记录
+    int surplus = reportFormConfigDTO.getExecuteAttributes().size();
     for (ExecuteAttributesDTO dto : reportFormConfigDTO.getExecuteAttributes()) {
       ytReportGenerateRecordService.generateExcelUpdateReportRecord(
-          reportFormConfigDTO, dto, recordDTO.getId());
+          reportFormConfigDTO, dto, recordDTO.getId(), surplus);
+      surplus--;
+    }
+  }
+
+  @Override
+  public void getExecuteConditionAndAttribute(
+      JsonNode attributeJsonNode, List<ExecuteAttributesDTO> list) {
+    if (attributeJsonNode.isArray()) {
+      for (JsonNode node : attributeJsonNode) {
+        ExecuteAttributesDTO attributesDTO =
+            JacksonUtil.convertValue(node, ExecuteAttributesDTO.class);
+        List<String> attributes = new ArrayList<>();
+        JsonNode attribute = node.get("attributes");
+        for (JsonNode key : attribute) {
+          attributes.add(JacksonUtil.convertValue(key, String.class));
+        }
+        assert attributesDTO != null;
+        attributesDTO.setAttributes(attributes);
+        list.add(attributesDTO);
+      }
     }
   }
+
+  private ReportFormConfigDTO getDTOByReportFormConfig(ReportFormConfig reportFormConfig) {
+    ReportFormConfigDTO formConfigDTO = reportFormConfig.getDTO(ReportFormConfigDTO.class);
+    List<ExecuteAttributesDTO> list = new ArrayList<>();
+    getExecuteConditionAndAttribute(reportFormConfig.getExecuteAttributes(), list);
+    formConfigDTO.setExecuteAttributes(list);
+    formConfigDTO.setQueryCondition(
+        JacksonUtil.convertValue(reportFormConfig.getQueryCondition(), QueryConditionDTO.class));
+    return formConfigDTO;
+  }
 }

@@ -2,6 +2,8 @@ package org.thingsboard.server.dao.yunteng.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.MoreExecutors;
@@ -36,7 +38,6 @@ import org.thingsboard.server.dao.yunteng.entities.ReportGenerateRecord;
 import org.thingsboard.server.dao.yunteng.mapper.ReportGenerateRecordMapper;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
 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;
@@ -58,7 +59,6 @@ public class YtReportGenerateRecordServiceImpl
 
   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;
@@ -131,9 +131,7 @@ public class YtReportGenerateRecordServiceImpl
 
   @Override
   public ReportGenerateRecordDTO generateReportRecord(
-      String sourceId, String tenantId, String jobId) {
-    ReportFormConfigDTO reportFormConfigDTO =
-        ytReportFormConfigService.findReportFormConfigById(sourceId, tenantId);
+      ReportFormConfigDTO reportFormConfigDTO, String jobId) {
     if (null == reportFormConfigDTO) {
       throw new YtDataValidationException(ErrorMessage.EXPORT_CONFIG_NON_EXISTENT.getMessage());
     }
@@ -158,9 +156,29 @@ public class YtReportGenerateRecordServiceImpl
 
   @Override
   public void generateExcelUpdateReportRecord(
-      ReportFormConfigDTO formConfigDTO, ExecuteAttributesDTO dto, String recordId) {
-    Long startTs = formConfigDTO.getStartTs();
-    Long endTs = formConfigDTO.getEndTs();
+      ReportFormConfigDTO formConfigDTO, ExecuteAttributesDTO dto, String recordId,int surplus) {
+    Long startTs = formConfigDTO.getQueryCondition().getStartTs();
+    Long endTs = formConfigDTO.getQueryCondition().getEndTs();
+    // 如果报表配置是定时执行,获取当前定时任务的执行时间,并计算新的开始时间、结束时间
+    if (formConfigDTO.getExecuteWay() == FastIotConstants.MagicNumber.ONE) {
+      ReportGenerateRecordDTO recordDTO =
+          findReportGenerateRecordById(recordId, formConfigDTO.getTenantId());
+      long differenceTs = endTs - startTs;
+      endTs = recordDTO.getExecuteTime().toInstant(ZoneOffset.of("+8")).toEpochMilli();
+      startTs = endTs - differenceTs;
+    }
+    Long finalStartTs = startTs;
+    Long finalEndTs = endTs;
+    getTsKvValuesOrGenerateExcel(null, formConfigDTO, finalStartTs, finalEndTs, dto, recordId,surplus);
+  }
+
+  private void getTsKvValuesOrGenerateExcel(
+      final DeferredResult<ResponseEntity> result,
+      ReportFormConfigDTO formConfigDTO,
+      Long finalStartTs,
+      Long finalEndTs,
+      ExecuteAttributesDTO dto,
+      String recordId,int surplus) {
     QueryConditionDTO queryCondition = formConfigDTO.getQueryCondition();
     boolean useStrictDataTypes = queryCondition.isUseStrictDataTypes();
     Long interval = queryCondition.getInterval();
@@ -171,15 +189,6 @@ public class YtReportGenerateRecordServiceImpl
     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(
@@ -187,7 +196,14 @@ public class YtReportGenerateRecordServiceImpl
                     new BaseReadTsKvQuery(
                         key, finalStartTs, finalEndTs, interval, limit, agg, orderBy))
             .collect(Collectors.toList());
-
+    queryCondition.setStartTs(finalStartTs);
+    queryCondition.setEndTs(finalEndTs);
+    ObjectNode executeCondition = JacksonUtil.newObjectNode();
+    executeCondition.replace(
+        FastIotConstants.CHART_EXECUTE_CONDITION, JacksonUtil.convertValue(queryCondition,JsonNode.class));
+    executeCondition.replace(
+        FastIotConstants.CHART_EXECUTE_ATTRIBUTES,
+        JacksonUtil.convertValue(formConfigDTO.getExecuteAttributes(),JsonNode.class));
     Futures.addCallback(
         tsService.findAll(tenantId, entityId, queries),
         getTsKvListCallback(
@@ -196,17 +212,32 @@ public class YtReportGenerateRecordServiceImpl
             formConfigDTO.getName(),
             dto.getName(),
             recordId,
-            reportTenantId),
+            reportTenantId,
+            executeCondition,surplus),
         MoreExecutors.directExecutor());
   }
 
+  @Override
+  public JsonNode getChartQueryCondition(String id, String tenantId) {
+    ReportGenerateRecord record =
+        baseMapper.selectOne(
+            new LambdaQueryWrapper<ReportGenerateRecord>()
+                .eq(ReportGenerateRecord::getTenantId, tenantId)
+                .eq(ReportGenerateRecord::getId, id));
+    if (null == record) {
+      throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
+    }
+    return record.getExecuteCondition();
+  }
+
   private FutureCallback<List<TsKvEntry>> getTsKvListCallback(
       final DeferredResult<ResponseEntity> response,
       Boolean useStrictDataTypes,
       String reportFormName,
       String deviceName,
       String reportGenerateRecordId,
-      String tenantId) {
+      String tenantId,
+      JsonNode executeCondition,int surplus) {
     return new FutureCallback<>() {
       @Override
       public void onSuccess(List<TsKvEntry> data) {
@@ -217,8 +248,17 @@ public class YtReportGenerateRecordServiceImpl
               .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);
+        if (null == response) {
+          generateExcel(
+              deviceName,
+              reportFormName,
+              result,
+              reportGenerateRecordId,
+              tenantId,
+              executeCondition,surplus);
+        } else {
+          response.setResult(new ResponseEntity<>(result, HttpStatus.OK));
+        }
       }
 
       @Override
@@ -241,7 +281,8 @@ public class YtReportGenerateRecordServiceImpl
       String reportFormName,
       Map<String, List<BasicData>> result,
       String reportGenerateRecordId,
-      String tenantId) {
+      String tenantId,
+      JsonNode executeCondition,int surplus) {
     List<List<String>> heads = new ArrayList<>();
     List<List<Object>> values = new ArrayList<>();
     int firstKey = 0;
@@ -299,7 +340,10 @@ public class YtReportGenerateRecordServiceImpl
       } else {
         status = StatusEnum.FAIL.getIndex();
       }
-      recordDTO.setExecuteStatus(status);
+      if(surplus == FastIotConstants.MagicNumber.ONE){
+        recordDTO.setExecuteStatus(status);
+      }
+      recordDTO.setExecuteCondition(executeCondition);
       saveOrUpdateReportGenerateRecord(recordDTO);
     }
   }

 package org.thingsboard.server.dao.yunteng.service;
 
+import com.fasterxml.jackson.databind.JsonNode;
 import org.quartz.SchedulerException;
 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.request.ExecuteAttributesDTO;
 import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
 
+import java.util.List;
 import java.util.Map;
 
 public interface YtReportFormConfigService {
@@ -19,4 +22,6 @@ public interface YtReportFormConfigService {
   ReportFormConfigDTO findReportFormConfigById(String id,String tenantId);
 
   ReportFormConfigDTO findReportFormConfigById(String id);
+
+  void getExecuteConditionAndAttribute(JsonNode attributeJsonNode, List<ExecuteAttributesDTO> list);
 }

 package org.thingsboard.server.dao.yunteng.service;
 
+import com.fasterxml.jackson.databind.JsonNode;
 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;
@@ -21,18 +22,26 @@ public interface YtReportGenerateRecordService {
   /**
    * 根据报表配置ID及租户ID生成报表生成记录
    *
-   * @param sourceId 报表配置ID
-   * @param tenantId 租户ID
+   * @param reportFormConfigDTO 报表配置信息
    * @param jobId 定时任务ID（定时任务执行不能为空）
    * @return 报表生成记录
    */
-  ReportGenerateRecordDTO generateReportRecord(String sourceId, String tenantId, String jobId);
+  ReportGenerateRecordDTO generateReportRecord(
+      ReportFormConfigDTO reportFormConfigDTO, String jobId);
 
   /**
    * 生成报表记录
+   *
    * @param formConfigDTO 报表配置
    * @param dto 执行属性
    * @param recordId recordId 记录ID
+   * @param surplus 剩余执行次数
    */
-  void generateExcelUpdateReportRecord(ReportFormConfigDTO formConfigDTO, ExecuteAttributesDTO dto, String recordId);
+  void generateExcelUpdateReportRecord(
+      ReportFormConfigDTO formConfigDTO,
+      ExecuteAttributesDTO dto,
+      String recordId,
+      int surplus);
+
+  JsonNode getChartQueryCondition(String id, String tenantId);
 }

@@ -9,8 +9,6 @@
         <result property="executeWay" column="execute_way"/>
         <result property="executeContent" column="execute_content"/>
         <result property="dataType" column="data_type"/>
-        <result property="startTs" column="start_ts"/>
-        <result property="endTs" column="end_ts"/>
         <result property="status" column="status"/>
         <result property="remark" column="remark"/>
         <result property="tenantId" column="tenant_id"/>
@@ -26,7 +24,7 @@
 
     <sql id="columns">
         config.id,config.name,config.organization_id,config.execute_way,config.execute_content,
-        config.data_type,config.start_ts,config.end_ts,config.status,config.remark,config.create_time,config.creator,
+        config.data_type,config.status,config.remark,config.create_time,config.creator,
         config.updater,config.update_time,config.tenant_id
     </sql>
     <select id="getReportFormConfigPage" resultMap="formConfigDtoMap">
@@ -48,6 +46,9 @@
                     #{organizationId}
                 </foreach>
             </if>
+            <if test="queryMap.startTime !=null and queryMap.endTime !=null">
+                AND config.create_time &gt;= #{queryMap.startTime} AND config.create_time &lt; #{queryMap.endTime}
+            </if>
         </where>
     </select>
 </mapper>