fix: generate excel and save it. fix schedule bug

 package org.thingsboard.server.controller.yunteng;
 package org.thingsboard.server.controller.yunteng;
 
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import lombok.RequiredArgsConstructor;
 import org.quartz.SchedulerException;
 import org.quartz.SchedulerException;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -37,6 +38,7 @@ public class YtReportFormConfigController extends BaseController {
   private final YtReportFormConfigService reportFormConfigService;
   private final YtReportFormConfigService reportFormConfigService;
 
 
   @GetMapping(params = {PAGE_SIZE, PAGE})
   @GetMapping(params = {PAGE_SIZE, PAGE})
+  @ApiOperation("分页")
   public YtPageData<ReportFormConfigDTO> page(
   public YtPageData<ReportFormConfigDTO> page(
       @RequestParam(PAGE_SIZE) int pageSize,
       @RequestParam(PAGE_SIZE) int pageSize,
       @RequestParam(PAGE) int page,
       @RequestParam(PAGE) int page,
@@ -62,9 +64,10 @@ public class YtReportFormConfigController extends BaseController {
   }
   }
 
 
   @PostMapping
   @PostMapping
+  @ApiOperation("新增")
   public ResponseResult<ReportFormConfigDTO> saveReportFromConfig(
   public ResponseResult<ReportFormConfigDTO> saveReportFromConfig(
       @Validated({AddGroup.class}) @RequestBody ReportFormConfigDTO configDTO)
       @Validated({AddGroup.class}) @RequestBody ReportFormConfigDTO configDTO)
-          throws ThingsboardException, SchedulerException {
+      throws ThingsboardException, SchedulerException {
     if (StringUtils.isNotEmpty(configDTO.getId())) {
     if (StringUtils.isNotEmpty(configDTO.getId())) {
       throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
       throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
     }
     }
@@ -72,30 +75,43 @@ public class YtReportFormConfigController extends BaseController {
   }
   }
 
 
   @PutMapping
   @PutMapping
+  @ApiOperation("编辑")
   public ResponseResult<ReportFormConfigDTO> updateReportFromConfig(
   public ResponseResult<ReportFormConfigDTO> updateReportFromConfig(
       @Validated({UpdateGroup.class}) @RequestBody ReportFormConfigDTO configDTO)
       @Validated({UpdateGroup.class}) @RequestBody ReportFormConfigDTO configDTO)
-          throws ThingsboardException, SchedulerException {
+      throws ThingsboardException, SchedulerException {
     return saveOrUpdate(configDTO);
     return saveOrUpdate(configDTO);
   }
   }
 
 
   @PutMapping("/{id}/{status}")
   @PutMapping("/{id}/{status}")
+  @ApiOperation("修改状态")
   public ResponseResult<ReportFormConfigDTO> updateStatusById(
   public ResponseResult<ReportFormConfigDTO> updateStatusById(
-      @PathVariable String id, @PathVariable Integer status) throws ThingsboardException, SchedulerException {
+      @PathVariable String id, @PathVariable Integer status)
+      throws ThingsboardException, SchedulerException {
     return ResponseResult.success(
     return ResponseResult.success(
         reportFormConfigService.updateStatusById(
         reportFormConfigService.updateStatusById(
             getCurrentUser().getCurrentTenantId(), status, id));
             getCurrentUser().getCurrentTenantId(), status, id));
   }
   }
 
 
   @DeleteMapping
   @DeleteMapping
+  @ApiOperation("删除")
   public ResponseResult<Boolean> deleteReportFormConfig(
   public ResponseResult<Boolean> deleteReportFormConfig(
-      @Validated({DeleteGroup.class}) @RequestBody DeleteDTO deleteDTO) {
+      @Validated({DeleteGroup.class}) @RequestBody DeleteDTO deleteDTO) throws SchedulerException {
     return reportFormConfigService.deleteReportFormConfig(deleteDTO)
     return reportFormConfigService.deleteReportFormConfig(deleteDTO)
         ? ResponseResult.success(FastIotConstants.StateValue.DELETE_SUCCESS)
         ? ResponseResult.success(FastIotConstants.StateValue.DELETE_SUCCESS)
         : ResponseResult.failed(FastIotConstants.StateValue.DELETE_FAILED);
         : ResponseResult.failed(FastIotConstants.StateValue.DELETE_FAILED);
   }
   }
 
 
+  @GetMapping("/{id}")
+  @ApiOperation("获取报表配置信息")
+  public ResponseResult<ReportFormConfigDTO> getReportFormConfig(@PathVariable String id)
+      throws ThingsboardException, SchedulerException {
+    return ResponseResult.success(
+        reportFormConfigService.findReportFormConfigById(
+            id, getCurrentUser().getCurrentTenantId()));
+  }
+
   private ResponseResult<ReportFormConfigDTO> saveOrUpdate(ReportFormConfigDTO configDTO)
   private ResponseResult<ReportFormConfigDTO> saveOrUpdate(ReportFormConfigDTO configDTO)
-          throws ThingsboardException, SchedulerException {
+      throws ThingsboardException, SchedulerException {
     configDTO.setTenantId(getCurrentUser().getCurrentTenantId());
     configDTO.setTenantId(getCurrentUser().getCurrentTenantId());
     ReportFormConfigDTO newDTO = reportFormConfigService.saveOrUpdateReportFormConfig(configDTO);
     ReportFormConfigDTO newDTO = reportFormConfigService.saveOrUpdateReportFormConfig(configDTO);
     return ResponseResult.success(newDTO);
     return ResponseResult.success(newDTO);

 package org.thingsboard.server.common.data.yunteng.core.utils;
 package org.thingsboard.server.common.data.yunteng.core.utils;
 
 
-
 import org.springframework.http.ResponseEntity;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartFile;
 import org.thingsboard.server.common.data.yunteng.dto.FileUploadResponse;
 import org.thingsboard.server.common.data.yunteng.dto.FileUploadResponse;
 
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponse;
+import java.io.InputStream;
 
 
 public interface FileStorageService {
 public interface FileStorageService {
 
 
@@ -26,4 +26,6 @@ public interface FileStorageService {
    */
    */
   ResponseEntity<?> download(
   ResponseEntity<?> download(
       String fileName, HttpServletRequest request, HttpServletResponse response);
       String fileName, HttpServletRequest request, HttpServletResponse response);
+
+  String uploadFile(String fileName, String contentType, InputStream inputStream) throws Exception;
 }
 }

@@ -22,6 +22,7 @@ import org.thingsboard.server.common.data.yunteng.dto.FileUploadResponse;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.IOException;
+import java.io.InputStream;
 import java.net.MalformedURLException;
 import java.net.MalformedURLException;
 import java.nio.file.Files;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Path;
@@ -58,26 +59,7 @@ public class LocalFileStorageService implements FileStorageService {
     String fileName = StringUtils.cleanPath(Objects.requireNonNull(file.getOriginalFilename()));
     String fileName = StringUtils.cleanPath(Objects.requireNonNull(file.getOriginalFilename()));
 
 
     try {
     try {
-      // random fileName if needed
-      if (fileStorageProperties.isRandomFileName()) {
-        if (fileName.contains(".")) {
-          fileName =
-              RandomStringUtils.randomAlphabetic(15)
-                  + fileName.substring(fileName.lastIndexOf("."));
-        } else {
-          fileName = RandomStringUtils.randomAlphabetic(15);
-        }
-      }
-      // Check if the file's name contains invalid characters
-      if (fileName.contains("..")) {
-        throw new FileStorageException(ErrorMessage.STORE_FILE_FAILED);
-      }
-
-      // Copy file to the target location (Replacing existing file with the same name)
-      Path targetLocation = this.fileStorageLocation.resolve(fileName);
-      Files.copy(file.getInputStream(), targetLocation, StandardCopyOption.REPLACE_EXISTING);
-
-      return fileName;
+      return storeFileByInputStream(fileName, file.getInputStream());
     } catch (IOException ex) {
     } catch (IOException ex) {
       throw new FileStorageException(ErrorMessage.STORE_FILE_FAILED);
       throw new FileStorageException(ErrorMessage.STORE_FILE_FAILED);
     }
     }
@@ -136,4 +118,37 @@ public class LocalFileStorageService implements FileStorageService {
             "attachment; filename=\"" + resource.getFilename() + "\"")
             "attachment; filename=\"" + resource.getFilename() + "\"")
         .body(resource);
         .body(resource);
   }
   }
+
+  @Override
+  public String uploadFile(String fileName, String contentType, InputStream inputStream)
+      throws IOException {
+    String name = storeFileByInputStream(fileName, inputStream);
+    String ossStaticPath =
+        ServletUriComponentsBuilder.fromCurrentContextPath().toUriString() + ossFileUrl;
+    ossStaticPath = ossStaticPath.replace("**", name);
+    return ossStaticPath;
+  }
+
+  private String storeFileByInputStream(String fileName, InputStream inputStream)
+      throws IOException {
+    // random fileName if needed
+    if (fileStorageProperties.isRandomFileName()) {
+      if (fileName.contains(".")) {
+        fileName =
+            RandomStringUtils.randomAlphabetic(15) + fileName.substring(fileName.lastIndexOf("."));
+      } else {
+        fileName = RandomStringUtils.randomAlphabetic(15);
+      }
+    }
+    // Check if the file's name contains invalid characters
+    if (fileName.contains("..")) {
+      throw new FileStorageException(ErrorMessage.STORE_FILE_FAILED);
+    }
+
+    // Copy file to the target location (Replacing existing file with the same name)
+    Path targetLocation = this.fileStorageLocation.resolve(fileName);
+    Files.copy(inputStream, targetLocation, StandardCopyOption.REPLACE_EXISTING);
+
+    return fileName;
+  }
 }
 }

 package org.thingsboard.server.common.data.yunteng.core.utils;
 package org.thingsboard.server.common.data.yunteng.core.utils;
 
 
 import io.minio.*;
 import io.minio.*;
+import io.minio.errors.*;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import okhttp3.OkHttpClient;
 import okhttp3.OkHttpClient;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.apache.commons.lang3.RandomStringUtils;
@@ -22,8 +23,10 @@ import org.thingsboard.server.common.data.yunteng.dto.FileUploadResponse;
 import javax.net.ssl.*;
 import javax.net.ssl.*;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.OutputStream;
+import java.security.InvalidKeyException;
 import java.security.KeyManagementException;
 import java.security.KeyManagementException;
 import java.security.NoSuchAlgorithmException;
 import java.security.NoSuchAlgorithmException;
 import java.security.SecureRandom;
 import java.security.SecureRandom;
@@ -36,7 +39,7 @@ import java.util.Objects;
 public class MinioFileStorageService implements FileStorageService {
 public class MinioFileStorageService implements FileStorageService {
 
 
   private final MinioFileStorageProperties fileStorageProperties;
   private final MinioFileStorageProperties fileStorageProperties;
-  private MinioClient minioClient;
+  private final MinioClient minioClient;
 
 
   @Autowired
   @Autowired
   public MinioFileStorageService(MinioFileStorageProperties fileStorageProperties)
   public MinioFileStorageService(MinioFileStorageProperties fileStorageProperties)
@@ -53,36 +56,47 @@ public class MinioFileStorageService implements FileStorageService {
     checkBucket();
     checkBucket();
   }
   }
 
 
+  public static OkHttpClient getUnsafeOkHttpClient() throws KeyManagementException {
+    try {
+      final TrustManager[] trustAllCerts =
+          new TrustManager[] {
+            new X509TrustManager() {
+              @Override
+              public void checkClientTrusted(X509Certificate[] x509Certificates, String s) {}
+
+              @Override
+              public void checkServerTrusted(X509Certificate[] x509Certificates, String s) {}
+
+              @Override
+              public X509Certificate[] getAcceptedIssuers() {
+                return new X509Certificate[] {};
+              }
+            }
+          };
+
+      final SSLContext sslContext = SSLContext.getInstance("SSL");
+      sslContext.init(null, trustAllCerts, new SecureRandom());
+      final SSLSocketFactory sslSocketFactory = sslContext.getSocketFactory();
+      OkHttpClient.Builder builder = new OkHttpClient.Builder();
+      builder.sslSocketFactory(sslSocketFactory, (X509TrustManager) trustAllCerts[0]);
+
+      builder.hostnameVerifier((s, sslSession) -> true);
+      return builder.build();
+
+    } catch (NoSuchAlgorithmException e) {
+      e.printStackTrace();
+    }
+    return null;
+  }
+
   // 储存文件
   // 储存文件
   public String storeFile(MultipartFile file) {
   public String storeFile(MultipartFile file) {
     // Normalize file name
     // Normalize file name
     String fileName = StringUtils.cleanPath(Objects.requireNonNull(file.getOriginalFilename()));
     String fileName = StringUtils.cleanPath(Objects.requireNonNull(file.getOriginalFilename()));
     // random fileName if needed
     // random fileName if needed
-    if (fileStorageProperties.isRandomFileName()) {
-      if (fileName.contains(".")) {
-        fileName =
-            RandomStringUtils.randomAlphabetic(15) + fileName.substring(fileName.lastIndexOf("."));
-      } else {
-        fileName = RandomStringUtils.randomAlphabetic(15);
-      }
-    }
-    // Check if the file's name contains invalid characters
-    if (fileName.contains("..")) {
-      throw new FileStorageException(ErrorMessage.STORE_FILE_FAILED);
-    }
-
     // 储存
     // 储存
     try {
     try {
-      checkBucket();
-      PutObjectArgs build =
-          PutObjectArgs.builder()
-              .bucket(fileStorageProperties.getBucketName())
-              .object(fileName)
-              .contentType(file.getContentType())
-              .stream(file.getInputStream(), file.getInputStream().available(), -1)
-              .build();
-      minioClient.putObject(build);
-      return fileName;
+      return storeFileByInputStream(fileName, file.getContentType(), file.getInputStream());
     } catch (Exception ex) {
     } catch (Exception ex) {
       ex.printStackTrace();
       ex.printStackTrace();
       throw new FileStorageException(ErrorMessage.STORE_FILE_FAILED);
       throw new FileStorageException(ErrorMessage.STORE_FILE_FAILED);
@@ -122,7 +136,7 @@ public class MinioFileStorageService implements FileStorageService {
                     .object(fileName)
                     .object(fileName)
                     .build());
                     .build());
         // 获取输出流
         // 获取输出流
-        OutputStream outputStream = response.getOutputStream(); ) {
+        OutputStream outputStream = response.getOutputStream()) {
       // 清空
       // 清空
       response.reset();
       response.reset();
       // 写入流
       // 写入流
@@ -141,6 +155,16 @@ public class MinioFileStorageService implements FileStorageService {
     }
     }
   }
   }
 
 
+  @Override
+  public String uploadFile(String fileName, String contentType, InputStream inputStream)
+      throws IOException {
+    try {
+      return getPath(storeFileByInputStream(fileName, contentType, inputStream));
+    } catch (Exception e) {
+      throw new IOException(e.getMessage());
+    }
+  }
+
   // 检查储存桶情况
   // 检查储存桶情况
   private void checkBucket() {
   private void checkBucket() {
     try {
     try {
@@ -181,37 +205,32 @@ public class MinioFileStorageService implements FileStorageService {
         .concat(fileName);
         .concat(fileName);
   }
   }
 
 
-  public static OkHttpClient getUnsafeOkHttpClient() throws KeyManagementException {
-    try {
-      final TrustManager[] trustAllCerts =
-          new TrustManager[] {
-            new X509TrustManager() {
-              @Override
-              public void checkClientTrusted(X509Certificate[] x509Certificates, String s){}
-
-              @Override
-              public void checkServerTrusted(X509Certificate[] x509Certificates, String s){}
-
-              @Override
-              public X509Certificate[] getAcceptedIssuers() {
-                return new X509Certificate[] {};
-              }
-            }
-          };
-
-      final SSLContext sslContext = SSLContext.getInstance("SSL");
-      sslContext.init(null, trustAllCerts, new SecureRandom());
-      final SSLSocketFactory sslSocketFactory = sslContext.getSocketFactory();
-      OkHttpClient.Builder builder = new OkHttpClient.Builder();
-      builder.sslSocketFactory(sslSocketFactory, (X509TrustManager) trustAllCerts[0]);
-
-      builder.hostnameVerifier(
-              (s, sslSession) -> true);
-      return builder.build();
-
-    } catch (NoSuchAlgorithmException e) {
-      e.printStackTrace();
+  private String storeFileByInputStream(
+      String fileName, String contentType, InputStream inputStream)
+      throws ServerException, InsufficientDataException, ErrorResponseException, IOException,
+          NoSuchAlgorithmException, InvalidKeyException, InvalidResponseException,
+          XmlParserException, InternalException {
+    if (fileStorageProperties.isRandomFileName()) {
+      if (!fileName.contains(".")) {
+        fileName = RandomStringUtils.randomAlphabetic(15);
+      } else {
+        fileName =
+            RandomStringUtils.randomAlphabetic(15) + fileName.substring(fileName.lastIndexOf("."));
+      }
     }
     }
-    return null;
+    // Check if the file's name contains invalid characters
+    if (fileName.contains("..")) {
+      throw new FileStorageException(ErrorMessage.STORE_FILE_FAILED);
+    }
+    checkBucket();
+    PutObjectArgs build =
+        PutObjectArgs.builder()
+            .bucket(fileStorageProperties.getBucketName())
+            .object(fileName)
+            .contentType(contentType)
+            .stream(inputStream, inputStream.available(), -1)
+            .build();
+    minioClient.putObject(build);
+    return fileName;
   }
   }
 }
 }

@@ -26,6 +26,8 @@ public class ReportFormConfigDTO extends TenantDTO {
   @NotEmpty(message = "组织不能为空或空字符串", groups = AddGroup.class)
   @NotEmpty(message = "组织不能为空或空字符串", groups = AddGroup.class)
   private String organizationId;
   private String organizationId;
 
 
+  private OrganizationDTO organizationDTO;
+
   /** 执行方式：0立即执行 1定时执行 */
   /** 执行方式：0立即执行 1定时执行 */
   @ApiModelProperty(value = "执行方式", required = true)
   @ApiModelProperty(value = "执行方式", required = true)
   @NotNull(message = "执行方式不能为空", groups = AddGroup.class)
   @NotNull(message = "执行方式不能为空", groups = AddGroup.class)
@@ -39,15 +41,11 @@ public class ReportFormConfigDTO extends TenantDTO {
   @Size(message = "至少需要一个执行设备及属性", min = 1,groups = AddGroup.class)
   @Size(message = "至少需要一个执行设备及属性", min = 1,groups = AddGroup.class)
   private List<ExecuteAttributesDTO> executeAttributes;
   private List<ExecuteAttributesDTO> executeAttributes;
 
 
-  /** 属性性质：0共有属性 1全部属性 */
-  @ApiModelProperty(value = "属性性质", required = true)
-  @NotNull(message = "属性性质不能为空", groups = AddGroup.class)
-  private Integer attributeNature;
 
 
-  /** 数据对比：0历史数据 1环比 2同比 */
-  @ApiModelProperty(value = "数据对比", required = true)
-  @NotNull(message = "数据对比不能为空", groups = AddGroup.class)
-  private Integer dataCompare;
+  /** 数据类型：0历史数据 1聚合数据 */
+  @ApiModelProperty(value = "数据类型：0原始数据 1聚合数据", required = true)
+  @NotNull(message = "数据类型不能为空", groups = AddGroup.class)
+  private Integer dataType;
 
 
   /** 数据周期：单位毫秒 */
   /** 数据周期：单位毫秒 */
   @ApiModelProperty(value = "开始时间", required = true)
   @ApiModelProperty(value = "开始时间", required = true)

+package org.thingsboard.server.common.data.yunteng.dto.report;
+
+import lombok.Data;
+import org.jetbrains.annotations.NotNull;
+
+@Data
+public class BasicData implements Comparable<BasicData> {
+  private final Object value;
+
+  private final long ts;
+
+  public BasicData(long ts, Object value) {
+    super();
+    this.ts = ts;
+    this.value = value;
+  }
+
+  @Override
+  public int compareTo(@NotNull BasicData o) {
+    return Long.compare(ts, o.ts);
+  }
+}

+package org.thingsboard.server.common.data.yunteng.dto.report;
+
+import lombok.Data;
+
+import java.util.List;
+
+/** 报表导出：Echarts图表展示数据 */
+@Data
+public class ChartReportDTO {
+  /** 报表查询：开始时间 */
+  private Long startTs;
+
+  /** 报表查询：结束时间 */
+  private Long endTs;
+
+  /** 查询返回的数据 */
+  private List<ReportDataSourceDTO> data;
+}

+package org.thingsboard.server.common.data.yunteng.dto.report;
+
+import lombok.Data;
+
+import java.util.List;
+
+/** 基础报表数据 */
+@Data
+public class ReportDataSourceDTO {
+
+  /** 采集属性 */
+  private String attribute;
+
+  /** 采集的数据 */
+  private List<BasicData> data;
+}

-package org.thingsboard.server.common.data.yunteng.dto.report;
-
-/**+
- * 导出报表：非聚合数据生成
- */
-public class UnAggregationReportDTO {
-}

@@ -4,12 +4,17 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
 
 
+import java.util.List;
+
 @Data
 @Data
 @ApiModel(value = "执行设备及属性")
 @ApiModel(value = "执行设备及属性")
 public class ExecuteAttributesDTO {
 public class ExecuteAttributesDTO {
   @ApiModelProperty(value = "执行设备", required = true)
   @ApiModelProperty(value = "执行设备", required = true)
   private String device;
   private String device;
 
 
+  @ApiModelProperty(value = "设备名称", required = true)
+  private String name;
+
   @ApiModelProperty(value = "执行属性", required = true)
   @ApiModelProperty(value = "执行属性", required = true)
-  private String attribute;
+  private List<String> attributes;
 }
 }

@@ -3,21 +3,22 @@ package org.thingsboard.server.common.data.yunteng.dto.request;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
+import org.thingsboard.server.common.data.kv.Aggregation;
 
 
 @Data
 @Data
 @ApiModel(value = "查询条件")
 @ApiModel(value = "查询条件")
 public class QueryConditionDTO {
 public class QueryConditionDTO {
-  @ApiModelProperty("聚合间隔:单位毫秒")
-  private Long interval;
+  @ApiModelProperty("聚合间隔:单位毫秒，默认0")
+  private Long interval = 0L;
 
 
-  @ApiModelProperty("查询的最大数量：该参数仅在'agg'参数设置为'NONE'的情况下使用")
-  private Integer limit;
+  @ApiModelProperty("查询的最大数量：该参数仅在'agg'参数设置为'NONE'的情况下使用，默认100")
+  private Integer limit = 100;
 
 
   @ApiModelProperty("聚合条件：AVG, COUNT, MAX, MIN, NONE, SUM")
   @ApiModelProperty("聚合条件：AVG, COUNT, MAX, MIN, NONE, SUM")
-  private String agg;
+  private Aggregation agg;
 
 
-  @ApiModelProperty("排序：ASC, DESC")
-  private String orderBy;
+  @ApiModelProperty("排序：ASC, DESC 默认DESC")
+  private String orderBy = "DESC";
 
 
   @ApiModelProperty("启用/禁用遥测值到字符串的转换。默认情况下启用转换。设置参数为'true'以禁用转换")
   @ApiModelProperty("启用/禁用遥测值到字符串的转换。默认情况下启用转换。设置参数为'true'以禁用转换")
   private boolean useStrictDataTypes;
   private boolean useStrictDataTypes;

@@ -8,8 +8,8 @@ public enum StatusEnum {
   ONLINE("在线", 1),
   ONLINE("在线", 1),
   ENABLE("启用", 1),
   ENABLE("启用", 1),
   DISABLE("禁用", 0),
   DISABLE("禁用", 0),
-  NORMAL("正常", 0),
-  PAUSE("暂停", 1),
+  NORMAL("正常", 1),
+  PAUSE("暂停", 0),
   FAIL("失败", 0),
   FAIL("失败", 0),
   SUCCESS("成功", 1),
   SUCCESS("成功", 1),
   RUNNING("运行中",2),
   RUNNING("运行中",2),

 package org.thingsboard.server.common.data.yunteng.utils;
 package org.thingsboard.server.common.data.yunteng.utils;
 
 
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.BeanUtils;
 
 
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponse;
+import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.IOException;
 import java.net.URLEncoder;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 import java.nio.charset.StandardCharsets;
@@ -15,7 +17,6 @@ import java.util.List;
 
 
 public class ExcelUtil {
 public class ExcelUtil {
   private ExcelUtil() {}
   private ExcelUtil() {}
-
   public static void exportExcel(
   public static void exportExcel(
       HttpServletResponse response,
       HttpServletResponse response,
       String fileName,
       String fileName,
@@ -52,4 +53,15 @@ public class ExcelUtil {
 
 
     exportExcel(response, fileName, sheetName, targetList, targetClass);
     exportExcel(response, fileName, sheetName, targetList, targetClass);
   }
   }
+
+  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);
+    return byteArrayOutputStream;
+  }
 }
 }

@@ -64,7 +64,7 @@ public abstract class AbstractQuartzJob implements Job {
     long runMs =
     long runMs =
         sysJobLog.getEndTime().toInstant(ZoneOffset.of("+8")).toEpochMilli()
         sysJobLog.getEndTime().toInstant(ZoneOffset.of("+8")).toEpochMilli()
             - startTime.toInstant(ZoneOffset.of("+8")).toEpochMilli();
             - startTime.toInstant(ZoneOffset.of("+8")).toEpochMilli();
-    sysJobLog.setJobMessage(sysJobLog.getJobName() + " 总共耗时：" + runMs + "毫秒");
+    sysJobLog.setJobMessage(" 总共耗时：" + runMs + "毫秒");
     if (e != null) {
     if (e != null) {
       sysJobLog.setStatus(StatusEnum.FAIL.getIndex());
       sysJobLog.setStatus(StatusEnum.FAIL.getIndex());
       String errorMsg = StringUtils.substring(e.getMessage(), 0, 2000);
       String errorMsg = StringUtils.substring(e.getMessage(), 0, 2000);

 package org.thingsboard.server.dao.util.yunteng;
 package org.thingsboard.server.dao.util.yunteng;
 
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
+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.enums.JobGroupEnum;
 import org.thingsboard.server.common.data.yunteng.utils.SpringBeanUtils;
 import org.thingsboard.server.common.data.yunteng.utils.SpringBeanUtils;
 import org.thingsboard.server.dao.yunteng.entities.SysJob;
 import org.thingsboard.server.dao.yunteng.entities.SysJob;
@@ -22,13 +23,16 @@ public class JobInvokeUtil {
     String invokeTarget = sysJob.getInvokeTarget();
     String invokeTarget = sysJob.getInvokeTarget();
     String beanName = getBeanName(invokeTarget);
     String beanName = getBeanName(invokeTarget);
     String methodName = getMethodName(invokeTarget);
     String methodName = getMethodName(invokeTarget);
+    String reportGenerateRecordId = null;
     if (StringUtils.isNotEmpty(sysJob.getSourceId())
     if (StringUtils.isNotEmpty(sysJob.getSourceId())
         && sysJob.getJobGroup().equals(JobGroupEnum.REPORT.toString())) {
         && sysJob.getJobGroup().equals(JobGroupEnum.REPORT.toString())) {
       // 写入报表生成记录
       // 写入报表生成记录
-      SpringBeanUtils.getBean(YtReportGenerateRecordService.class)
-          .generateReportRecord(sysJob.getSourceId(), sysJob.getTenantId(), sysJob.getId());
+      ReportGenerateRecordDTO dto =
+          SpringBeanUtils.getBean(YtReportGenerateRecordService.class)
+              .generateReportRecord(sysJob.getSourceId(), sysJob.getTenantId(), sysJob.getId());
+      reportGenerateRecordId = dto.getId();
     }
     }
-    List<Object[]> methodParams = getMethodParams(invokeTarget);
+    List<Object[]> methodParams = getMethodParams(invokeTarget, reportGenerateRecordId);
     Object bean;
     Object bean;
     if (!isValidClassName(beanName)) {
     if (!isValidClassName(beanName)) {
       bean = SpringBeanUtils.getBean(beanName);
       bean = SpringBeanUtils.getBean(beanName);
@@ -96,11 +100,14 @@ public class JobInvokeUtil {
    * @param invokeTarget 目标字符串
    * @param invokeTarget 目标字符串
    * @return method方法相关参数列表
    * @return method方法相关参数列表
    */
    */
-  public static List<Object[]> getMethodParams(String invokeTarget) {
+  public static List<Object[]> getMethodParams(String invokeTarget, String reportGenerateRecordId) {
     String methodStr = StringUtils.substringBetween(invokeTarget, "(", ")");
     String methodStr = StringUtils.substringBetween(invokeTarget, "(", ")");
     if (StringUtils.isEmpty(methodStr)) {
     if (StringUtils.isEmpty(methodStr)) {
       return null;
       return null;
     }
     }
+    if (reportGenerateRecordId != null) {
+      methodStr += ",\"" + reportGenerateRecordId + "\"";
+    }
     String[] methodParams = methodStr.split(",(?=([^\"']*[\"'][^\"']*[\"'])*[^\"']*$)");
     String[] methodParams = methodStr.split(",(?=([^\"']*[\"'][^\"']*[\"'])*[^\"']*$)");
     List<Object[]> classs = new LinkedList<>();
     List<Object[]> classs = new LinkedList<>();
     for (String methodParam : methodParams) {
     for (String methodParam : methodParams) {

 package org.thingsboard.server.dao.util.yunteng.task;
 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.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")
 @Component("reportTask")
+@RequiredArgsConstructor
+@Slf4j
 public class ReportTask {
 public class ReportTask {
-    public void multipleParams(String s, Boolean b, Long l, Double d, Integer i)
-    {
-        System.out.println("执行多参方法： s="+s+"b="+b+"l="+l+"d"+d+"i="+i);
-    }
+  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 params(String params) throws InterruptedException {
-        System.out.println("==========================执行有参方法：" + params+"=======================");
-        Thread.sleep(100);
-    }
+  public void multipleParams(String s, Boolean b, Long l, Double d, Integer i) {
+    System.out.println("执行多参方法： s=" + s + "b=" + b + "l=" + l + "d" + d + "i=" + i);
+  }
+
+  public void params(String params) throws InterruptedException {
+    System.out.println("==========================执行有参方法：" + params + "=======================");
+    Thread.sleep(100);
+  }
 
 
-    public void noParams() throws InterruptedException {
-        System.out.println("=========================执行无参方法======================================");
+  public void noParams() throws InterruptedException {
+    System.out.println("=========================执行无参方法======================================");
+  }
+
+  public void generateReport(String reportId, String reportGenerateRecordId) {
+    ReportFormConfigDTO formConfigDTO =
+        ytReportFormConfigService.findReportFormConfigById(reportId);
+    // 关联设备
+    List<ExecuteAttributesDTO> dtoList = formConfigDTO.getExecuteAttributes();
+    if (!dtoList.isEmpty()) {
+      if (dtoList.size() == FastIotConstants.MagicNumber.ONE) {
+        try {
+          ExecuteAttributesDTO attributesDTO = dtoList.get(0);
+          getTsKv(formConfigDTO, attributesDTO, reportGenerateRecordId);
+
+        } catch (Exception e) {
+          log.error(e.getMessage());
+        }
+      } else {
+        for (ExecuteAttributesDTO dto : dtoList) {
+          getTsKv(formConfigDTO, dto, reportGenerateRecordId);
+        }
+      }
     }
     }
+  }
+
+  private void getTsKv(
+      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());
 
 
-    public void generateReport(String reportId){
-        System.out.println("===========================执行报表生成："+ reportId +"====================================");
+    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);
+    }
+  }
 }
 }

@@ -33,11 +33,8 @@ public class ReportFormConfig extends TenantBaseEntity {
   @TableField(typeHandler = JacksonTypeHandler.class)
   @TableField(typeHandler = JacksonTypeHandler.class)
   private JsonNode executeAttributes;
   private JsonNode executeAttributes;
 
 
-  /** 属性性质：0共有属性 1全部属性 */
-  private Integer attributeNature;
-
-  /** 数据对比：0历史数据 1环比 2同比 */
-  private Integer dataCompare;
+  /** 数据对比：0原始数据 1聚合数据 */
+  private Integer dataType;
 
 
   /** 查询开始时间：单位毫秒 */
   /** 查询开始时间：单位毫秒 */
   private Long startTs;
   private Long startTs;

@@ -31,7 +31,7 @@ public class SysJob extends TenantBaseEntity {
   /** 是否并发执行（0允许 1禁止） */
   /** 是否并发执行（0允许 1禁止） */
   private Integer concurrent;
   private Integer concurrent;
 
 
-  /** 任务状态（0正常 1暂停） */
+  /** 任务状态（0暂停 1正常） */
   private Integer status;
   private Integer status;
 
 
   /** 来源ID：即创建定时任务对应的业务ID */
   /** 来源ID：即创建定时任务对应的业务ID */

@@ -194,7 +194,6 @@ public class SysJobServiceImpl extends AbstractBaseService<SysJobMapper, SysJob>
   @Transactional(rollbackFor = Exception.class)
   @Transactional(rollbackFor = Exception.class)
   public SysJobDTO saveOrUpdateJob(SysJobDTO jobDTO) throws SchedulerException {
   public SysJobDTO saveOrUpdateJob(SysJobDTO jobDTO) throws SchedulerException {
     if (StringUtils.isEmpty(jobDTO.getId())) {
     if (StringUtils.isEmpty(jobDTO.getId())) {
-      jobDTO.setStatus(StatusEnum.PAUSE.getIndex());
       SysJob job = jobDTO.getEntity(SysJob.class);
       SysJob job = jobDTO.getEntity(SysJob.class);
       baseMapper.insert(job);
       baseMapper.insert(job);
       ScheduleUtils.createScheduleJob(scheduler, job);
       ScheduleUtils.createScheduleJob(scheduler, job);

@@ -13,28 +13,27 @@ 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.exception.YtDataValidationException;
 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 import org.thingsboard.server.common.data.yunteng.dto.*;
 import org.thingsboard.server.common.data.yunteng.dto.*;
+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.JobGroupEnum;
 import org.thingsboard.server.common.data.yunteng.enums.JobGroupEnum;
 import org.thingsboard.server.common.data.yunteng.enums.StatusEnum;
 import org.thingsboard.server.common.data.yunteng.enums.StatusEnum;
 import org.thingsboard.server.common.data.yunteng.utils.JacksonUtil;
 import org.thingsboard.server.common.data.yunteng.utils.JacksonUtil;
 import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
 import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
 import org.thingsboard.server.dao.yunteng.entities.ReportFormConfig;
 import org.thingsboard.server.dao.yunteng.entities.ReportFormConfig;
 import org.thingsboard.server.dao.yunteng.mapper.OrganizationMapper;
 import org.thingsboard.server.dao.yunteng.mapper.OrganizationMapper;
-import org.thingsboard.server.dao.yunteng.mapper.ReportFromConfigMapper;
+import org.thingsboard.server.dao.yunteng.mapper.ReportFormConfigMapper;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
 import org.thingsboard.server.dao.yunteng.service.YtReportFormConfigService;
 import org.thingsboard.server.dao.yunteng.service.YtReportFormConfigService;
 import org.thingsboard.server.dao.yunteng.service.YtSysJobService;
 import org.thingsboard.server.dao.yunteng.service.YtSysJobService;
 
 
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
+import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Collectors;
 
 
 @Slf4j
 @Slf4j
 @Service
 @Service
 @RequiredArgsConstructor
 @RequiredArgsConstructor
 public class YtReportFromConfigServiceImpl
 public class YtReportFromConfigServiceImpl
-    extends AbstractBaseService<ReportFromConfigMapper, ReportFormConfig>
+    extends AbstractBaseService<ReportFormConfigMapper, ReportFormConfig>
     implements YtReportFormConfigService {
     implements YtReportFormConfigService {
   private final OrganizationMapper organizationMapper;
   private final OrganizationMapper organizationMapper;
   private final YtSysJobService ytSysJobService;
   private final YtSysJobService ytSysJobService;
@@ -43,11 +42,6 @@ public class YtReportFromConfigServiceImpl
   public YtPageData<ReportFormConfigDTO> page(Map<String, Object> queryMap) {
   public YtPageData<ReportFormConfigDTO> page(Map<String, Object> queryMap) {
     String tenantId =
     String tenantId =
         Optional.ofNullable(queryMap.get("tenantId")).map(Object::toString).orElse(null);
         Optional.ofNullable(queryMap.get("tenantId")).map(Object::toString).orElse(null);
-    String name = Optional.ofNullable(queryMap.get("name")).map(Object::toString).orElse(null);
-    Integer status =
-        Optional.ofNullable(queryMap.get("status"))
-            .map(value -> Integer.valueOf(value.toString()))
-            .orElse(null);
     List<String> organizationIds =
     List<String> organizationIds =
         Optional.ofNullable(queryMap.get("organizationId"))
         Optional.ofNullable(queryMap.get("organizationId"))
             .map(
             .map(
@@ -63,17 +57,10 @@ public class YtReportFromConfigServiceImpl
                   return null;
                   return null;
                 })
                 })
             .orElse(null);
             .orElse(null);
-    IPage<ReportFormConfig> page =
-        baseMapper.selectPage(
-            getPage(queryMap, "create_time", false),
-            new LambdaQueryWrapper<ReportFormConfig>()
-                .eq(StringUtils.isNotEmpty(tenantId), ReportFormConfig::getTenantId, tenantId)
-                .eq(null != status, ReportFormConfig::getStatus, status)
-                .like(null != name, ReportFormConfig::getName, name)
-                .in(
-                    null != organizationIds && organizationIds.size() > 0,
-                    ReportFormConfig::getOrganizationId,
-                    organizationIds));
+    queryMap.put("organizationIds", organizationIds);
+    IPage<ReportFormConfigDTO> page =
+        baseMapper.getReportFormConfigPage(
+            getPage(queryMap, FastIotConstants.DefaultOrder.CREATE_TIME, false), queryMap);
     return getPageData(page, ReportFormConfigDTO.class);
     return getPageData(page, ReportFormConfigDTO.class);
   }
   }
 
 
@@ -93,8 +80,7 @@ public class YtReportFromConfigServiceImpl
           .getExecuteAttributes()
           .getExecuteAttributes()
           .forEach(
           .forEach(
               item -> {
               item -> {
-                if (StringUtils.isEmpty(item.getDevice())
-                    || StringUtils.isEmpty(item.getAttribute())) {
+                if (StringUtils.isEmpty(item.getDevice()) || item.getAttributes().isEmpty()) {
                   throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
                   throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
                 }
                 }
               });
               });
@@ -123,7 +109,7 @@ public class YtReportFromConfigServiceImpl
 
 
   @Override
   @Override
   @Transactional
   @Transactional
-  public boolean deleteReportFormConfig(DeleteDTO deleteDTO) {
+  public boolean deleteReportFormConfig(DeleteDTO deleteDTO) throws SchedulerException {
     if (deleteDTO.getIds().isEmpty()) {
     if (deleteDTO.getIds().isEmpty()) {
       throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
       throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
     }
     }
@@ -146,11 +132,13 @@ public class YtReportFromConfigServiceImpl
             new LambdaQueryWrapper<ReportFormConfig>()
             new LambdaQueryWrapper<ReportFormConfig>()
                 .eq(ReportFormConfig::getId, id)
                 .eq(ReportFormConfig::getId, id)
                 .eq(ReportFormConfig::getTenantId, tenantId));
                 .eq(ReportFormConfig::getTenantId, tenantId));
-    updateCheckSysJob(queryEntity);
+    if (queryEntity != null) {
+      queryEntity.setStatus(status);
+      updateCheckSysJob(queryEntity);
+    }
     return Optional.ofNullable(queryEntity)
     return Optional.ofNullable(queryEntity)
         .map(
         .map(
             entity -> {
             entity -> {
-              entity.setStatus(status);
               baseMapper.updateById(entity);
               baseMapper.updateById(entity);
               return entity.getDTO(ReportFormConfigDTO.class);
               return entity.getDTO(ReportFormConfigDTO.class);
             })
             })
@@ -167,14 +155,26 @@ public class YtReportFromConfigServiceImpl
     if (null == formConfig) {
     if (null == formConfig) {
       throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
       throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
     }
     }
-    return formConfig.getDTO(ReportFormConfigDTO.class);
+    return getReportFormConfigDTOByEntity(formConfig);
+  }
+
+  @Override
+  public ReportFormConfigDTO findReportFormConfigById(String id) {
+    return Optional.ofNullable(baseMapper.selectById(id))
+        .map(obj -> getReportFormConfigDTOByEntity(obj))
+        .orElseThrow(
+            () -> {
+              throw new YtDataValidationException(ErrorMessage.INTERNAL_ERROR.getMessage());
+            });
   }
   }
 
 
   private void addCheckSysJob(ReportFormConfig reportFormConfig) throws SchedulerException {
   private void addCheckSysJob(ReportFormConfig reportFormConfig) throws SchedulerException {
     boolean isNowExecute =
     boolean isNowExecute =
         Objects.equals(reportFormConfig.getExecuteWay(), FastIotConstants.MagicNumber.ZERO);
         Objects.equals(reportFormConfig.getExecuteWay(), FastIotConstants.MagicNumber.ZERO);
     if (isNowExecute) {
     if (isNowExecute) {
-      // 立即执行报表生成，并创建一条报表执行记录
+      if (Objects.equals(reportFormConfig.getStatus(), StatusEnum.ENABLE.getIndex())) {
+        // 立即执行报表生成，并创建一条报表执行记录
+      }
     } else {
     } else {
       createSysJob(reportFormConfig);
       createSysJob(reportFormConfig);
     }
     }
@@ -186,30 +186,29 @@ public class YtReportFromConfigServiceImpl
     String cronExpression = reportFormConfig.getExecuteContent();
     String cronExpression = reportFormConfig.getExecuteContent();
     // 查看之前是否创建了定时任务
     // 查看之前是否创建了定时任务
     SysJobDTO sysJobDTO = ytSysJobService.findSysJobBySourceId(reportFormConfig.getId());
     SysJobDTO sysJobDTO = ytSysJobService.findSysJobBySourceId(reportFormConfig.getId());
-
-    if (null != sysJobDTO
-        && Objects.equals(reportFormConfig.getStatus(), StatusEnum.ENABLE.getIndex())) {
+    boolean enableStatus =
+        Objects.equals(reportFormConfig.getStatus(), StatusEnum.ENABLE.getIndex());
+    if (null != sysJobDTO) {
       // 立即执行
       // 立即执行
       if (isNowExecute) {
       if (isNowExecute) {
         // 删除定时任务
         // 删除定时任务
         ytSysJobService.deleteJob(sysJobDTO);
         ytSysJobService.deleteJob(sysJobDTO);
-        // 立即执行报表生成，并创建一条报表执行记录
-        // TODO hxp
+        if (enableStatus) {
+          // 立即执行报表生成，并创建一条报表执行记录
+          // TODO hxp
+        }
       } else {
       } else {
         // 修改cron表达式
         // 修改cron表达式
         sysJobDTO.setCronExpression(cronExpression);
         sysJobDTO.setCronExpression(cronExpression);
+        sysJobDTO.setStatus(reportFormConfig.getStatus());
         ytSysJobService.saveOrUpdateJob(sysJobDTO);
         ytSysJobService.saveOrUpdateJob(sysJobDTO);
       }
       }
-    } else if (null != sysJobDTO
-        && Objects.equals(reportFormConfig.getStatus(), StatusEnum.DISABLE.getIndex())) {
-      // 修改定时任务状态
-      sysJobDTO.setStatus(StatusEnum.DISABLE.getIndex());
-      ytSysJobService.updateSysJobStatus(sysJobDTO);
-    } else if (null == sysJobDTO
-        && Objects.equals(reportFormConfig.getStatus(), StatusEnum.ENABLE.getIndex())) {
+    } else {
       if (isNowExecute) {
       if (isNowExecute) {
-        // 立即执行报表生成，并创建一条报表执行记录
-        // TODO hxp
+        if (enableStatus) {
+          // 立即执行报表生成，并创建一条报表执行记录
+          // TODO hxp
+        }
       } else {
       } else {
         createSysJob(reportFormConfig);
         createSysJob(reportFormConfig);
       }
       }
@@ -240,7 +239,7 @@ public class YtReportFromConfigServiceImpl
       sysJobDTO.setTenantId(reportFormConfig.getTenantId());
       sysJobDTO.setTenantId(reportFormConfig.getTenantId());
       sysJobDTO.setCronExpression(cronExpression);
       sysJobDTO.setCronExpression(cronExpression);
       sysJobDTO.setConcurrent(StatusEnum.ENABLE.getIndex());
       sysJobDTO.setConcurrent(StatusEnum.ENABLE.getIndex());
-      sysJobDTO.setInvokeTarget("reportTask.generateReport(\""+reportId+"\")");
+      sysJobDTO.setInvokeTarget("reportTask.generateReport(\"" + reportId + "\")");
       ytSysJobService.saveOrUpdateJob(sysJobDTO);
       ytSysJobService.saveOrUpdateJob(sysJobDTO);
     }
     }
   }
   }
@@ -250,24 +249,36 @@ public class YtReportFromConfigServiceImpl
    *
    *
    * @param id 配置ID
    * @param id 配置ID
    */
    */
-  private void checkAndDeleteJob(String id) {
+  private void checkAndDeleteJob(String id) throws SchedulerException {
     ReportFormConfig config = baseMapper.selectById(id);
     ReportFormConfig config = baseMapper.selectById(id);
-    Optional.ofNullable(config)
-        .map(
-            obj -> {
-              SysJobDTO sysJobDTO = ytSysJobService.findSysJobBySourceId(id);
-              if (null != sysJobDTO) {
-                try {
-                  ytSysJobService.deleteJob(sysJobDTO);
-                } catch (SchedulerException e) {
-                  log.error(e.getMessage());
-                }
-              }
-              return sysJobDTO;
-            })
-        .orElseThrow(
-            () -> {
-              throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
-            });
+    if (null != config) {
+      SysJobDTO sysJobDTO = ytSysJobService.findSysJobBySourceId(id);
+      if (null != sysJobDTO) {
+        ytSysJobService.deleteJob(sysJobDTO);
+      }
+    }
+  }
+
+  private ReportFormConfigDTO getReportFormConfigDTOByEntity(ReportFormConfig obj) {
+    ReportFormConfigDTO dto = new ReportFormConfigDTO();
+    obj.copyToDTO(dto, "executeAttributes");
+    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));
+      }
+      attributesDTO.setAttributes(attributes);
+      list.add(attributesDTO);
+    }
+    QueryConditionDTO queryCondition =
+        JacksonUtil.convertValue(obj.getQueryCondition(), QueryConditionDTO.class);
+    dto.setExecuteAttributes(list);
+    dto.setQueryCondition(queryCondition);
+    return dto;
   }
   }
 }
 }

@@ -48,7 +48,7 @@ public class YtReportGenerateRecordServiceImpl
             .orElse(null);
             .orElse(null);
     IPage<ReportGenerateRecord> iPage =
     IPage<ReportGenerateRecord> iPage =
         baseMapper.selectPage(
         baseMapper.selectPage(
-            getPage(queryMap, "", false),
+            getPage(queryMap, "execute_time", false),
             new LambdaQueryWrapper<ReportGenerateRecord>()
             new LambdaQueryWrapper<ReportGenerateRecord>()
                 .like(
                 .like(
                     StringUtils.isNotEmpty(reportConfigName),
                     StringUtils.isNotEmpty(reportConfigName),
@@ -71,16 +71,15 @@ public class YtReportGenerateRecordServiceImpl
     if (StringUtils.isEmpty(recordDTO.getId())) {
     if (StringUtils.isEmpty(recordDTO.getId())) {
       baseMapper.insert(reportGenerateRecord);
       baseMapper.insert(reportGenerateRecord);
     } else {
     } else {
-      Optional.ofNullable(recordDTO.getId())
-          .map(id -> baseMapper.selectById(id))
-          .filter(obj -> !obj.getTenantId().equals(recordDTO.getTenantId()))
-          .map(record -> baseMapper.updateById(record))
+      ReportGenerateRecord record = baseMapper.selectById(recordDTO.getId());
+      Optional.ofNullable(record)
+          .map(obj -> baseMapper.updateById(reportGenerateRecord))
           .orElseThrow(
           .orElseThrow(
               () -> {
               () -> {
                 throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
                 throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
               });
               });
     }
     }
-    return recordDTO;
+    return reportGenerateRecord.getDTO(ReportGenerateRecordDTO.class);
   }
   }
 
 
   @Override
   @Override
@@ -111,17 +110,20 @@ public class YtReportGenerateRecordServiceImpl
     }
     }
     OrganizationDTO organizationDTO =
     OrganizationDTO organizationDTO =
         ytOrganizationService.findOrganizationById(
         ytOrganizationService.findOrganizationById(
-            reportFormConfigDTO.getId(), reportFormConfigDTO.getTenantId());
+            reportFormConfigDTO.getOrganizationId(), reportFormConfigDTO.getTenantId());
     // 创建报表生成记录
     // 创建报表生成记录
     ReportGenerateRecordDTO dto = new ReportGenerateRecordDTO();
     ReportGenerateRecordDTO dto = new ReportGenerateRecordDTO();
+    LocalDateTime time = LocalDateTime.now();
     dto.setJobId(jobId);
     dto.setJobId(jobId);
     dto.setReportConfigName(reportFormConfigDTO.getName());
     dto.setReportConfigName(reportFormConfigDTO.getName());
     dto.setOrganizationName(null != organizationDTO ? organizationDTO.getName() : null);
     dto.setOrganizationName(null != organizationDTO ? organizationDTO.getName() : null);
-    dto.setDataCompare(reportFormConfigDTO.getDataCompare());
-    dto.setExecuteTime(LocalDateTime.now());
+    dto.setDataCompare(reportFormConfigDTO.getDataType());
+    dto.setExecuteTime(time);
+    dto.setCreateTime(time);
+    dto.setCreator(reportFormConfigDTO.getCreator());
+    dto.setTenantId(reportFormConfigDTO.getTenantId());
     dto.setExecuteStatus(StatusEnum.RUNNING.getIndex());
     dto.setExecuteStatus(StatusEnum.RUNNING.getIndex());
     dto.setExecuteWay(reportFormConfigDTO.getExecuteWay());
     dto.setExecuteWay(reportFormConfigDTO.getExecuteWay());
-    saveOrUpdateReportGenerateRecord(dto);
-    return dto;
+    return saveOrUpdateReportGenerateRecord(dto);
   }
   }
 }
 }

 package org.thingsboard.server.dao.yunteng.mapper;
 package org.thingsboard.server.dao.yunteng.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Mapper;
-import org.thingsboard.server.dao.yunteng.entities.FrpInfo;
+import org.apache.ibatis.annotations.Param;
+import org.thingsboard.server.common.data.yunteng.dto.ReportFormConfigDTO;
 import org.thingsboard.server.dao.yunteng.entities.ReportFormConfig;
 import org.thingsboard.server.dao.yunteng.entities.ReportFormConfig;
 
 
-@Mapper
-public interface ReportFromConfigMapper extends BaseMapper<ReportFormConfig> {
+import java.util.Map;
 
 
+@Mapper
+public interface ReportFormConfigMapper extends BaseMapper<ReportFormConfig> {
+  IPage<ReportFormConfigDTO> getReportFormConfigPage(
+      IPage<?> page, @Param("queryMap") Map<String, Object> queryMap);
 }
 }

@@ -12,9 +12,11 @@ public interface YtReportFormConfigService {
 
 
   ReportFormConfigDTO saveOrUpdateReportFormConfig(ReportFormConfigDTO report) throws SchedulerException;
   ReportFormConfigDTO saveOrUpdateReportFormConfig(ReportFormConfigDTO report) throws SchedulerException;
 
 
-  boolean deleteReportFormConfig(DeleteDTO deleteDTO);
+  boolean deleteReportFormConfig(DeleteDTO deleteDTO) throws SchedulerException;
 
 
   ReportFormConfigDTO updateStatusById(String tenantId,Integer status,String id) throws SchedulerException;
   ReportFormConfigDTO updateStatusById(String tenantId,Integer status,String id) throws SchedulerException;
 
 
   ReportFormConfigDTO findReportFormConfigById(String id,String tenantId);
   ReportFormConfigDTO findReportFormConfigById(String id,String tenantId);
+
+  ReportFormConfigDTO findReportFormConfigById(String id);
 }
 }

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="org.thingsboard.server.dao.yunteng.mapper.ReportFormConfigMapper">
+    <resultMap id="formConfigDtoMap" type="org.thingsboard.server.common.data.yunteng.dto.ReportFormConfigDTO">
+        <result property="id" column="id"/>
+        <result property="name" column="name"/>
+        <result property="organizationId" column="organization_id"/>
+        <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"/>
+        <result property="creator" column="creator"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updater" column="updater"/>
+        <result property="updateTime" column="update_time"/>
+        <association property="organizationDTO"
+                     javaType="org.thingsboard.server.common.data.yunteng.dto.OrganizationDTO">
+            <result property="name" column="organization_name"/>
+        </association>
+    </resultMap>
+
+    <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.updater,config.update_time,config.tenant_id
+    </sql>
+    <select id="getReportFormConfigPage" resultMap="formConfigDtoMap">
+        SELECT
+        <include refid="columns"/>,io.name as organization_name
+        FROM iotfs_report_form_config config
+        LEFT JOIN iotfs_organization io ON io.id = config.organization_id
+        <where>
+            config.tenant_id = #{queryMap.tenantId}
+            <if test="queryMap.name !=null and queryMap.name !=''">
+                AND config.name LIKE concat('%',#{queryMap.name}::TEXT,'%')
+            </if>
+            <if test="queryMap.status !=null">
+                AND config.status = #{queryMap.status}
+            </if>
+            <if test="queryMap.organizationIds !=null">
+                AND config.organization_id IN
+                <foreach collection="queryMap.organizationIds" item="organizationId" open="(" separator="," close=")">
+                    #{organizationId}
+                </foreach>
+            </if>
+        </where>
+    </select>
+</mapper>