From 2f7259ca9db0ec0692c8f9060ddaecb393df7b88 Mon Sep 17 00:00:00 2001 From: Chuck1sn Date: Thu, 26 Jun 2025 19:27:51 +0800 Subject: [PATCH] fix endpoint --- .../zl/mjga/controller/LibraryController.java | 37 ++++++++++++++----- .../zl/mjga/dto/knowledge/DocUpdateDto.java | 6 +++ .../LibraryUpsertDto.java | 2 +- .../mjga/dto/library/LibraryDocUpdateDto.java | 6 --- 4 files changed, 35 insertions(+), 16 deletions(-) create mode 100644 backend/src/main/java/com/zl/mjga/dto/knowledge/DocUpdateDto.java rename backend/src/main/java/com/zl/mjga/dto/{library => knowledge}/LibraryUpsertDto.java (78%) delete mode 100644 backend/src/main/java/com/zl/mjga/dto/library/LibraryDocUpdateDto.java diff --git a/backend/src/main/java/com/zl/mjga/controller/LibraryController.java b/backend/src/main/java/com/zl/mjga/controller/LibraryController.java index 2dbc89a..4cfef93 100644 --- a/backend/src/main/java/com/zl/mjga/controller/LibraryController.java +++ b/backend/src/main/java/com/zl/mjga/controller/LibraryController.java @@ -1,22 +1,25 @@ package com.zl.mjga.controller; -import com.zl.mjga.dto.library.LibraryDocUpdateDto; -import com.zl.mjga.dto.library.LibraryUpsertDto; +import com.zl.mjga.dto.knowledge.DocUpdateDto; +import com.zl.mjga.dto.knowledge.LibraryUpsertDto; import com.zl.mjga.repository.LibraryDocRepository; +import com.zl.mjga.repository.LibraryDocSegmentRepository; import com.zl.mjga.repository.LibraryRepository; import com.zl.mjga.service.RagService; import com.zl.mjga.service.UploadService; import jakarta.validation.Valid; +import java.util.List; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.jooq.generated.mjga.tables.pojos.Library; import org.jooq.generated.mjga.tables.pojos.LibraryDoc; +import org.jooq.generated.mjga.tables.pojos.LibraryDocSegment; import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @RestController -@RequestMapping("/library") +@RequestMapping("/knowledge") @RequiredArgsConstructor @Slf4j public class LibraryController { @@ -25,8 +28,24 @@ public class LibraryController { private final RagService ragService; private final LibraryRepository libraryRepository; private final LibraryDocRepository libraryDocRepository; + private final LibraryDocSegmentRepository libraryDocSegmentRepository; - @PostMapping("/upsert") + @GetMapping("/libraries") + public List queryLibraries() { + return libraryRepository.findAll(); + } + + @GetMapping("/docs") + public List queryLibraryDocs(@RequestParam Long libraryId) { + return libraryDocRepository.fetchByLibId(libraryId); + } + + @GetMapping("/segments") + public List queryLibraryDocSegments(@RequestParam Long libraryDocId) { + return libraryDocSegmentRepository.fetchByDocId(libraryDocId); + } + + @PostMapping("/library") public void upsertLibrary(@RequestBody @Valid LibraryUpsertDto libraryUpsertDto) { Library library = new Library(); library.setId(libraryUpsertDto.id()); @@ -35,7 +54,7 @@ public class LibraryController { libraryRepository.merge(library); } - @DeleteMapping + @DeleteMapping("/library") public void deleteLibrary(@RequestParam Long libraryId) { ragService.deleteLibraryBy(libraryId); } @@ -46,15 +65,15 @@ public class LibraryController { } @PutMapping("/doc") - public void updateLibraryDoc(@RequestBody @Valid LibraryDocUpdateDto libraryDocUpdateDto) { + public void updateLibraryDoc(@RequestBody @Valid DocUpdateDto docUpdateDto) { LibraryDoc libraryDoc = new LibraryDoc(); - libraryDoc.setId(libraryDocUpdateDto.id()); - libraryDoc.setEnable(libraryDocUpdateDto.enable()); + libraryDoc.setId(docUpdateDto.id()); + libraryDoc.setEnable(docUpdateDto.enable()); libraryDocRepository.merge(libraryDoc); } @PostMapping( - value = "/upload", + value = "/doc/upload", consumes = MediaType.MULTIPART_FORM_DATA_VALUE, produces = MediaType.TEXT_PLAIN_VALUE) public String uploadLibraryDoc( diff --git a/backend/src/main/java/com/zl/mjga/dto/knowledge/DocUpdateDto.java b/backend/src/main/java/com/zl/mjga/dto/knowledge/DocUpdateDto.java new file mode 100644 index 0000000..f89605d --- /dev/null +++ b/backend/src/main/java/com/zl/mjga/dto/knowledge/DocUpdateDto.java @@ -0,0 +1,6 @@ +package com.zl.mjga.dto.knowledge; + +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; + +public record DocUpdateDto(@NotNull Long id, @NotEmpty Boolean enable) {} diff --git a/backend/src/main/java/com/zl/mjga/dto/library/LibraryUpsertDto.java b/backend/src/main/java/com/zl/mjga/dto/knowledge/LibraryUpsertDto.java similarity index 78% rename from backend/src/main/java/com/zl/mjga/dto/library/LibraryUpsertDto.java rename to backend/src/main/java/com/zl/mjga/dto/knowledge/LibraryUpsertDto.java index e5c88f6..3ddfd77 100644 --- a/backend/src/main/java/com/zl/mjga/dto/library/LibraryUpsertDto.java +++ b/backend/src/main/java/com/zl/mjga/dto/knowledge/LibraryUpsertDto.java @@ -1,4 +1,4 @@ -package com.zl.mjga.dto.library; +package com.zl.mjga.dto.knowledge; import jakarta.validation.constraints.NotEmpty; diff --git a/backend/src/main/java/com/zl/mjga/dto/library/LibraryDocUpdateDto.java b/backend/src/main/java/com/zl/mjga/dto/library/LibraryDocUpdateDto.java deleted file mode 100644 index 18a59cb..0000000 --- a/backend/src/main/java/com/zl/mjga/dto/library/LibraryDocUpdateDto.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.zl.mjga.dto.library; - -import jakarta.validation.constraints.NotEmpty; -import jakarta.validation.constraints.NotNull; - -public record LibraryDocUpdateDto(@NotNull Long id, @NotEmpty Boolean enable) {}