From d0f17a8086d318683a85ba6b908298d888d45c14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= Date: Fri, 5 Apr 2024 17:18:32 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B2=80=EC=83=89=20=EC=9A=94=EC=B2=AD=20api?= =?UTF-8?q?=20=EA=B0=9C=EC=84=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../opensearch/docSearch/DocSearchController.java | 12 ++++++------ .../docSearch/repository/DocContentRepository.java | 3 ++- .../docSearch/repository/DocIndexRepository.java | 3 ++- .../docSearch/repository/DocTitleRepository.java | 3 ++- .../docSearch/service/DocSearchService.java | 13 +++++++------ 5 files changed, 19 insertions(+), 15 deletions(-) diff --git a/kcsc-opensearch/src/main/java/com/dbnt/kcscopensearch/opensearch/docSearch/DocSearchController.java b/kcsc-opensearch/src/main/java/com/dbnt/kcscopensearch/opensearch/docSearch/DocSearchController.java index 65478cc..ae562ef 100644 --- a/kcsc-opensearch/src/main/java/com/dbnt/kcscopensearch/opensearch/docSearch/DocSearchController.java +++ b/kcsc-opensearch/src/main/java/com/dbnt/kcscopensearch/opensearch/docSearch/DocSearchController.java @@ -20,15 +20,15 @@ public class DocSearchController { private final DocSearchService docSearchService; @GetMapping(value="/doc-title", produces = MediaType.APPLICATION_JSON_VALUE) - public List searchTitle (@RequestParam(value="searchText", required = true) String text){ - return docSearchService.selectDocTitle(text); + public List searchTitle (@RequestParam(value="searchText", required = true) String text, @RequestParam(value="pageNum", required = true) Integer pageNum){ + return docSearchService.selectDocTitle(text, pageNum); } @GetMapping(value="/doc-index", produces = MediaType.APPLICATION_JSON_VALUE) - public List searchIndex (@RequestParam(value="searchText", required = true) String text){ - return docSearchService.selectDocIndex(text); + public List searchIndex (@RequestParam(value="searchText", required = true) String text, @RequestParam(value="pageNum", required = true) Integer pageNum){ + return docSearchService.selectDocIndex(text, pageNum); } @GetMapping(value="/doc-content", produces = MediaType.APPLICATION_JSON_VALUE) - public List searchContent (@RequestParam(value="searchText", required = true) String text){ - return docSearchService.selectDocContent(text); + public List searchContent (@RequestParam(value="searchText", required = true) String text, @RequestParam(value="pageNum", required = true) Integer pageNum){ + return docSearchService.selectDocContent(text, pageNum); } } diff --git a/kcsc-opensearch/src/main/java/com/dbnt/kcscopensearch/opensearch/docSearch/repository/DocContentRepository.java b/kcsc-opensearch/src/main/java/com/dbnt/kcscopensearch/opensearch/docSearch/repository/DocContentRepository.java index ef34138..688ce7c 100644 --- a/kcsc-opensearch/src/main/java/com/dbnt/kcscopensearch/opensearch/docSearch/repository/DocContentRepository.java +++ b/kcsc-opensearch/src/main/java/com/dbnt/kcscopensearch/opensearch/docSearch/repository/DocContentRepository.java @@ -1,6 +1,7 @@ package com.dbnt.kcscopensearch.opensearch.docSearch.repository; import com.dbnt.kcscopensearch.opensearch.docSearch.model.DocContent; +import org.springframework.data.domain.Pageable; import org.springframework.data.elasticsearch.repository.ElasticsearchRepository; import org.springframework.stereotype.Repository; @@ -9,5 +10,5 @@ import java.util.List; @Repository public interface DocContentRepository extends ElasticsearchRepository { - List findByTableContentContains(String text); + List findByTableContentContains(String text, Pageable pageable); } diff --git a/kcsc-opensearch/src/main/java/com/dbnt/kcscopensearch/opensearch/docSearch/repository/DocIndexRepository.java b/kcsc-opensearch/src/main/java/com/dbnt/kcscopensearch/opensearch/docSearch/repository/DocIndexRepository.java index b180047..f2b5641 100644 --- a/kcsc-opensearch/src/main/java/com/dbnt/kcscopensearch/opensearch/docSearch/repository/DocIndexRepository.java +++ b/kcsc-opensearch/src/main/java/com/dbnt/kcscopensearch/opensearch/docSearch/repository/DocIndexRepository.java @@ -1,6 +1,7 @@ package com.dbnt.kcscopensearch.opensearch.docSearch.repository; import com.dbnt.kcscopensearch.opensearch.docSearch.model.DocIndex; +import org.springframework.data.domain.Pageable; import org.springframework.data.elasticsearch.repository.ElasticsearchRepository; import org.springframework.stereotype.Repository; @@ -9,5 +10,5 @@ import java.util.List; @Repository public interface DocIndexRepository extends ElasticsearchRepository { - List findByGroupTitleContains(String text); + List findByGroupTitleContains(String text, Pageable pageable); } diff --git a/kcsc-opensearch/src/main/java/com/dbnt/kcscopensearch/opensearch/docSearch/repository/DocTitleRepository.java b/kcsc-opensearch/src/main/java/com/dbnt/kcscopensearch/opensearch/docSearch/repository/DocTitleRepository.java index 07c68af..8f70978 100644 --- a/kcsc-opensearch/src/main/java/com/dbnt/kcscopensearch/opensearch/docSearch/repository/DocTitleRepository.java +++ b/kcsc-opensearch/src/main/java/com/dbnt/kcscopensearch/opensearch/docSearch/repository/DocTitleRepository.java @@ -1,6 +1,7 @@ package com.dbnt.kcscopensearch.opensearch.docSearch.repository; import com.dbnt.kcscopensearch.opensearch.docSearch.model.DocTitle; +import org.springframework.data.domain.Pageable; import org.springframework.data.elasticsearch.repository.ElasticsearchRepository; import org.springframework.stereotype.Repository; @@ -9,5 +10,5 @@ import java.util.List; @Repository public interface DocTitleRepository extends ElasticsearchRepository { - List findByDocNmContains(String text); + List findByDocNmContains(String text, Pageable pageable); } diff --git a/kcsc-opensearch/src/main/java/com/dbnt/kcscopensearch/opensearch/docSearch/service/DocSearchService.java b/kcsc-opensearch/src/main/java/com/dbnt/kcscopensearch/opensearch/docSearch/service/DocSearchService.java index 82e53a4..69b8187 100644 --- a/kcsc-opensearch/src/main/java/com/dbnt/kcscopensearch/opensearch/docSearch/service/DocSearchService.java +++ b/kcsc-opensearch/src/main/java/com/dbnt/kcscopensearch/opensearch/docSearch/service/DocSearchService.java @@ -9,6 +9,7 @@ import com.dbnt.kcscopensearch.opensearch.docSearch.repository.DocTitleRepositor import lombok.RequiredArgsConstructor; import org.slf4j.LoggerFactory; import org.slf4j.Logger; +import org.springframework.data.domain.PageRequest; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -122,15 +123,15 @@ public class DocSearchService { log.info("contentIndexing end"); } - public List selectDocTitle(String text) { - return titleRepository.findByDocNmContains(text); + public List selectDocTitle(String text, Integer pageNum) { + return titleRepository.findByDocNmContains(text, PageRequest.of(pageNum, 20)); } - public List selectDocIndex(String text){ - return indexRepository.findByGroupTitleContains(text); + public List selectDocIndex(String text, Integer pageNum){ + return indexRepository.findByGroupTitleContains(text, PageRequest.of(pageNum, 20)); } - public List selectDocContent(String text){ - return contentRepository.findByTableContentContains(text); + public List selectDocContent(String text, Integer pageNum){ + return contentRepository.findByTableContentContains(text, PageRequest.of(pageNum, 20)); } }