From af25143cd53ffbc2f460d7b6ec60b4a9e413d2af Mon Sep 17 00:00:00 2001 From: "gayoun.park" Date: Tue, 27 Jan 2026 12:29:44 +0900 Subject: [PATCH] =?UTF-8?q?=EC=98=81=EC=83=81=EA=B4=80=EB=A6=AC=20-=20?= =?UTF-8?q?=EC=9E=90=EB=8F=99=EC=B6=94=EB=A1=A0=EC=A0=9C=EC=99=B8/?= =?UTF-8?q?=ED=95=B4=EC=A0=9C=20=EB=A1=9C=EC=A7=81,=20=EB=AA=A9=EB=A1=9D?= =?UTF-8?q?=20API=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/MapSheetMngFileJobCoreService.java | 5 ++- .../mapsheet/MapSheetMngRepositoryImpl.java | 4 ++ .../MapSheetMngFileJobRepositoryCustom.java | 3 +- .../MapSheetMngFileJobRepositoryImpl.java | 4 +- .../service/MapSheetMngFileJobService.java | 40 ++++++++----------- 5 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/core/MapSheetMngFileJobCoreService.java b/src/main/java/com/kamco/cd/kamcoback/postgres/core/MapSheetMngFileJobCoreService.java index 352e600b..64cad2a8 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/core/MapSheetMngFileJobCoreService.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/core/MapSheetMngFileJobCoreService.java @@ -1,5 +1,6 @@ package com.kamco.cd.kamcoback.postgres.core; +import com.kamco.cd.kamcoback.common.enums.CommonUseStatus; import com.kamco.cd.kamcoback.postgres.entity.MapSheetMngFileEntity; import com.kamco.cd.kamcoback.postgres.repository.scheduler.MapSheetMngFileJobRepository; import com.kamco.cd.kamcoback.scheduler.dto.MapSheetMngDto; @@ -69,7 +70,7 @@ public class MapSheetMngFileJobCoreService { strtYyyy, endYyyy, mapSheetNum); } - public void updateException5kMapSheet(String mapSheetNum) { - mapSheetMngFileJobRepository.updateException5kMapSheet(mapSheetNum); + public void updateException5kMapSheet(String mapSheetNum, CommonUseStatus commonUseStatus) { + mapSheetMngFileJobRepository.updateException5kMapSheet(mapSheetNum, commonUseStatus); } } diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/mapsheet/MapSheetMngRepositoryImpl.java b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/mapsheet/MapSheetMngRepositoryImpl.java index 5bb4fbfa..e67af416 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/mapsheet/MapSheetMngRepositoryImpl.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/mapsheet/MapSheetMngRepositoryImpl.java @@ -169,6 +169,10 @@ public class MapSheetMngRepositoryImpl extends QuerydslRepositorySupport .from(mapSheetMngEntity) .leftJoin(mapSheetMngHstEntity) .on(mapSheetMngEntity.mngYyyy.eq(mapSheetMngHstEntity.mngYyyy)) + .innerJoin(mapInkx5kEntity) + .on( + mapSheetMngHstEntity.mapSheetNum.eq(mapInkx5kEntity.mapidcdNo), + mapInkx5kEntity.useInference.eq(CommonUseStatus.USE)) .where(whereBuilder) // .offset(pageable.getOffset()) // .limit(pageable.getPageSize()) diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/scheduler/MapSheetMngFileJobRepositoryCustom.java b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/scheduler/MapSheetMngFileJobRepositoryCustom.java index d05930c6..41c3ddf1 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/scheduler/MapSheetMngFileJobRepositoryCustom.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/scheduler/MapSheetMngFileJobRepositoryCustom.java @@ -1,5 +1,6 @@ package com.kamco.cd.kamcoback.postgres.repository.scheduler; +import com.kamco.cd.kamcoback.common.enums.CommonUseStatus; import com.kamco.cd.kamcoback.scheduler.dto.MapSheetMngDto; import com.kamco.cd.kamcoback.scheduler.dto.MapSheetMngDto.MngHstDto; import java.util.List; @@ -21,5 +22,5 @@ public interface MapSheetMngFileJobRepositoryCustom { public Long findByHstMapSheetBeforeYyyyListCount(int strtYyyy, int endYyyy, String mapSheetNum); - public void updateException5kMapSheet(String mapSheetNum); + public void updateException5kMapSheet(String mapSheetNum, CommonUseStatus commonUseStatus); } diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/scheduler/MapSheetMngFileJobRepositoryImpl.java b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/scheduler/MapSheetMngFileJobRepositoryImpl.java index ef68bf7a..0e1a121b 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/scheduler/MapSheetMngFileJobRepositoryImpl.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/scheduler/MapSheetMngFileJobRepositoryImpl.java @@ -257,11 +257,11 @@ public class MapSheetMngFileJobRepositoryImpl extends QuerydslRepositorySupport } @Override - public void updateException5kMapSheet(String mapSheetNum) { + public void updateException5kMapSheet(String mapSheetNum, CommonUseStatus commonUseStatus) { long updateCount = queryFactory .update(mapInkx5kEntity) - .set(mapInkx5kEntity.useInference, CommonUseStatus.AUTO_EXCEPT) + .set(mapInkx5kEntity.useInference, commonUseStatus) .where(mapInkx5kEntity.mapidcdNo.eq(mapSheetNum)) .execute(); } diff --git a/src/main/java/com/kamco/cd/kamcoback/scheduler/service/MapSheetMngFileJobService.java b/src/main/java/com/kamco/cd/kamcoback/scheduler/service/MapSheetMngFileJobService.java index 8758120b..a88cf617 100644 --- a/src/main/java/com/kamco/cd/kamcoback/scheduler/service/MapSheetMngFileJobService.java +++ b/src/main/java/com/kamco/cd/kamcoback/scheduler/service/MapSheetMngFileJobService.java @@ -2,6 +2,7 @@ package com.kamco.cd.kamcoback.scheduler.service; import static java.lang.String.CASE_INSENSITIVE_ORDER; +import com.kamco.cd.kamcoback.common.enums.CommonUseStatus; import com.kamco.cd.kamcoback.common.utils.FIleChecker; import com.kamco.cd.kamcoback.common.utils.FIleChecker.Basic; import com.kamco.cd.kamcoback.postgres.core.MapSheetMngFileJobCoreService; @@ -79,26 +80,22 @@ public class MapSheetMngFileJobService { for (MngHstDto item : mapSheetFileNotYetList) { // 5K도엽 자동추론제외 - Long exceptCheckCnt = - this.mapSheetAutoExceptionUpdate(item.getMngYyyy(), item.getMapSheetNum()); + // Long exceptCheckCnt = + // this.mapSheetAutoExceptionUpdate(item.getMngYyyy(), item.getMapSheetNum()); // 도엽별 파일 체크 진행중으로 변경 item.setDataState("PROCESSING"); item.setUseInference("USE"); - if (exceptCheckCnt == 0) { - item.setUseInference("EXCEPT"); - } + // if (exceptCheckCnt == 0) { + // item.setUseInference("EXCEPT"); + // } mngHstDataSyncStateUpdate(item); // 1. MngHstDto 객체의 필드 값에 접근 - // hstUid = item.getHstUid(); - // syncState = item.getSyncState(); - srchDto.setMaxDepth(10); srchDto.setDirPath(item.getSyncMngPath()); srchDto.setExtension("tif,tfw"); srchDto.setFileNm(item.getMapSheetNum()); - // srchDto.setFileNm("34602047"); System.out.println( "UID: " @@ -112,8 +109,6 @@ public class MapSheetMngFileJobService { + " .tif,tfw"); // 도엽번호로 파일 찾기 - // basicList = this.getFilesDepthAll(srchDto); - basicList = FIleChecker.getFilesFromAllDepth( srchDto.getDirPath(), @@ -137,13 +132,18 @@ public class MapSheetMngFileJobService { if (tfwCnt == 0 && tifCnt == 0) { syncState = "NOFILE"; + + item.setUseInference("EXCEPT"); // hst 테이블 use_inference EXCEPT 하기 + // tb_map_inkx_5k 테이블 자동 추론제외 update + mapSheetMngFileJobCoreService.updateException5kMapSheet( + item.getMapSheetNum(), CommonUseStatus.AUTO_EXCEPT); + } else { + // tb_map_inkx_5k 테이블 자동 추론제외 해제 -> 사용으로 처리 + mapSheetMngFileJobCoreService.updateException5kMapSheet( + item.getMapSheetNum(), CommonUseStatus.USE); } for (Basic item2 : basicList) { - // System.out.println("path: " + item2.getParentPath()); - // System.out.println("path: " + item2.getFileNm()); - // System.out.println("path: " + item2.getFullPath()); - MngFileAddReq addReq = new MngFileAddReq(); addReq.setMngYyyy(item.getMngYyyy()); addReq.setMapSheetNum(item.getMapSheetNum()); @@ -240,9 +240,6 @@ public class MapSheetMngFileJobService { return 1L; } - // List mapSheetNums = new ArrayList<>(); - // mapSheetNums.add(mapSheetNum); - int strtYyyy = mngYyyy - syncAutoExceptionBeforeYearCnt + 1; int endYyyy = mngYyyy; @@ -251,13 +248,10 @@ public class MapSheetMngFileJobService { mapSheetMngFileJobCoreService.findByHstMapSheetBeforeYyyyListCount( strtYyyy, endYyyy, mapSheetNum); - // System.out.println("mapSheetAutoExceptionUpdate mapSheetNum == " + mapSheetNum); - // System.out.println("mapSheetAutoExceptionUpdate strtYyyy == " + strtYyyy); - // System.out.println("mapSheetAutoExceptionUpdate endYyyy == " + endYyyy); - // System.out.println("mapSheetAutoExceptionUpdate beforeCnt == " + beforeCnt); if (beforeCnt == 0) { System.out.println("mapSheetAutoExceptionUpdate inference == 자동추론제외"); - mapSheetMngFileJobCoreService.updateException5kMapSheet(mapSheetNum); + mapSheetMngFileJobCoreService.updateException5kMapSheet( + mapSheetNum, CommonUseStatus.AUTO_EXCEPT); } return beforeCnt;