From 522cd225a94380c150b35c9c1f270bfa6e3dfdea Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Mon, 9 Sep 2024 11:16:54 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=88=86=E4=BA=AB=E7=9B=B8=E5=85=B3api=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E6=96=87=E6=A1=A3=20#11855?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/dataease/api/xpack/share/ShareTicketApi.java | 10 +++++++++- .../io/dataease/api/xpack/share/XpackShareApi.java | 2 +- .../api/xpack/share/request/TicketCreator.java | 11 +++++++---- .../api/xpack/share/request/TicketDelRequest.java | 5 +++-- .../api/xpack/share/request/TicketSwitchRequest.java | 7 ++++--- .../src/main/java/io/dataease/doc/SwaggerConfig.java | 2 +- 6 files changed, 25 insertions(+), 12 deletions(-) diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/share/ShareTicketApi.java b/sdk/api/api-base/src/main/java/io/dataease/api/xpack/share/ShareTicketApi.java index f8a8959502..61ff7b2ef9 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/share/ShareTicketApi.java +++ b/sdk/api/api-base/src/main/java/io/dataease/api/xpack/share/ShareTicketApi.java @@ -4,6 +4,9 @@ import io.dataease.api.xpack.share.request.TicketCreator; import io.dataease.api.xpack.share.request.TicketDelRequest; import io.dataease.api.xpack.share.request.TicketSwitchRequest; import io.dataease.api.xpack.share.vo.TicketVO; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.enums.ParameterIn; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; @@ -12,18 +15,23 @@ import org.springframework.web.bind.annotation.RequestBody; import java.util.List; -@Tag(name = "分享:TICKET") +@Tag(name = "可视化管理:分享:TICKET") public interface ShareTicketApi { @PostMapping("/saveTicket") + @Operation(summary = "保存Ticket") String saveTicket(@RequestBody TicketCreator creator); @PostMapping("/delTicket") + @Operation(summary = "删除Ticket") void deleteTicket(@RequestBody TicketDelRequest request); @PostMapping("/enableTicket") + @Operation(summary = "切换Ticket必填状态") void switchRequire(@RequestBody TicketSwitchRequest request); @GetMapping("/query/{resourceId}") + @Operation(summary = "根据资源查询Ticket") + @Parameter(name = "resourceId", description = "资源ID", required = true, in = ParameterIn.PATH) List query(@PathVariable("resourceId") Long resourceId); } diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/share/XpackShareApi.java b/sdk/api/api-base/src/main/java/io/dataease/api/xpack/share/XpackShareApi.java index 4e82e825c1..a3ec2a2fab 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/share/XpackShareApi.java +++ b/sdk/api/api-base/src/main/java/io/dataease/api/xpack/share/XpackShareApi.java @@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.RequestBody; import java.util.List; import java.util.Map; -@Tag(name = "分享") +@Tag(name = "可视化管理:分享") public interface XpackShareApi { @Operation(summary = "查询资源分享状态") diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/share/request/TicketCreator.java b/sdk/api/api-base/src/main/java/io/dataease/api/xpack/share/request/TicketCreator.java index 1cb9250e93..06d0739cb2 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/share/request/TicketCreator.java +++ b/sdk/api/api-base/src/main/java/io/dataease/api/xpack/share/request/TicketCreator.java @@ -1,22 +1,25 @@ package io.dataease.api.xpack.share.request; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.io.Serial; import java.io.Serializable; +@Schema(description = "分享Ticket") @Data public class TicketCreator implements Serializable { @Serial private static final long serialVersionUID = 8661378104009097296L; + @Schema(description = "Ticket", requiredMode = Schema.RequiredMode.REQUIRED) private String ticket; - + @Schema(description = "有效期", requiredMode = Schema.RequiredMode.REQUIRED) private Long exp; - + @Schema(description = "参数") private String args; - + @Schema(description = "分享链接UUID", requiredMode = Schema.RequiredMode.REQUIRED) private String uuid; - + @Schema(description = "刷新Ticket") private boolean generateNew; } diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/share/request/TicketDelRequest.java b/sdk/api/api-base/src/main/java/io/dataease/api/xpack/share/request/TicketDelRequest.java index f302d53c8e..159ac4a873 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/share/request/TicketDelRequest.java +++ b/sdk/api/api-base/src/main/java/io/dataease/api/xpack/share/request/TicketDelRequest.java @@ -1,14 +1,15 @@ package io.dataease.api.xpack.share.request; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.io.Serial; import java.io.Serializable; - +@Schema(description = "删除Ticket") @Data public class TicketDelRequest implements Serializable { @Serial private static final long serialVersionUID = -3978489349675065507L; - + @Schema(description = "Ticket", requiredMode = Schema.RequiredMode.REQUIRED) private String ticket; } diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/share/request/TicketSwitchRequest.java b/sdk/api/api-base/src/main/java/io/dataease/api/xpack/share/request/TicketSwitchRequest.java index dd0c376c93..25b2089547 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/share/request/TicketSwitchRequest.java +++ b/sdk/api/api-base/src/main/java/io/dataease/api/xpack/share/request/TicketSwitchRequest.java @@ -1,16 +1,17 @@ package io.dataease.api.xpack.share.request; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.io.Serial; import java.io.Serializable; - +@Schema(description = "切换器") @Data public class TicketSwitchRequest implements Serializable { @Serial private static final long serialVersionUID = 7670768142874123370L; - + @Schema(description = "资源ID", requiredMode = Schema.RequiredMode.REQUIRED) private String resourceId; - + @Schema(description = "是否必填", requiredMode = Schema.RequiredMode.REQUIRED) private Boolean require = false; } diff --git a/sdk/common/src/main/java/io/dataease/doc/SwaggerConfig.java b/sdk/common/src/main/java/io/dataease/doc/SwaggerConfig.java index 3ec4390be3..e123c513d0 100644 --- a/sdk/common/src/main/java/io/dataease/doc/SwaggerConfig.java +++ b/sdk/common/src/main/java/io/dataease/doc/SwaggerConfig.java @@ -50,7 +50,7 @@ public class SwaggerConfig { @Bean public GroupedOpenApi visualizationApi() { - return GroupedOpenApi.builder().group("1-visualization").displayName("可视化管理").packagesToScan("io.dataease.visualization").build(); + return GroupedOpenApi.builder().group("1-visualization").displayName("可视化管理").packagesToScan("io.dataease.visualization", "io.dataease.share").build(); } @Bean