Merge pull request #10508 from dataease/pr@dev-v2@feat_report-filter2

feat(XPack): 定时报告支持自定义过滤组件值

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

@@ -30,10 +30,11 @@ public interface DataVisualizationApi {
      *
      * @return
      */
-    @GetMapping("/findById/{dvId}/{busiFlag}")
+    @PostMapping("/findById")
-    @DePermit(value = {"#p0+':read'"}, busiFlag = "#p1")
+    @DePermit(value = {"#p0.id+':read'"}, busiFlag = "#p0.busiFlag")
     @Operation(summary = "查询可视化资源")
-    DataVisualizationVO findById(@PathVariable("dvId") Long dvId,@PathVariable("busiFlag") String busiFlag);
+    DataVisualizationVO findById(@RequestBody DataVisualizationBaseRequest request);
+
 
     @GetMapping("/findCopyResource/{dvId}/{busiFlag}")
     @Operation(summary = "查询临时复制资源")

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

@@ -2,8 +2,10 @@ package io.dataease.api.visualization.request;
 
 import io.dataease.api.visualization.vo.DataVisualizationVO;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 @Data
+@NoArgsConstructor
 public class DataVisualizationBaseRequest extends DataVisualizationVO {
 
     private String opt;
@@ -24,4 +26,17 @@ public class DataVisualizationBaseRequest extends DataVisualizationVO {
 
     private String templateUrl;
 
+    private String busiFlag;
+
+    // 查询来源 main=主工程 report=定时报告
+    private String source;
+
+    // 定时报告id
+    private Long reportId;
+
+
+    public DataVisualizationBaseRequest(Long id,String busiFlag) {
+        this.busiFlag = busiFlag;
+        super.setId(id);
+    }
 }

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

@@ -152,6 +152,12 @@ public class DataVisualizationVO implements Serializable {
      */
     private Map<Long, VisualizationTemplateExtendDataDTO> extendDataInfo = new HashMap<>();
 
+
+    /**
+     * 定时报告自定义过滤数据
+     */
+    private Map<Long,VisualizationReportFilterVO> reportFilterInfo = new HashMap<>();
+
     /**
      * 水印信息
      */

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

@@ -0,0 +1,150 @@
+package io.dataease.api.visualization.vo;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author fit2cloud
+ * @since 2024-06-25
+ */
+public class VisualizationReportFilterVO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 报告ID
+     */
+    private Long id;
+
+    /**
+     * 资源id
+     */
+    private Long resourceId;
+
+    /**
+     * 资源类型
+     */
+    private String dvType;
+
+    /**
+     * 组件id
+     */
+    private Long componentId;
+
+    /**
+     * 过滤项id
+     */
+    private Long filterId;
+
+    /**
+     * 过滤组件内容
+     */
+    private String filterInfo;
+
+    /**
+     * 过滤组件版本
+     */
+    private Integer filterVersion;
+
+    /**
+     * 创建时间
+     */
+    private Long createTime;
+
+    /**
+     * 创建人
+     */
+    private String createUser;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getResourceId() {
+        return resourceId;
+    }
+
+    public void setResourceId(Long resourceId) {
+        this.resourceId = resourceId;
+    }
+
+    public String getDvType() {
+        return dvType;
+    }
+
+    public void setDvType(String dvType) {
+        this.dvType = dvType;
+    }
+
+    public Long getComponentId() {
+        return componentId;
+    }
+
+    public void setComponentId(Long componentId) {
+        this.componentId = componentId;
+    }
+
+    public Long getFilterId() {
+        return filterId;
+    }
+
+    public void setFilterId(Long filterId) {
+        this.filterId = filterId;
+    }
+
+    public String getFilterInfo() {
+        return filterInfo;
+    }
+
+    public void setFilterInfo(String filterInfo) {
+        this.filterInfo = filterInfo;
+    }
+
+    public Integer getFilterVersion() {
+        return filterVersion;
+    }
+
+    public void setFilterVersion(Integer filterVersion) {
+        this.filterVersion = filterVersion;
+    }
+
+    public Long getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Long createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getCreateUser() {
+        return createUser;
+    }
+
+    public void setCreateUser(String createUser) {
+        this.createUser = createUser;
+    }
+
+    @Override
+    public String toString() {
+        return "VisualizationReportFilter{" +
+        "id = " + id +
+        ", resourceId = " + resourceId +
+        ", dvType = " + dvType +
+        ", componentId = " + componentId +
+        ", filterId = " + filterId +
+        ", filterInfo = " + filterInfo +
+        ", filterVersion = " + filterVersion +
+        ", createTime = " + createTime +
+        ", createUser = " + createUser +
+        "}";
+    }
+}