diff --git a/gukyuin/label-send/.gradle/8.14/executionHistory/executionHistory.bin b/gukyuin/label-send/.gradle/8.14/executionHistory/executionHistory.bin index b92a5d6..5a4f440 100644 Binary files a/gukyuin/label-send/.gradle/8.14/executionHistory/executionHistory.bin and b/gukyuin/label-send/.gradle/8.14/executionHistory/executionHistory.bin differ diff --git a/gukyuin/label-send/.gradle/8.14/executionHistory/executionHistory.lock b/gukyuin/label-send/.gradle/8.14/executionHistory/executionHistory.lock index b5f07bb..471d268 100644 Binary files a/gukyuin/label-send/.gradle/8.14/executionHistory/executionHistory.lock and b/gukyuin/label-send/.gradle/8.14/executionHistory/executionHistory.lock differ diff --git a/gukyuin/label-send/.gradle/8.14/fileHashes/fileHashes.bin b/gukyuin/label-send/.gradle/8.14/fileHashes/fileHashes.bin index b0092f3..1e30393 100644 Binary files a/gukyuin/label-send/.gradle/8.14/fileHashes/fileHashes.bin and b/gukyuin/label-send/.gradle/8.14/fileHashes/fileHashes.bin differ diff --git a/gukyuin/label-send/.gradle/8.14/fileHashes/fileHashes.lock b/gukyuin/label-send/.gradle/8.14/fileHashes/fileHashes.lock index f6a3390..d691f7b 100644 Binary files a/gukyuin/label-send/.gradle/8.14/fileHashes/fileHashes.lock and b/gukyuin/label-send/.gradle/8.14/fileHashes/fileHashes.lock differ diff --git a/gukyuin/label-send/.gradle/8.14/fileHashes/resourceHashesCache.bin b/gukyuin/label-send/.gradle/8.14/fileHashes/resourceHashesCache.bin index 3191493..9e8f124 100644 Binary files a/gukyuin/label-send/.gradle/8.14/fileHashes/resourceHashesCache.bin and b/gukyuin/label-send/.gradle/8.14/fileHashes/resourceHashesCache.bin differ diff --git a/gukyuin/label-send/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/gukyuin/label-send/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 6ceb082..5f98e05 100644 Binary files a/gukyuin/label-send/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/gukyuin/label-send/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/gukyuin/label-send/.gradle/file-system.probe b/gukyuin/label-send/.gradle/file-system.probe index 24a7502..b0856ad 100644 Binary files a/gukyuin/label-send/.gradle/file-system.probe and b/gukyuin/label-send/.gradle/file-system.probe differ diff --git a/gukyuin/label-send/build/classes/java/main/com/kamco/cd/kamcoback/service/GukYuinApiLabelJobService.class b/gukyuin/label-send/build/classes/java/main/com/kamco/cd/kamcoback/service/GukYuinApiLabelJobService.class index f80327c..d54ff01 100644 Binary files a/gukyuin/label-send/build/classes/java/main/com/kamco/cd/kamcoback/service/GukYuinApiLabelJobService.class and b/gukyuin/label-send/build/classes/java/main/com/kamco/cd/kamcoback/service/GukYuinApiLabelJobService.class differ diff --git a/gukyuin/label-send/build/libs/label-send.jar b/gukyuin/label-send/build/libs/label-send.jar index 84a2dd2..1ae1d04 100644 Binary files a/gukyuin/label-send/build/libs/label-send.jar and b/gukyuin/label-send/build/libs/label-send.jar differ diff --git a/gukyuin/label-send/build/resources/main/application-prod.yml b/gukyuin/label-send/build/resources/main/application-prod.yml index 1d17099..471febd 100644 --- a/gukyuin/label-send/build/resources/main/application-prod.yml +++ b/gukyuin/label-send/build/resources/main/application-prod.yml @@ -84,28 +84,28 @@ mapsheet: baseurl: /app/detect/result #현재사용안함 file: - sync-root-dir: /data/images/ - sync-tmp-dir: /data/repo/tmp # image upload temp dir + sync-root-dir: /kamco-nfs/images/ + sync-tmp-dir: /kamco-nfs/repo/tmp # image upload temp dir sync-file-extention: tfw,tif - #dataset-dir: D:/data/model_output/ #변경 model_output - dataset-dir: /data/model_output/export/ # 마운트경로 AI 추론결과 + #dataset-dir: D:/kamco-nfs/model_output/ #변경 model_output + dataset-dir: /kamco-nfs/model_output/export/ # 마운트경로 AI 추론결과 dataset-tmp-dir: ${file.dataset-dir}tmp/ - #model-dir: D:/data/ckpt/model/ - model-dir: /data/ckpt/model/ # 학습서버에서 트레이닝한 모델업로드경로 + #model-dir: D:/kamco-nfs/ckpt/model/ + model-dir: /kamco-nfs/ckpt/model/ # 학습서버에서 트레이닝한 모델업로드경로 model-tmp-dir: ${file.model-dir}tmp/ model-file-extention: pth,json,py - pt-path: /data/ckpt/v6-cls-checkpoints/ + pt-path: /kamco-nfs/ckpt/v6-cls-checkpoints/ pt-FileName: yolov8_6th-6m.pt - dataset-response: /data/dataset/response/ + dataset-response: /kamco-nfs/dataset/response/ inference: url: http://127.0.0.1:8000/jobs batch-url: http://127.0.0.1:8000/batches - geojson-dir: /data/requests/ # 학습서버에서 트레이닝한 모델업로드경로 - jar-path: /data/repo/jar/shp-exporter.jar # 추론실행을 위한 파일생성경로 + geojson-dir: /kamco-nfs/requests/ # 학습서버에서 트레이닝한 모델업로드경로 + jar-path: /kamco-nfs/repo/jar/shp-exporter.jar # 추론실행을 위한 파일생성경로 inference-server-name: server1,server2,server3,server4 gukyuin: @@ -113,7 +113,7 @@ gukyuin: cdi: ${gukyuin.url}/api/kcd/cdi training-data: - geojson-dir: /data/dataset/request/ + geojson-dir: /kamco-nfs/dataset/request/ layer: geoserver-url: https://kamco.geo-dev.gs.dabeeo.com diff --git a/gukyuin/label-send/build/tmp/compileJava/previous-compilation-data.bin b/gukyuin/label-send/build/tmp/compileJava/previous-compilation-data.bin index 2b1d9e7..abb2aed 100644 Binary files a/gukyuin/label-send/build/tmp/compileJava/previous-compilation-data.bin and b/gukyuin/label-send/build/tmp/compileJava/previous-compilation-data.bin differ diff --git a/gukyuin/label-send/src/main/java/com/kamco/cd/kamcoback/service/GukYuinApiLabelJobService.java b/gukyuin/label-send/src/main/java/com/kamco/cd/kamcoback/service/GukYuinApiLabelJobService.java index e5a8b01..db75a3f 100644 --- a/gukyuin/label-send/src/main/java/com/kamco/cd/kamcoback/service/GukYuinApiLabelJobService.java +++ b/gukyuin/label-send/src/main/java/com/kamco/cd/kamcoback/service/GukYuinApiLabelJobService.java @@ -21,35 +21,33 @@ public class GukYuinApiLabelJobService { @Value("${spring.profiles.active}") private String profile; - /** - * 실행중인 profile - * - * @return - */ - private boolean isLocalProfile() { - return "local".equalsIgnoreCase(profile); - } - - // @Scheduled(cron = "0 * * * * *") public void runTask() { findLabelingCompleteSend(null); } /** 어제 라벨링 검수 완료된 것 -> 국유인에 전송 */ public void findLabelingCompleteSend(LocalDate baseDate) { - // if (isLocalProfile()) { - // return; - // } + + log.info("[Step 1-1] 어제 검수완료된 라벨링을 검색한다."); + log.info("=== baseDate : {}", baseDate); + log.info("=== baseDate 있으면 해당 일자, 없으면 어제일자로 조회"); List list = gukYuinLabelJobCoreService.findYesterdayLabelingCompleteList(baseDate); + log.info("[Step 1-2] 검수완료된 폴리곤 객체 수 : {}", list == null ? 0 : list.size()); if (list.isEmpty()) { + log.info("[Step 1-3] 객체 없어서 return : 스케줄링 종료"); return; } + log.info("[Step 2-1] 객체 목록으로 라벨링 전송 API 호출 시작"); for (GeomUidDto gto : list) { + log.info("[Step 2-2] 객체ID 확인 gto.getResultUid(): {}", gto.getResultUid()); ChngDetectContDto.ResultLabelDto dto = gukYuinApiService.updateChnDtctObjtLabelingYn(gto.getResultUid(), "Y", "Y"); + log.info("[Step 2-3] 결과 dto.getSuccess(): {}", dto.getSuccess()); if (dto.getSuccess()) { + log.info("[Step 2-4] 결과가 성공일 때 inference_geom에 label_send_dttm 업데이트 하기"); + log.info("==== 업데이트 하는 객체 gto.getGeoUid(): {}", gto.getGeoUid()); // inference_geom 에 label_send_dttm 업데이트 하기 gukYuinLabelJobCoreService.updateAnalDataInferenceGeomSendDttm(gto.getGeoUid()); } diff --git a/gukyuin/label-send/src/main/resources/application-prod.yml b/gukyuin/label-send/src/main/resources/application-prod.yml index 1d17099..471febd 100644 --- a/gukyuin/label-send/src/main/resources/application-prod.yml +++ b/gukyuin/label-send/src/main/resources/application-prod.yml @@ -84,28 +84,28 @@ mapsheet: baseurl: /app/detect/result #현재사용안함 file: - sync-root-dir: /data/images/ - sync-tmp-dir: /data/repo/tmp # image upload temp dir + sync-root-dir: /kamco-nfs/images/ + sync-tmp-dir: /kamco-nfs/repo/tmp # image upload temp dir sync-file-extention: tfw,tif - #dataset-dir: D:/data/model_output/ #변경 model_output - dataset-dir: /data/model_output/export/ # 마운트경로 AI 추론결과 + #dataset-dir: D:/kamco-nfs/model_output/ #변경 model_output + dataset-dir: /kamco-nfs/model_output/export/ # 마운트경로 AI 추론결과 dataset-tmp-dir: ${file.dataset-dir}tmp/ - #model-dir: D:/data/ckpt/model/ - model-dir: /data/ckpt/model/ # 학습서버에서 트레이닝한 모델업로드경로 + #model-dir: D:/kamco-nfs/ckpt/model/ + model-dir: /kamco-nfs/ckpt/model/ # 학습서버에서 트레이닝한 모델업로드경로 model-tmp-dir: ${file.model-dir}tmp/ model-file-extention: pth,json,py - pt-path: /data/ckpt/v6-cls-checkpoints/ + pt-path: /kamco-nfs/ckpt/v6-cls-checkpoints/ pt-FileName: yolov8_6th-6m.pt - dataset-response: /data/dataset/response/ + dataset-response: /kamco-nfs/dataset/response/ inference: url: http://127.0.0.1:8000/jobs batch-url: http://127.0.0.1:8000/batches - geojson-dir: /data/requests/ # 학습서버에서 트레이닝한 모델업로드경로 - jar-path: /data/repo/jar/shp-exporter.jar # 추론실행을 위한 파일생성경로 + geojson-dir: /kamco-nfs/requests/ # 학습서버에서 트레이닝한 모델업로드경로 + jar-path: /kamco-nfs/repo/jar/shp-exporter.jar # 추론실행을 위한 파일생성경로 inference-server-name: server1,server2,server3,server4 gukyuin: @@ -113,7 +113,7 @@ gukyuin: cdi: ${gukyuin.url}/api/kcd/cdi training-data: - geojson-dir: /data/dataset/request/ + geojson-dir: /kamco-nfs/dataset/request/ layer: geoserver-url: https://kamco.geo-dev.gs.dabeeo.com