From 927e7f6cb047ae02fc05ec8f9949654ca73657b0 Mon Sep 17 00:00:00 2001 From: Moon Date: Tue, 20 Jan 2026 16:14:30 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=EC=98=81=EC=83=81=EA=B4=80=EB=A6=AC=20?= =?UTF-8?q?=EC=84=A4=EC=A0=95=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scheduler/MapSheetMngFileJobRepositoryImpl.java | 9 +++++++++ .../scheduler/MapSheetMngFileJobController.java | 5 ++++- .../kamco/cd/kamcoback/scheduler/dto/MapSheetMngDto.java | 5 +++++ .../scheduler/service/MapSheetMngFileJobService.java | 7 +++++++ 4 files changed, 25 insertions(+), 1 deletion(-) 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 bb96a4ac..84866211 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 @@ -165,6 +165,9 @@ public class MapSheetMngFileJobRepositoryImpl extends QuerydslRepositorySupport .set(mapSheetMngHstEntity.syncCheckState, "NOTYET") .set(mapSheetMngHstEntity.syncCheckStrtDttm, now) .set(mapSheetMngHstEntity.syncCheckEndDttm, now) + .set(mapSheetMngHstEntity.mapSheetPath, updateReq.getMapSheetPath()) + .set(mapSheetMngHstEntity.syncTfwFileName, updateReq.getSyncTfwFileName()) + .set(mapSheetMngHstEntity.syncTifFileName, updateReq.getSyncTifFileName()) .where(mapSheetMngHstEntity.hstUid.eq(updateReq.getHstUid())) .execute(); } else { @@ -179,6 +182,9 @@ public class MapSheetMngFileJobRepositoryImpl extends QuerydslRepositorySupport .set(mapSheetMngHstEntity.syncCheckState, "NOTYET") .set(mapSheetMngHstEntity.syncCheckStrtDttm, now) .set(mapSheetMngHstEntity.syncCheckEndDttm, now) + .set(mapSheetMngHstEntity.mapSheetPath, updateReq.getMapSheetPath()) + .set(mapSheetMngHstEntity.syncTfwFileName, updateReq.getSyncTfwFileName()) + .set(mapSheetMngHstEntity.syncTifFileName, updateReq.getSyncTifFileName()) .where(mapSheetMngHstEntity.hstUid.eq(updateReq.getHstUid())) .execute(); } @@ -204,6 +210,9 @@ public class MapSheetMngFileJobRepositoryImpl extends QuerydslRepositorySupport mapSheetMngHstEntity.syncEndDttm, mapSheetMngHstEntity.syncCheckStrtDttm, mapSheetMngHstEntity.syncCheckEndDttm, + mapSheetMngHstEntity.mapSheetPath, + mapSheetMngHstEntity.syncCheckTfwFileName, + mapSheetMngHstEntity.syncCheckTifFileName, mapSheetMngEntity.mngPath)) .from(mapSheetMngHstEntity) .join(mapSheetMngEntity) diff --git a/src/main/java/com/kamco/cd/kamcoback/scheduler/MapSheetMngFileJobController.java b/src/main/java/com/kamco/cd/kamcoback/scheduler/MapSheetMngFileJobController.java index 35afd350..210fb839 100644 --- a/src/main/java/com/kamco/cd/kamcoback/scheduler/MapSheetMngFileJobController.java +++ b/src/main/java/com/kamco/cd/kamcoback/scheduler/MapSheetMngFileJobController.java @@ -18,7 +18,7 @@ public class MapSheetMngFileJobController { @Getter private int mngSyncPageSize = 20; // 파일싱크 진행여부 확인하기 - @Scheduled(fixedDelay = 1000 * 30) + @Scheduled(fixedDelay = 1000 * 10) public void checkMngFileSync() { if (!isSchedulerEnabled) return; @@ -50,6 +50,7 @@ public class MapSheetMngFileJobController { mapSheetMngFileJobService.checkMapSheetFileProcess(0, mngSyncPageSize); } + @Scheduled(fixedDelay = 1000 * 5) public void mngFileSyncJob01() { if (!isSchedulerEnabled || !isFileSyncSchedulerEnabled) return; @@ -122,6 +123,8 @@ public class MapSheetMngFileJobController { mapSheetMngFileJobService.checkMapSheetFileProcess(9, mngSyncPageSize); } + + // 3. 외부에서 플래그를 변경할 수 있는 Setter 메서드 public void setSchedulerEnabled(boolean enabled) { this.isSchedulerEnabled = enabled; diff --git a/src/main/java/com/kamco/cd/kamcoback/scheduler/dto/MapSheetMngDto.java b/src/main/java/com/kamco/cd/kamcoback/scheduler/dto/MapSheetMngDto.java index 03d3296e..88729282 100644 --- a/src/main/java/com/kamco/cd/kamcoback/scheduler/dto/MapSheetMngDto.java +++ b/src/main/java/com/kamco/cd/kamcoback/scheduler/dto/MapSheetMngDto.java @@ -73,7 +73,12 @@ public class MapSheetMngDto { @JsonFormatDttm private ZonedDateTime syncCheckStrtDttm; @JsonFormatDttm private ZonedDateTime syncCheckEndDttm; + private String mapSheetPath; + private String syncTifFileName; + private String syncTfwFileName; + private String syncMngPath; + } @Schema(name = "MngFileAddReq", description = "영상관리파일 등록 요청") 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 72a7e961..6b8c196d 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 @@ -151,6 +151,10 @@ public class MapSheetMngFileJobService { fileState = "TYPEERROR"; syncState = fileState; } + + item.setMapSheetPath(item2.getParentPath()); + item.setSyncTfwFileName(item2.getFileNm()); + } else if (item2.getExtension().equals("tif")) { if (tfwCnt == 0) { fileState = "NOTPAIR"; @@ -165,6 +169,9 @@ public class MapSheetMngFileJobService { fileState = "TYPEERROR"; syncState = fileState; } + + item.setMapSheetPath(item2.getParentPath()); + item.setSyncTifFileName(item2.getFileNm()); } addReq.setFileState(fileState); From 4f3b03a0ce85e7c674eb830a7d7844a81ae19f71 Mon Sep 17 00:00:00 2001 From: teddy Date: Tue, 20 Jan 2026 16:27:44 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=EC=B6=94=EB=A1=A0=EC=A2=85=EB=A3=8C=20?= =?UTF-8?q?=ED=85=8C=EC=9D=B4=EB=B8=94=20Insert=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Inference/InferenceResultRepositoryImpl.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) 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 d040b74b..0630476e 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 @@ -2,6 +2,7 @@ package com.kamco.cd.kamcoback.postgres.repository.Inference; import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetLearnEntity.mapSheetLearnEntity; +import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.LabelMngState; import com.kamco.cd.kamcoback.postgres.entity.MapSheetAnalDataInferenceGeomEntity; import com.kamco.cd.kamcoback.postgres.entity.MapSheetLearnEntity; import com.kamco.cd.kamcoback.postgres.entity.QMapSheetAnalDataInferenceEntity; @@ -66,7 +67,7 @@ public class InferenceResultRepositoryImpl implements InferenceResultRepositoryC r.m2_model_batch_id, r.m3_model_batch_id, r.id, - LabelMngState.PENDING.getId() + :pendingStateId FROM tb_map_sheet_learn r WHERE r.id = :id ON CONFLICT (stage, compare_yyyy, target_yyyy) @@ -78,7 +79,11 @@ public class InferenceResultRepositoryImpl implements InferenceResultRepositoryC RETURNING anal_uid """; - Object result = em.createNativeQuery(sql).setParameter("id", id).getSingleResult(); + Object result = + em.createNativeQuery(sql) + .setParameter("id", id) + .setParameter("pendingStateId", LabelMngState.PENDING.getId()) + .getSingleResult(); return ((Number) result).longValue(); }