From c114915b036dfbbeb274adce2ca50b5c8317d367 Mon Sep 17 00:00:00 2001 From: teddy Date: Fri, 28 Nov 2025 16:55:31 +0900 Subject: [PATCH] =?UTF-8?q?=EB=B6=84=EC=84=9D=EA=B2=B0=EA=B3=BC=20?= =?UTF-8?q?=EB=AA=A9=EB=A1=9D=20=ED=8E=98=EC=9D=B4=EC=A7=95=20=EC=98=A4?= =?UTF-8?q?=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../geojson/service/GeometryConversionService.java | 1 - .../Inference/InferenceResultRepositoryImpl.java | 8 ++++---- .../repository/MapSheetLearnDataGeomRepository.java | 4 ++-- .../postgres/repository/auth/AuthRepositoryImpl.java | 2 ++ 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/kamco/cd/kamcoback/geojson/service/GeometryConversionService.java b/src/main/java/com/kamco/cd/kamcoback/geojson/service/GeometryConversionService.java index 2450e99f..18d7da00 100644 --- a/src/main/java/com/kamco/cd/kamcoback/geojson/service/GeometryConversionService.java +++ b/src/main/java/com/kamco/cd/kamcoback/geojson/service/GeometryConversionService.java @@ -433,5 +433,4 @@ public class GeometryConversionService { return processedIds; } - } diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/InferenceResultRepositoryImpl.java b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/InferenceResultRepositoryImpl.java index 5002a97a..9c142efa 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/InferenceResultRepositoryImpl.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/InferenceResultRepositoryImpl.java @@ -184,6 +184,8 @@ public class InferenceResultRepositoryImpl implements InferenceResultRepositoryC .join(mapSheetAnalDataGeomEntity) .on(mapSheetAnalDataGeomEntity.dataUid.eq(mapSheetAnalDataEntity.id)) .where(builder) + .offset(pageable.getOffset()) + .limit(pageable.getPageSize()) .fetch(); long total = @@ -209,14 +211,12 @@ public class InferenceResultRepositoryImpl implements InferenceResultRepositoryC @Override public List getSheets(Long id) { return queryFactory - .select(mapSheetAnalDataGeomEntity.mapSheetNum) + .select(mapSheetAnalDataEntity.mapSheetNum) .from(mapSheetAnalEntity) .join(mapSheetAnalDataEntity) .on(mapSheetAnalDataEntity.analUid.eq(mapSheetAnalEntity.id)) - .join(mapSheetAnalDataGeomEntity) - .on(mapSheetAnalDataGeomEntity.dataUid.eq(mapSheetAnalDataEntity.id)) .where(mapSheetAnalEntity.id.eq(id)) - .groupBy(mapSheetAnalDataGeomEntity.mapSheetNum) + .groupBy(mapSheetAnalDataEntity.mapSheetNum) .fetch(); } } diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/MapSheetLearnDataGeomRepository.java b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/MapSheetLearnDataGeomRepository.java index dc1bb7bb..582b74c0 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/MapSheetLearnDataGeomRepository.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/MapSheetLearnDataGeomRepository.java @@ -26,8 +26,8 @@ public interface MapSheetLearnDataGeomRepository /** 지오메트리 타입별 조회 */ List findByGeoType(String geoType); - /** 데이터 UID로 기존 지오메트리 데이터 삭제 (재생성 전에 사용) */ - void deleteByDataUid(Long dataUid); + /** 데이터 UID로 기존 지오메트리 데이터 삭제 (재생성 전에 사용) */ + void deleteByDataUid(Long dataUid); /** PostGIS 함수를 사용하여 geometry 데이터를 직접 삽입 ST_SetSRID(ST_GeomFromGeoJSON(...), 5186) 형식으로 저장 */ @Modifying diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/auth/AuthRepositoryImpl.java b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/auth/AuthRepositoryImpl.java index c386e70e..c1a9ca90 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/auth/AuthRepositoryImpl.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/auth/AuthRepositoryImpl.java @@ -75,6 +75,8 @@ public class AuthRepositoryImpl implements AuthRepositoryCustom { userEntity.createdDttm)) .from(userEntity) .where(builder) + .offset(pageable.getOffset()) + .limit(pageable.getPageSize()) .orderBy(userEntity.userId.asc()) .fetch();