From 16e1eea660a69498e8cfb6052bdeffbe113d6eea Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Mon, 15 Jul 2024 18:51:24 +0800 Subject: [PATCH] =?UTF-8?q?feat(X-Pack):=20=E5=A2=9E=E5=8A=A0=E5=90=8E?= =?UTF-8?q?=E5=8F=B0=E5=AF=BC=E5=87=BA=E4=BB=AA=E8=A1=A8=E6=9D=BF=E3=80=81?= =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E5=9B=BE=E7=89=87=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- de-xpack | 2 +- .../io/dataease/api/report/ReportApi.java | 5 +++++ .../api/report/dto/ReportExportRequest.java | 22 +++++++++++++++++++ 3 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 sdk/api/api-base/src/main/java/io/dataease/api/report/dto/ReportExportRequest.java diff --git a/de-xpack b/de-xpack index 697683f9f0..5e9ea291de 160000 --- a/de-xpack +++ b/de-xpack @@ -1 +1 @@ -Subproject commit 697683f9f013c50fd6aef0a9d723b1876f7018af +Subproject commit 5e9ea291de63ba42144f55ce2aba43abf6f9d906 diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/report/ReportApi.java b/sdk/api/api-base/src/main/java/io/dataease/api/report/ReportApi.java index 7d47125b8c..34959ad3de 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/report/ReportApi.java +++ b/sdk/api/api-base/src/main/java/io/dataease/api/report/ReportApi.java @@ -11,6 +11,8 @@ import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Parameters; import io.swagger.v3.oas.annotations.enums.ParameterIn; import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.core.io.ByteArrayResource; +import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; @@ -75,4 +77,7 @@ public interface ReportApi { @PostMapping("/logMsg") String logMsg(@RequestBody ReportInstanceMsgRequest request); + + @PostMapping("/export") + ResponseEntity export(@RequestBody ReportExportRequest request); } diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/report/dto/ReportExportRequest.java b/sdk/api/api-base/src/main/java/io/dataease/api/report/dto/ReportExportRequest.java new file mode 100644 index 0000000000..ef6a4b783c --- /dev/null +++ b/sdk/api/api-base/src/main/java/io/dataease/api/report/dto/ReportExportRequest.java @@ -0,0 +1,22 @@ +package io.dataease.api.report.dto; + +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; + +@Data +public class ReportExportRequest implements Serializable { + @Serial + private static final long serialVersionUID = -5372551595882128201L; + + private Long resourceId; + + private String busiType; + + private String pixel; + + private Integer extWaitTime = 0; + + private Integer resultFormat = 0; +}