From e2925fff59a8fae8b091ffb86c84de290fe088cf Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Thu, 6 Mar 2025 11:28:18 +0800 Subject: [PATCH] =?UTF-8?q?feat(X-Pack):=20=E7=BB=84=E7=BB=87=E5=88=87?= =?UTF-8?q?=E6=8D=A2=E7=BB=84=E4=BB=B6=E5=A2=9E=E5=8A=A0=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E3=80=81=E5=88=86=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataease/api/permissions/org/api/OrgApi.java | 6 ++++++ .../api/permissions/org/dto/OrgLazyRequest.java | 14 ++++++++++++++ .../api/permissions/org/vo/LazyMountedVO.java | 16 ++++++++++++++++ .../api/permissions/org/vo/MountedVO.java | 4 +++- 4 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/org/dto/OrgLazyRequest.java create mode 100644 sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/org/vo/LazyMountedVO.java diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/org/api/OrgApi.java b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/org/api/OrgApi.java index 80308aa1b8..b5e4ec487e 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/org/api/OrgApi.java +++ b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/org/api/OrgApi.java @@ -3,7 +3,9 @@ package io.dataease.api.permissions.org.api; import com.github.xiaoymin.knife4j.annotations.ApiSupport; import io.dataease.api.permissions.org.dto.OrgCreator; import io.dataease.api.permissions.org.dto.OrgEditor; +import io.dataease.api.permissions.org.dto.OrgLazyRequest; import io.dataease.api.permissions.org.dto.OrgRequest; +import io.dataease.api.permissions.org.vo.LazyMountedVO; import io.dataease.api.permissions.org.vo.MountedVO; import io.dataease.api.permissions.org.vo.OrgDetailVO; import io.dataease.api.permissions.org.vo.OrgPageVO; @@ -54,6 +56,10 @@ public interface OrgApi { @PostMapping("/mounted") List mounted(@RequestBody KeywordRequest request); + @Operation(summary = "查询权限内组织树(懒加载)") + @PostMapping("/lazyMounted") + LazyMountedVO lazyMounted(@RequestBody OrgLazyRequest request); + @Operation(summary = "", hidden = true) @GetMapping("/resourceExist/{oid}") boolean resourceExist(@PathVariable("oid") Long oid); diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/org/dto/OrgLazyRequest.java b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/org/dto/OrgLazyRequest.java new file mode 100644 index 0000000000..5c3bbb283e --- /dev/null +++ b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/org/dto/OrgLazyRequest.java @@ -0,0 +1,14 @@ +package io.dataease.api.permissions.org.dto; + +import io.dataease.model.KeywordRequest; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; + +@EqualsAndHashCode(callSuper = true) +@Data +public class OrgLazyRequest extends KeywordRequest implements Serializable { + + private Long pid; +} diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/org/vo/LazyMountedVO.java b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/org/vo/LazyMountedVO.java new file mode 100644 index 0000000000..86a609a4d0 --- /dev/null +++ b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/org/vo/LazyMountedVO.java @@ -0,0 +1,16 @@ +package io.dataease.api.permissions.org.vo; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +public class LazyMountedVO implements Serializable { + + private List nodes; + + private String name; + + private List expandKeyList; +} diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/org/vo/MountedVO.java b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/org/vo/MountedVO.java index d12fb367c7..2bf9affa43 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/org/vo/MountedVO.java +++ b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/org/vo/MountedVO.java @@ -17,7 +17,7 @@ public class MountedVO implements Serializable { private static final long serialVersionUID = -7642741925705465785L; @Schema(description = "ID") - @JsonSerialize(using= ToStringSerializer.class) + @JsonSerialize(using = ToStringSerializer.class) private Long id; @Schema(description = "名称") private String name; @@ -25,4 +25,6 @@ public class MountedVO implements Serializable { private boolean readOnly = true; @Schema(description = "子集") private List children; + + private boolean leaf; }