From e88ffd12605d8c5bdcefe12fc22d95e3dc7ca5a1 Mon Sep 17 00:00:00 2001 From: "gayoun.park" Date: Fri, 6 Feb 2026 09:49:30 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B5=AD=EC=9C=A0=EC=9D=B8=20=EC=88=98?= =?UTF-8?q?=EC=A0=95,=20=EB=9D=BC=EB=B2=A8=EB=8C=80=EC=83=81=20=EA=B1=B4?= =?UTF-8?q?=EC=88=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gukyuin/GukYuinApiController.java | 5 +++ .../gukyuin/service/GukYuinApiService.java | 29 ++++++++------- .../postgres/core/GukYuinCoreService.java | 13 +++++++ .../core/GukYuinStbltJobCoreService.java | 4 +++ .../gukyuin/GukYuinRepositoryCustom.java | 6 ++++ .../gukyuin/GukYuinRepositoryImpl.java | 35 +++++++++++++++++++ .../GukYuinStbltJobRepositoryImpl.java | 2 +- .../label/LabelAllocateRepositoryImpl.java | 32 +++++++++-------- .../label/LabelWorkRepositoryImpl.java | 10 +++++- .../service/GukYuinApiLabelJobService.java | 9 ++--- .../service/GukYuinApiPnuJobService.java | 9 ++--- .../service/GukYuinApiStatusJobService.java | 9 ++--- .../service/GukYuinApiStbltJobService.java | 21 +++++------ 13 files changed, 132 insertions(+), 52 deletions(-) diff --git a/src/main/java/com/kamco/cd/kamcoback/gukyuin/GukYuinApiController.java b/src/main/java/com/kamco/cd/kamcoback/gukyuin/GukYuinApiController.java index 37048e0b..5d23ffdc 100644 --- a/src/main/java/com/kamco/cd/kamcoback/gukyuin/GukYuinApiController.java +++ b/src/main/java/com/kamco/cd/kamcoback/gukyuin/GukYuinApiController.java @@ -15,6 +15,7 @@ import com.kamco.cd.kamcoback.scheduler.service.GukYuinApiLabelJobService; import com.kamco.cd.kamcoback.scheduler.service.GukYuinApiPnuJobService; import com.kamco.cd.kamcoback.scheduler.service.GukYuinApiStatusJobService; import com.kamco.cd.kamcoback.scheduler.service.GukYuinApiStbltJobService; +import io.swagger.v3.oas.annotations.Hidden; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.media.Content; @@ -330,6 +331,7 @@ public class GukYuinApiController { return ApiResponseDto.ok(gukYuinApiService.findRlbDtctObject(chnDtctObjtId)); } + @Hidden @Operation(summary = "job test pnu", description = "job test pnu") @GetMapping("/job-test/pnu") public ApiResponseDto findGukYuinContListPnuUpdate() { @@ -337,6 +339,7 @@ public class GukYuinApiController { return ApiResponseDto.ok(null); } + @Hidden @Operation(summary = "job test status", description = "job test status") @GetMapping("/job-test/status") public ApiResponseDto findGukYuinMastCompleteYn() { @@ -344,6 +347,7 @@ public class GukYuinApiController { return ApiResponseDto.ok(null); } + @Hidden @Operation(summary = "job test label", description = "job test label") @GetMapping("/job-test/label") public ApiResponseDto findLabelingCompleteSend() { @@ -351,6 +355,7 @@ public class GukYuinApiController { return ApiResponseDto.ok(null); } + @Hidden @Operation(summary = "job test stblt", description = "job test stblt") @GetMapping("/job-test/stblt") public ApiResponseDto findGukYuinEligibleForSurvey() { 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 f42085ad..e8a2c0b1 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 @@ -456,8 +456,15 @@ public class GukYuinApiService { Integer maxStage = gukyuinCoreService.findMapSheetLearnYearStage(info.getCompareYyyy(), info.getTargetYyyy()); - // TODO : 1회차를 종료 상태로 처리하고 2회차를 보내야 함 - // TODO : learn, inference 둘다 종료 처리 + // 1회차를 종료 상태로 처리하고 2회차를 보내야 함 + // 추론(learn), 학습데이터(inference) 둘 다 종료 처리 + if (maxStage > 0) { + Long learnId = + gukyuinCoreService.findMapSheetLearnInfoByYyyy( + info.getCompareYyyy(), info.getTargetYyyy(), maxStage); + gukyuinCoreService.updateMapSheetLearnGukyuinEndStatus(learnId); + gukyuinCoreService.updateMapSheetInferenceLabelEndStatus(learnId); + } // reqDto 셋팅 ChnDetectMastReqDto reqDto = new ChnDetectMastReqDto(); @@ -467,22 +474,18 @@ public class GukYuinApiService { reqDto.setChnDtctId(info.getUid()); reqDto.setPathNm("/kamco-nfs/dataset/export/" + info.getUid()); - log.info("### path : " + Path.of("/kamco-nfs/dataset/export/" + info.getUid())); - log.info( - "#### isDirectory : " - + Files.isDirectory(Path.of("/kamco-nfs/dataset/export/" + info.getUid()))); - if (Files.isDirectory(Path.of("/kamco-nfs/dataset/export/" + info.getUid()))) { + if (!Files.isDirectory(Path.of("/kamco-nfs/dataset/export/" + info.getUid()))) { return new ResponseObj( ApiResponseCode.NOT_FOUND_DATA, "파일 경로에 회차 실행 파일이 생성되지 않았습니다. 확인 부탁드립니다."); } // 국유인 /chn/mast/regist 전송 - // ChngDetectMastDto.RegistResDto result = this.regist(reqDto); - // if (result.getSuccess()) { - return new ResponseObj(ApiResponseCode.OK, "연동되었습니다."); - // } else { - // return new ResponseObj(ApiResponseCode.INTERNAL_SERVER_ERROR, result.getMessage()); - // } + ChngDetectMastDto.RegistResDto result = this.regist(reqDto); + if (result.getSuccess()) { + return new ResponseObj(ApiResponseCode.OK, "연동되었습니다."); + } else { + return new ResponseObj(ApiResponseCode.INTERNAL_SERVER_ERROR, result.getMessage()); + } } public List findLabelingCompleteSendList(LocalDate yesterday) { diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/core/GukYuinCoreService.java b/src/main/java/com/kamco/cd/kamcoback/postgres/core/GukYuinCoreService.java index 430c586b..3dd6baec 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/core/GukYuinCoreService.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/core/GukYuinCoreService.java @@ -64,4 +64,17 @@ public class GukYuinCoreService { public List findLabelingCompleteSendList(LocalDate yesterday) { return gukYuinRepository.findLabelingCompleteSendList(yesterday); } + + public Long findMapSheetLearnInfoByYyyy( + Integer compareYyyy, Integer targetYyyy, Integer maxStage) { + return gukYuinRepository.findMapSheetLearnInfoByYyyy(compareYyyy, targetYyyy, maxStage); + } + + public void updateMapSheetLearnGukyuinEndStatus(Long learnId) { + gukYuinRepository.updateMapSheetLearnGukyuinEndStatus(learnId); + } + + public void updateMapSheetInferenceLabelEndStatus(Long learnId) { + gukYuinRepository.updateMapSheetInferenceLabelEndStatus(learnId); + } } diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/core/GukYuinStbltJobCoreService.java b/src/main/java/com/kamco/cd/kamcoback/postgres/core/GukYuinStbltJobCoreService.java index 0f0614da..0fbb86aa 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/core/GukYuinStbltJobCoreService.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/core/GukYuinStbltJobCoreService.java @@ -24,10 +24,12 @@ public class GukYuinStbltJobCoreService { @Transactional public void updateGukYuinEligibleForSurvey(String resultUid, RlbDtctMastDto stbltDto) { + String chnDtctObjtId = ""; PnuEntity entity = gukYuinStbltRepository.findPnuEntityByResultUid(resultUid, stbltDto.getPnu()); if (entity != null) { + chnDtctObjtId = resultUid; entity.setPnuDtctId(stbltDto.getPnuDtctId()); entity.setPnu(stbltDto.getPnu()); @@ -66,6 +68,8 @@ public class GukYuinStbltJobCoreService { entity.setCreatedDttm(ZonedDateTime.now()); gukYuinStbltRepository.save(entity); + + // } } } diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/gukyuin/GukYuinRepositoryCustom.java b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/gukyuin/GukYuinRepositoryCustom.java index d1a8b874..84d92ff5 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/gukyuin/GukYuinRepositoryCustom.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/gukyuin/GukYuinRepositoryCustom.java @@ -39,4 +39,10 @@ public interface GukYuinRepositoryCustom { void updateAnalDataInferenceGeomSendDttm(Long geoUid); List findLabelingCompleteSendList(LocalDate yesterday); + + Long findMapSheetLearnInfoByYyyy(Integer compareYyyy, Integer targetYyyy, Integer maxStage); + + void updateMapSheetLearnGukyuinEndStatus(Long learnId); + + void updateMapSheetInferenceLabelEndStatus(Long learnId); } 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 021f3854..d274d858 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 @@ -13,6 +13,7 @@ import com.kamco.cd.kamcoback.gukyuin.dto.GukYuinDto.GeomUidDto; import com.kamco.cd.kamcoback.gukyuin.dto.GukYuinDto.LearnInfo; import com.kamco.cd.kamcoback.gukyuin.dto.GukYuinStatus; import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.InspectState; +import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.LabelMngState; import com.kamco.cd.kamcoback.postgres.entity.PnuEntity; import com.querydsl.core.types.Projections; import com.querydsl.core.types.dsl.BooleanExpression; @@ -204,6 +205,7 @@ public class GukYuinRepositoryImpl implements GukYuinRepositoryCustom { .update(mapSheetAnalInferenceEntity) .set(mapSheetAnalInferenceEntity.gukyuinUsed, "Y") .set(mapSheetAnalInferenceEntity.gukyuinApplyDttm, ZonedDateTime.now()) + .set(mapSheetAnalInferenceEntity.stage, Integer.parseInt(registRes.getChnDtctSno())) .where(mapSheetAnalInferenceEntity.learnId.eq(learnId)) .execute(); } @@ -283,6 +285,39 @@ public class GukYuinRepositoryImpl implements GukYuinRepositoryCustom { .fetch(); } + @Override + public Long findMapSheetLearnInfoByYyyy( + Integer compareYyyy, Integer targetYyyy, Integer maxStage) { + return queryFactory + .select(mapSheetLearnEntity.id) + .from(mapSheetLearnEntity) + .where( + mapSheetLearnEntity.compareYyyy.eq(compareYyyy), + mapSheetLearnEntity.targetYyyy.eq(targetYyyy), + mapSheetLearnEntity.stage.eq(maxStage)) + .fetchOne(); + } + + @Override + public void updateMapSheetLearnGukyuinEndStatus(Long learnId) { + queryFactory + .update(mapSheetLearnEntity) + .set(mapSheetLearnEntity.applyStatus, GukYuinStatus.END.getId()) + .set(mapSheetLearnEntity.applyStatusDttm, ZonedDateTime.now()) + .where(mapSheetLearnEntity.id.eq(learnId)) + .execute(); + } + + @Override + public void updateMapSheetInferenceLabelEndStatus(Long learnId) { + queryFactory + .update(mapSheetAnalInferenceEntity) + .set(mapSheetAnalInferenceEntity.analState, LabelMngState.FINISH.getId()) + .set(mapSheetAnalInferenceEntity.updatedDttm, ZonedDateTime.now()) + .where(mapSheetAnalInferenceEntity.learnId.eq(learnId)) + .execute(); + } + @Override @Transactional public void updateGukYuinApplyStateComplete(Long id, GukYuinStatus status) { diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/gukyuin/GukYuinStbltJobRepositoryImpl.java b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/gukyuin/GukYuinStbltJobRepositoryImpl.java index 302d812f..c5acd11b 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/gukyuin/GukYuinStbltJobRepositoryImpl.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/gukyuin/GukYuinStbltJobRepositoryImpl.java @@ -46,7 +46,7 @@ public class GukYuinStbltJobRepositoryImpl implements GukYuinStbltJobRepositoryC .on(mapSheetAnalDataInferenceEntity.id.eq(mapSheetAnalDataInferenceGeomEntity.dataUid)) .where( mapSheetLearnEntity.applyStatus.eq(GukYuinStatus.PNU_COMPLETED.getId()), - mapSheetAnalDataInferenceGeomEntity.pnu.isNotNull(), + mapSheetAnalDataInferenceGeomEntity.pnu.gt(0), mapSheetAnalDataInferenceGeomEntity.fitState.isNull()) .groupBy(mapSheetLearnEntity.id, mapSheetLearnEntity.uid, mapSheetLearnEntity.chnDtctMstId) .having(mapSheetAnalDataInferenceGeomEntity.geoUid.count().gt(1L)) diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/label/LabelAllocateRepositoryImpl.java b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/label/LabelAllocateRepositoryImpl.java index e4358daa..f50ffb83 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/label/LabelAllocateRepositoryImpl.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/label/LabelAllocateRepositoryImpl.java @@ -8,6 +8,7 @@ import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetAnalDataInferenceG import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetAnalInferenceEntity.mapSheetAnalInferenceEntity; import static com.kamco.cd.kamcoback.postgres.entity.QMemberEntity.memberEntity; +import com.kamco.cd.kamcoback.common.enums.ImageryFitStatus; import com.kamco.cd.kamcoback.common.enums.StatusType; import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto; import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.AllocateInfoDto; @@ -82,7 +83,9 @@ public class LabelAllocateRepositoryImpl implements LabelAllocateRepositoryCusto .innerJoin(mapSheetAnalDataInferenceGeomEntity) .on( mapSheetAnalDataInferenceEntity.id.eq(mapSheetAnalDataInferenceGeomEntity.dataUid), - mapSheetAnalDataInferenceGeomEntity.pnu.isNotNull(), + // mapSheetAnalDataInferenceGeomEntity.pnu.isNotNull(), + mapSheetAnalDataInferenceGeomEntity.pnu.gt(0), + mapSheetAnalDataInferenceGeomEntity.fitState.eq(ImageryFitStatus.UNFIT.getId()), mapSheetAnalDataInferenceGeomEntity.labelState.isNull()) .where( mapSheetAnalInferenceEntity.uuid.eq(uuid), @@ -189,7 +192,9 @@ public class LabelAllocateRepositoryImpl implements LabelAllocateRepositoryCusto .innerJoin(mapSheetAnalDataInferenceGeomEntity) .on( mapSheetAnalDataInferenceEntity.id.eq(mapSheetAnalDataInferenceGeomEntity.dataUid), - mapSheetAnalDataInferenceGeomEntity.pnu.isNotNull(), + // mapSheetAnalDataInferenceGeomEntity.pnu.isNotNull(), + mapSheetAnalDataInferenceGeomEntity.pnu.gt(0), + mapSheetAnalDataInferenceGeomEntity.fitState.eq(ImageryFitStatus.UNFIT.getId()), mapSheetAnalDataInferenceGeomEntity.labelState.isNull()) .where(mapSheetAnalInferenceEntity.uuid.eq(uuid)) .fetchOne(); @@ -380,9 +385,10 @@ public class LabelAllocateRepositoryImpl implements LabelAllocateRepositoryCusto mapSheetAnalDataInferenceGeomEntity.compareYyyy.eq(analEntity.getCompareYyyy()), mapSheetAnalDataInferenceGeomEntity.targetYyyy.eq(analEntity.getTargetYyyy()), mapSheetAnalDataInferenceGeomEntity.stage.eq(analEntity.getStage()), - mapSheetAnalDataInferenceGeomEntity.pnu.isNotNull() - // mapSheetAnalDataInferenceGeomEntity.pnu.gt(0L) - // mapSheetAnalDataInferenceGeomEntity.passYn.isFalse() //TODO: + // mapSheetAnalDataInferenceGeomEntity.pnu.isNotNull() + mapSheetAnalDataInferenceGeomEntity.pnu.gt(0L), + mapSheetAnalDataInferenceGeomEntity.fitState.eq( + ImageryFitStatus.UNFIT.getId()) // TODO: // 추후 라벨링 대상 조건 수정하기 ) .fetchOne(); @@ -554,11 +560,9 @@ public class LabelAllocateRepositoryImpl implements LabelAllocateRepositoryCusto mapSheetAnalDataInferenceGeomEntity.dataUid)) .where( mapSheetAnalInferenceEntity.uuid.eq(targetUuid), - mapSheetAnalDataInferenceGeomEntity.pnu.isNotNull() - // mapSheetAnalDataInferenceGeomEntity.pnu.gt(0L), - // - // mapSheetAnalDataInferenceGeomEntity.fitState.eq(ImageryFitStatus.UNFIT.getId()) - ) + // mapSheetAnalDataInferenceGeomEntity.pnu.isNotNull() + mapSheetAnalDataInferenceGeomEntity.pnu.gt(0L), + mapSheetAnalDataInferenceGeomEntity.fitState.eq(ImageryFitStatus.UNFIT.getId())) .fetchOne(); } @@ -746,11 +750,9 @@ public class LabelAllocateRepositoryImpl implements LabelAllocateRepositoryCusto mapSheetAnalInferenceEntity.targetYyyy.eq( mapSheetAnalDataInferenceGeomEntity.targetYyyy), mapSheetAnalInferenceEntity.stage.eq(mapSheetAnalDataInferenceGeomEntity.stage), - mapSheetAnalDataInferenceGeomEntity.pnu.isNotNull() - // mapSheetAnalDataInferenceGeomEntity.pnu.gt(0), - // mapSheetAnalDataInferenceGeomEntity.passYn.isFalse() //TODO: 추후 라벨링 대상 조건 - // 수정하기 - ) + // mapSheetAnalDataInferenceGeomEntity.pnu.isNotNull() + mapSheetAnalDataInferenceGeomEntity.pnu.gt(0), + mapSheetAnalDataInferenceGeomEntity.fitState.eq(ImageryFitStatus.UNFIT.getId())) .where(mapSheetAnalInferenceEntity.id.eq(analEntity.getId())) .groupBy( mapSheetAnalInferenceEntity.analTitle, diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/label/LabelWorkRepositoryImpl.java b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/label/LabelWorkRepositoryImpl.java index 9a1cc9e0..d79ff9a4 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/label/LabelWorkRepositoryImpl.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/label/LabelWorkRepositoryImpl.java @@ -2,6 +2,7 @@ package com.kamco.cd.kamcoback.postgres.repository.label; import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetLearnEntity.mapSheetLearnEntity; +import com.kamco.cd.kamcoback.common.enums.ImageryFitStatus; import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.InspectState; import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.LabelState; import com.kamco.cd.kamcoback.label.dto.LabelWorkDto; @@ -557,7 +558,14 @@ public class LabelWorkRepositoryImpl implements LabelWorkRepositoryCustom { NumberExpression labelTotCnt = new CaseBuilder() - .when(mapSheetAnalDataInferenceGeomEntity.pnu.isNotNull()) + // .when(mapSheetAnalDataInferenceGeomEntity.pnu.isNotNull()) + .when( + mapSheetAnalDataInferenceGeomEntity + .pnu + .gt(0) + .and( + mapSheetAnalDataInferenceGeomEntity.fitState.eq( + ImageryFitStatus.UNFIT.getId()))) .then(1L) .otherwise(0L) .sum(); diff --git a/src/main/java/com/kamco/cd/kamcoback/scheduler/service/GukYuinApiLabelJobService.java b/src/main/java/com/kamco/cd/kamcoback/scheduler/service/GukYuinApiLabelJobService.java index 1f904ceb..560217ef 100644 --- a/src/main/java/com/kamco/cd/kamcoback/scheduler/service/GukYuinApiLabelJobService.java +++ b/src/main/java/com/kamco/cd/kamcoback/scheduler/service/GukYuinApiLabelJobService.java @@ -8,6 +8,7 @@ import java.util.List; import lombok.RequiredArgsConstructor; import lombok.extern.log4j.Log4j2; import org.springframework.beans.factory.annotation.Value; +import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Service; @Log4j2 @@ -31,11 +32,11 @@ public class GukYuinApiLabelJobService { } /** 어제 라벨링 검수 완료된 것 -> 국유인에 전송 */ - // @Scheduled(cron = "0 0 2 * * *") + @Scheduled(cron = "0 0 2 * * *") public void findLabelingCompleteSend() { - // if (isLocalProfile()) { - // return; - // } + if (isLocalProfile()) { + return; + } List list = gukYuinLabelJobCoreService.findYesterdayLabelingCompleteList(); if (list.isEmpty()) { diff --git a/src/main/java/com/kamco/cd/kamcoback/scheduler/service/GukYuinApiPnuJobService.java b/src/main/java/com/kamco/cd/kamcoback/scheduler/service/GukYuinApiPnuJobService.java index b0e4990c..5015991f 100644 --- a/src/main/java/com/kamco/cd/kamcoback/scheduler/service/GukYuinApiPnuJobService.java +++ b/src/main/java/com/kamco/cd/kamcoback/scheduler/service/GukYuinApiPnuJobService.java @@ -12,6 +12,7 @@ import java.util.List; import lombok.RequiredArgsConstructor; import lombok.extern.log4j.Log4j2; import org.springframework.beans.factory.annotation.Value; +import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Service; @Log4j2 @@ -35,11 +36,11 @@ public class GukYuinApiPnuJobService { } /** 국유인 등록 완료 후, 탐지객체 조회해서 PNU 업데이트 하는 스케줄링 하루 1번 새벽 1시에 실행 */ - // @Scheduled(cron = "0 0/10 * * * *") // 0 0 1 * * * + @Scheduled(cron = "0 0 1 * * *") public void findGukYuinContListPnuUpdate() { - // if (isLocalProfile()) { - // return; - // } + if (isLocalProfile()) { + return; + } List list = gukYuinPnuJobCoreService.findGukyuinApplyStatusUidList( diff --git a/src/main/java/com/kamco/cd/kamcoback/scheduler/service/GukYuinApiStatusJobService.java b/src/main/java/com/kamco/cd/kamcoback/scheduler/service/GukYuinApiStatusJobService.java index 7b8da6f9..13f5d30e 100644 --- a/src/main/java/com/kamco/cd/kamcoback/scheduler/service/GukYuinApiStatusJobService.java +++ b/src/main/java/com/kamco/cd/kamcoback/scheduler/service/GukYuinApiStatusJobService.java @@ -9,6 +9,7 @@ import java.util.List; import lombok.RequiredArgsConstructor; import lombok.extern.log4j.Log4j2; import org.springframework.beans.factory.annotation.Value; +import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Service; @Log4j2 @@ -32,11 +33,11 @@ public class GukYuinApiStatusJobService { } /** 국유인 연동 후, 100% 되었는지 확인하는 스케줄링 매 10분마다 호출 */ - // @Scheduled(cron = "0 0/10 * * * *") // 0 0/10 * * * * + @Scheduled(cron = "0 0/10 * * * *") public void findGukYuinMastCompleteYn() { - // if (isLocalProfile()) { - // return; - // } + if (isLocalProfile()) { + return; + } List list = gukYuinJobCoreService.findGukyuinApplyStatusUidList( diff --git a/src/main/java/com/kamco/cd/kamcoback/scheduler/service/GukYuinApiStbltJobService.java b/src/main/java/com/kamco/cd/kamcoback/scheduler/service/GukYuinApiStbltJobService.java index 9eb72a92..854f772a 100644 --- a/src/main/java/com/kamco/cd/kamcoback/scheduler/service/GukYuinApiStbltJobService.java +++ b/src/main/java/com/kamco/cd/kamcoback/scheduler/service/GukYuinApiStbltJobService.java @@ -13,6 +13,7 @@ import java.util.List; import lombok.RequiredArgsConstructor; import lombok.extern.log4j.Log4j2; import org.springframework.beans.factory.annotation.Value; +import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Service; @Log4j2 @@ -36,11 +37,11 @@ public class GukYuinApiStbltJobService { } /** 국유인 연동 후, 실태조사 적합여부 확인하여 update */ - // @Scheduled(cron = "0 * * * * *") // 0 0 3 * * * + @Scheduled(cron = "0 0 3 * * *") // 0 0 3 * * * public void findGukYuinEligibleForSurvey() { - // if (isLocalProfile()) { - // return; - // } + if (isLocalProfile()) { + return; + } List list = gukYuinStbltJobCoreService.findGukYuinEligibleForSurveyList( @@ -51,12 +52,11 @@ public class GukYuinApiStbltJobService { for (LearnKeyDto dto : list) { try { - String today = - LocalDate.now(ZoneId.of("Asia/Seoul")).format(DateTimeFormatter.ofPattern("yyyyMMdd")); - // String yesterday = - // LocalDate.now(ZoneId.of("Asia/Seoul")).minusDays(1).format(DateTimeFormatter.ofPattern("yyyyMMdd")); - RlbDtctDto result = - gukYuinApiService.findRlbDtctList(dto.getUid(), today); // todo : test 다 끝내고 어제로 바꿔야 함 + String yesterday = + LocalDate.now(ZoneId.of("Asia/Seoul")) + .minusDays(1) + .format(DateTimeFormatter.ofPattern("yyyyMMdd")); + RlbDtctDto result = gukYuinApiService.findRlbDtctList(dto.getUid(), yesterday); if (result == null || result.getResult() == null || result.getResult().isEmpty()) { log.warn("[GUKYUIN] empty result chnDtctMstId={}", dto.getChnDtctMstId()); @@ -67,6 +67,7 @@ public class GukYuinApiStbltJobService { String resultUid = stbltDto.getChnDtctObjtId(); gukYuinStbltJobCoreService.updateGukYuinEligibleForSurvey(resultUid, stbltDto); } + } catch (Exception e) { log.error("[GUKYUIN] failed uid={}", dto.getChnDtctMstId(), e); } -- 2.49.1