Merge pull request #10543 from dataease/pr@dev-v2@feat_xpack-filter-info3

feat(XPack): 定时报告过滤组件功能

sdk/api/api-base/src/main/java/io/dataease/api/report/dto/ReportCreator.java

@@ -2,6 +2,7 @@ package io.dataease.api.report.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.dataease.api.visualization.vo.VisualizationReportFilterVO;
 import lombok.Data;
 
 import java.io.Serial;
@@ -51,4 +52,6 @@ public class ReportCreator implements Serializable {
     private Long startTime;
 
     private Long endTime;
+
+    private List<VisualizationReportFilterVO> reportFilter;
 }

sdk/api/api-base/src/main/java/io/dataease/api/visualization/request/DataVisualizationBaseRequest.java

@@ -34,6 +34,9 @@ public class DataVisualizationBaseRequest extends DataVisualizationVO {
     // 定时报告id
     private Long reportId;
 
+    // 定时报告任务id
+    private Long taskId;
+
 
     public DataVisualizationBaseRequest(Long id,String busiFlag) {
         this.busiFlag = busiFlag;

sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationReportFilterVO.java

@@ -13,14 +13,23 @@ import java.io.Serializable;
  * @since 2024-06-25
  */
 public class VisualizationReportFilterVO implements Serializable {
-
     private static final long serialVersionUID = 1L;
 
     /**
-     * 报告ID
+     * id
      */
     private Long id;
 
+    /**
+     * 定时报告id
+     */
+    private Long reportId;
+
+    /**
+     * 任务id
+     */
+    private Long taskId;
+
     /**
      * 资源id
      */
@@ -69,6 +78,22 @@ public class VisualizationReportFilterVO implements Serializable {
         this.id = id;
     }
 
+    public Long getReportId() {
+        return reportId;
+    }
+
+    public void setReportId(Long reportId) {
+        this.reportId = reportId;
+    }
+
+    public Long getTaskId() {
+        return taskId;
+    }
+
+    public void setTaskId(Long taskId) {
+        this.taskId = taskId;
+    }
+
     public Long getResourceId() {
         return resourceId;
     }
@@ -136,15 +161,17 @@ public class VisualizationReportFilterVO implements Serializable {
     @Override
     public String toString() {
         return "VisualizationReportFilter{" +
-        "id = " + id +
-        ", resourceId = " + resourceId +
-        ", dvType = " + dvType +
-        ", componentId = " + componentId +
-        ", filterId = " + filterId +
-        ", filterInfo = " + filterInfo +
-        ", filterVersion = " + filterVersion +
-        ", createTime = " + createTime +
-        ", createUser = " + createUser +
-        "}";
+                "id = " + id +
+                ", reportId = " + reportId +
+                ", taskId = " + taskId +
+                ", resourceId = " + resourceId +
+                ", dvType = " + dvType +
+                ", componentId = " + componentId +
+                ", filterId = " + filterId +
+                ", filterInfo = " + filterInfo +
+                ", filterVersion = " + filterVersion +
+                ", createTime = " + createTime +
+                ", createUser = " + createUser +
+                "}";
     }
 }