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);