Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit3d00ac1

Browse files
author
Thomas
committed
Add GID to folder
1 parent5221870 commit3d00ac1

File tree

5 files changed

+17
-0
lines changed

5 files changed

+17
-0
lines changed

‎server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/folder/model/Folder.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
packageorg.lowcoder.domain.folder.model;
22

33

4+
importcom.github.f4b6a3.uuid.UuidCreator;
45
importjakarta.annotation.Nullable;
56
importlombok.Getter;
67
importlombok.NoArgsConstructor;
@@ -15,8 +16,10 @@
1516
publicclassFolderextendsHasIdAndAuditing {
1617

1718
privateStringorganizationId;
19+
privateStringgid =UuidCreator.getTimeOrderedEpoch().toString();
1820
@Nullable
1921
privateStringparentFolderId;// null represents folder in the root folder
22+
privateStringparentFolderGid;// null represents folder in the root folder
2023
privateStringname;
2124
privateStringtitle;
2225
privateStringdescription;

‎server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/folder/repository/FolderRepository.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,14 @@
55
importorg.springframework.stereotype.Repository;
66

77
importreactor.core.publisher.Flux;
8+
importreactor.core.publisher.Mono;
9+
10+
importjava.util.Collection;
811

912
@Repository
1013
publicinterfaceFolderRepositoryextendsReactiveMongoRepository<Folder,String> {
1114

1215
Flux<Folder>findByOrganizationId(StringorganizationId);
16+
Mono<Folder>findByGid(StringorganizationGid);
17+
Mono<Void>deleteAllByGid(Collection<String>gids);
1318
}

‎server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/folder/service/FolderServiceImpl.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,9 @@ public Mono<Folder> findById(String id) {
3939
returnMono.error(newBizException(BizError.INVALID_PARAMETER,"INVALID_PARAMETER",FieldName.ID));
4040
}
4141

42+
if(FieldName.isGID(id))
43+
returnrepository.findByGid(id)
44+
.switchIfEmpty(Mono.error(newBizException(BizError.NO_RESOURCE_FOUND,"FOLDER_NOT_FOUND",id)));
4245
returnrepository.findById(id)
4346
.switchIfEmpty(Mono.error(newBizException(BizError.NO_RESOURCE_FOUND,"FOLDER_NOT_FOUND",id)));
4447
}
@@ -55,6 +58,8 @@ public Flux<Folder> findByOrganizationId(String organizationId) {
5558

5659
@Override
5760
publicMono<Void>deleteAllById(Collection<String>ids) {
61+
if(!ids.isEmpty() &&FieldName.isGID(ids.stream().findFirst().get()))
62+
returnrepository.deleteAllByGid(ids);
5863
returnrepository.deleteAllById(ids);
5964
}
6065

‎server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/home/FolderApiServiceImpl.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,9 @@ private Mono<Tree<ApplicationInfoView, FolderInfoView>> buildApplicationInfoView
315315
returnFolderInfoView.builder()
316316
.orgId(orgMember.getOrgId())
317317
.folderId(folder.getId())
318+
.folderGid(folder.getGid())
318319
.parentFolderId(folder.getParentFolderId())
320+
.parentFolderGid(folder.getParentFolderGid())
319321
.name(folder.getName())
320322
.createAt(folder.getCreatedAt().toEpochMilli())
321323
.createBy(creator ==null ?null :creator.getName())

‎server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/home/FolderInfoView.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@ public class FolderInfoView {
1818

1919
privatefinalStringorgId;
2020
privatefinalStringfolderId;
21+
privatefinalStringfolderGid;
2122
privatefinalStringparentFolderId;
23+
privatefinalStringparentFolderGid;
2224
privatefinalStringname;
2325
privatefinalStringtitle;
2426
privatefinalStringdescription;

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp