From cf4f79f7ca69a462ff1061e7051b3e88daa0f5b7 Mon Sep 17 00:00:00 2001 From: teddy Date: Mon, 2 Feb 2026 17:15:57 +0900 Subject: [PATCH] =?UTF-8?q?=EC=B6=94=EB=A1=A0=EA=B2=B0=EA=B3=BC=20?= =?UTF-8?q?=EA=B5=AD=EC=9C=A0In=20=EB=93=B1=EB=A1=9D=20=EB=B2=A8=EB=A6=AC?= =?UTF-8?q?=EB=8D=B0=EC=9D=B4=EC=85=98=20=EC=B2=B4=ED=81=AC=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cd/kamcoback/gukyuin/dto/GukYuinDto.java | 5 +++++ .../gukyuin/service/GukYuinApiService.java | 4 +--- .../inference/dto/InferenceDetailDto.java | 4 ++++ .../gukyuin/GukYuinRepositoryImpl.java | 5 ++++- .../service/MapSheetMngFileJobService.java | 16 ---------------- 5 files changed, 14 insertions(+), 20 deletions(-) diff --git a/src/main/java/com/kamco/cd/kamcoback/gukyuin/dto/GukYuinDto.java b/src/main/java/com/kamco/cd/kamcoback/gukyuin/dto/GukYuinDto.java index f196184b..da25f653 100644 --- a/src/main/java/com/kamco/cd/kamcoback/gukyuin/dto/GukYuinDto.java +++ b/src/main/java/com/kamco/cd/kamcoback/gukyuin/dto/GukYuinDto.java @@ -59,6 +59,11 @@ public class GukYuinDto { private Integer stage; private String uid; private String applyStatus; + private Boolean applyYn; + + public Boolean getApplyYn() { + return this.applyYn != null && this.applyYn; + } } @Getter diff --git a/src/main/java/com/kamco/cd/kamcoback/gukyuin/service/GukYuinApiService.java b/src/main/java/com/kamco/cd/kamcoback/gukyuin/service/GukYuinApiService.java index e3dba75e..0b130cd1 100644 --- a/src/main/java/com/kamco/cd/kamcoback/gukyuin/service/GukYuinApiService.java +++ b/src/main/java/com/kamco/cd/kamcoback/gukyuin/service/GukYuinApiService.java @@ -24,7 +24,6 @@ import com.kamco.cd.kamcoback.gukyuin.dto.GukYuinDto.GukYuinLinkFacts; import com.kamco.cd.kamcoback.gukyuin.dto.GukYuinDto.GukYuinLinkFailCode; import com.kamco.cd.kamcoback.gukyuin.dto.GukYuinDto.GukYuinLinkableRes; import com.kamco.cd.kamcoback.gukyuin.dto.GukYuinDto.LearnInfo; -import com.kamco.cd.kamcoback.gukyuin.dto.GukYuinStatus; import com.kamco.cd.kamcoback.log.dto.EventStatus; import com.kamco.cd.kamcoback.log.dto.EventType; import com.kamco.cd.kamcoback.postgres.core.GukYuinCoreService; @@ -400,8 +399,7 @@ public class GukYuinApiService { public ResponseObj connectChnMastRegist(UUID uuid) { // uuid로 추론 회차 조회 LearnInfo info = gukyuinCoreService.findMapSheetLearnInfo(uuid); - if (info.getApplyStatus() != null - && !info.getApplyStatus().equals(GukYuinStatus.PENDING.getId())) { + if (info.getApplyYn() != null && info.getApplyYn()) { return new ResponseObj(ApiResponseCode.DUPLICATE_DATA, "이미 국유인 연동을 한 회차입니다."); } diff --git a/src/main/java/com/kamco/cd/kamcoback/inference/dto/InferenceDetailDto.java b/src/main/java/com/kamco/cd/kamcoback/inference/dto/InferenceDetailDto.java index 60efb52c..27705cc1 100644 --- a/src/main/java/com/kamco/cd/kamcoback/inference/dto/InferenceDetailDto.java +++ b/src/main/java/com/kamco/cd/kamcoback/inference/dto/InferenceDetailDto.java @@ -534,6 +534,10 @@ public class InferenceDetailDto { throw new RuntimeException(e); } } + + public Boolean getApplyYn() { + return this.applyYn != null && this.applyYn; + } } @Getter diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/gukyuin/GukYuinRepositoryImpl.java b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/gukyuin/GukYuinRepositoryImpl.java index 9235addb..946c7a44 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/gukyuin/GukYuinRepositoryImpl.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/gukyuin/GukYuinRepositoryImpl.java @@ -52,6 +52,8 @@ public class GukYuinRepositoryImpl implements GukYuinRepositoryCustom { .set(mapSheetLearnEntity.applyStatus, status.getId()) .set(mapSheetLearnEntity.applyStatusDttm, ZonedDateTime.now()) .set(mapSheetLearnEntity.chnDtctMstId, resultBody.getChnDtctMstId()) + .set(mapSheetLearnEntity.applyYn, true) + .set(mapSheetLearnEntity.applyDttm, ZonedDateTime.now()) .where(mapSheetLearnEntity.uid.eq(resultBody.getChnDtctId())) .execute(); } @@ -152,7 +154,8 @@ public class GukYuinRepositoryImpl implements GukYuinRepositoryCustom { mapSheetLearnEntity.targetYyyy, mapSheetLearnEntity.stage, mapSheetLearnEntity.uid, - mapSheetLearnEntity.applyStatus)) + mapSheetLearnEntity.applyStatus, + mapSheetLearnEntity.applyYn)) .from(mapSheetLearnEntity) .where(mapSheetLearnEntity.uuid.eq(uuid)) .fetchOne(); 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 fb2dd0da..1d7afc1d 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 @@ -28,7 +28,6 @@ import java.util.stream.Collectors; import java.util.stream.Stream; import lombok.RequiredArgsConstructor; import org.apache.commons.io.FilenameUtils; -import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -39,21 +38,6 @@ public class MapSheetMngFileJobService { private final MapSheetMngFileJobCoreService mapSheetMngFileJobCoreService; - @Value("${file.sync-root-dir}") - private String syncRootDir; - - @Value("${file.sync-tmp-dir}") - private String syncTmpDir; - - @Value("${file.sync-file-extention}") - private String syncFileExtention; - - @Value("${file.sync-auto-exception-start-year}") - private int syncAutoExceptionStartYear; - - @Value("${file.sync-auto-exception-before-year-cnt}") - private int syncAutoExceptionBeforeYearCnt; - public Integer checkMngFileSync() { return mapSheetMngFileJobCoreService.findNotYetMapSheetMng(); }