diff --git a/gukyuin/stblt-check/.gradle/8.14/executionHistory/executionHistory.bin b/gukyuin/stblt-check/.gradle/8.14/executionHistory/executionHistory.bin index 41444a4..f3b56c4 100644 Binary files a/gukyuin/stblt-check/.gradle/8.14/executionHistory/executionHistory.bin and b/gukyuin/stblt-check/.gradle/8.14/executionHistory/executionHistory.bin differ diff --git a/gukyuin/stblt-check/.gradle/8.14/executionHistory/executionHistory.lock b/gukyuin/stblt-check/.gradle/8.14/executionHistory/executionHistory.lock index cadabb4..ca533c0 100644 Binary files a/gukyuin/stblt-check/.gradle/8.14/executionHistory/executionHistory.lock and b/gukyuin/stblt-check/.gradle/8.14/executionHistory/executionHistory.lock differ diff --git a/gukyuin/stblt-check/.gradle/8.14/fileHashes/fileHashes.bin b/gukyuin/stblt-check/.gradle/8.14/fileHashes/fileHashes.bin index b14ec5f..7ea26d6 100644 Binary files a/gukyuin/stblt-check/.gradle/8.14/fileHashes/fileHashes.bin and b/gukyuin/stblt-check/.gradle/8.14/fileHashes/fileHashes.bin differ diff --git a/gukyuin/stblt-check/.gradle/8.14/fileHashes/fileHashes.lock b/gukyuin/stblt-check/.gradle/8.14/fileHashes/fileHashes.lock index 9e0cf51..1aa5066 100644 Binary files a/gukyuin/stblt-check/.gradle/8.14/fileHashes/fileHashes.lock and b/gukyuin/stblt-check/.gradle/8.14/fileHashes/fileHashes.lock differ diff --git a/gukyuin/stblt-check/.gradle/8.14/fileHashes/resourceHashesCache.bin b/gukyuin/stblt-check/.gradle/8.14/fileHashes/resourceHashesCache.bin index 094450b..134c26b 100644 Binary files a/gukyuin/stblt-check/.gradle/8.14/fileHashes/resourceHashesCache.bin and b/gukyuin/stblt-check/.gradle/8.14/fileHashes/resourceHashesCache.bin differ diff --git a/gukyuin/stblt-check/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/gukyuin/stblt-check/.gradle/buildOutputCleanup/buildOutputCleanup.lock index cd59ede..7299df7 100644 Binary files a/gukyuin/stblt-check/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/gukyuin/stblt-check/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/gukyuin/stblt-check/.gradle/file-system.probe b/gukyuin/stblt-check/.gradle/file-system.probe index 8528b2e..60b51d7 100644 Binary files a/gukyuin/stblt-check/.gradle/file-system.probe and b/gukyuin/stblt-check/.gradle/file-system.probe differ diff --git a/gukyuin/stblt-check/build/classes/java/main/com/kamco/cd/kamcoback/service/GukYuinApiStbltJobService.class b/gukyuin/stblt-check/build/classes/java/main/com/kamco/cd/kamcoback/service/GukYuinApiStbltJobService.class index 8a8ce79..92a425e 100644 Binary files a/gukyuin/stblt-check/build/classes/java/main/com/kamco/cd/kamcoback/service/GukYuinApiStbltJobService.class and b/gukyuin/stblt-check/build/classes/java/main/com/kamco/cd/kamcoback/service/GukYuinApiStbltJobService.class differ diff --git a/gukyuin/stblt-check/build/libs/stblt-check.jar b/gukyuin/stblt-check/build/libs/stblt-check.jar index 42f3714..f7c22ef 100644 Binary files a/gukyuin/stblt-check/build/libs/stblt-check.jar and b/gukyuin/stblt-check/build/libs/stblt-check.jar differ diff --git a/gukyuin/stblt-check/build/resources/main/application-prod.yml b/gukyuin/stblt-check/build/resources/main/application-prod.yml index 1d17099..471febd 100644 --- a/gukyuin/stblt-check/build/resources/main/application-prod.yml +++ b/gukyuin/stblt-check/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/stblt-check/build/tmp/compileJava/previous-compilation-data.bin b/gukyuin/stblt-check/build/tmp/compileJava/previous-compilation-data.bin index aa630ab..3c5528f 100644 Binary files a/gukyuin/stblt-check/build/tmp/compileJava/previous-compilation-data.bin and b/gukyuin/stblt-check/build/tmp/compileJava/previous-compilation-data.bin differ diff --git a/gukyuin/stblt-check/src/main/java/com/kamco/cd/kamcoback/service/GukYuinApiStbltJobService.java b/gukyuin/stblt-check/src/main/java/com/kamco/cd/kamcoback/service/GukYuinApiStbltJobService.java index 2608361..7756d19 100644 --- a/gukyuin/stblt-check/src/main/java/com/kamco/cd/kamcoback/service/GukYuinApiStbltJobService.java +++ b/gukyuin/stblt-check/src/main/java/com/kamco/cd/kamcoback/service/GukYuinApiStbltJobService.java @@ -37,24 +37,26 @@ public class GukYuinApiStbltJobService { return "local".equalsIgnoreCase(profile); } - // @Scheduled(cron = "0 * * * * *") public void runTask() { findGukYuinEligibleForSurvey(null); } /** 국유인 연동 후, 실태조사 적합여부 확인하여 update */ public void findGukYuinEligibleForSurvey(LocalDate baseDate) { - // if (isLocalProfile()) { - // return; - // } + log.info("[Step 1-1] 국유인 연동 PNU 완료된 추론 회차 정보 가져오기 "); + log.info(" learn 테이블의 apply_status : {}", GukYuinStatus.PNU_COMPLETED.getId()); List list = gukYuinStbltJobCoreService.findGukYuinEligibleForSurveyList( GukYuinStatus.PNU_COMPLETED.getId()); + + log.info("[Step 1-2] 국유인 연동 PNU 완료된 추론 회차 갯수 : {}", list == null ? 0 : list.size()); if (list.isEmpty()) { + log.info("[Step 1-3] 국유인 연동 PNU 완료된 추론 회차 갯수 없어서 return"); return; } + log.info("[Step 2-1] 추론 회차 list 로 for문 실행하기 "); for (LearnKeyDto dto : list) { try { String targetDate = @@ -62,19 +64,30 @@ public class GukYuinApiStbltJobService { .minusDays(1) .format(DateTimeFormatter.ofPattern("yyyyMMdd")); + log.info("[Step 2-2] 실태조사 적합여부 조회 날짜 확인 : {}", targetDate); if (baseDate != null) { // 파라미터가 있으면 targetDate = baseDate.format(DateTimeFormatter.ofPattern("yyyyMMdd")); + log.info("[Step 2-3] 수동호출 baseDate 가 있을 경우, 실태조사 적합여부 조회 날짜 확인 : {}", targetDate); } + log.info("[Step 3-1] 국유인 실태조사 적합여부 API 호출 시작 "); + log.info(" === 값 확인 - uid : {}", dto.getUid()); + log.info(" === 값 확인 - targetDate : {}", targetDate); RlbDtctDto result = gukYuinApiService.findRlbDtctList(dto.getUid(), targetDate, "Y"); if (result == null || result.getResult() == null || result.getResult().isEmpty()) { - log.warn("[GUKYUIN] empty result chnDtctMstId={}", dto.getChnDtctMstId()); + log.info("[GUKYUIN] empty result chnDtctId={}", dto.getUid()); + log.info("=== 국유인 API 조회 결과 없어서 continue"); continue; } + log.info("[Step 4-1] 국유인 실태조사 적합여부 result 값으로 데이터 업데이트"); + log.info(" === 데이터 갯수 : {}", result.getResult() == null ? 0 : result.getResult().size()); + for (RlbDtctMastDto stbltDto : result.getResult()) { + log.info("[Step 4-2] 국유인 실태조사 적합여부 결과 가져오기"); String resultUid = stbltDto.getChnDtctObjtId(); + log.info(" == 테이블 tb_pnu 에 적합여부 리턴 결과를 upsert 진행, 객체 uid : {}", resultUid); gukYuinStbltJobCoreService.updateGukYuinEligibleForSurvey(resultUid, stbltDto); } @@ -89,6 +102,7 @@ public class GukYuinApiStbltJobService { e -> { List pnuList = e.getValue(); + log.info("[Step 4-3] 국유인 실태조사 적합여부 업데이트 값을 객체 uid 기준으로 DTO 생성"); boolean hasY = pnuList.stream().anyMatch(v -> "Y".equals(v.getStbltYn())); String fitYn = hasY ? "Y" : "N"; @@ -104,7 +118,9 @@ public class GukYuinApiStbltJobService { .findFirst() .orElse(null); + log.info(" === selected DTO : {}", selected); if (selected == null) { + log.info(" === selected NULL"); return null; // 방어 코드 } @@ -112,10 +128,11 @@ public class GukYuinApiStbltJobService { fitYn, selected.getIncyCd(), selected.getIncyRsnCont()); })); + log.info("[Step 4-4] 국유인 실태조사 적합여부, 사유, 내용을 inference_geom 테이블에 update"); resultMap.forEach(gukYuinStbltJobCoreService::updateGukYuinObjectStbltYn); } catch (Exception e) { - log.error("[GUKYUIN] failed uid={}", dto.getChnDtctMstId(), e); + log.error("[GUKYUIN] failed uid={}", dto.getUid(), e); } } } diff --git a/gukyuin/stblt-check/src/main/resources/application-prod.yml b/gukyuin/stblt-check/src/main/resources/application-prod.yml index 1d17099..471febd 100644 --- a/gukyuin/stblt-check/src/main/resources/application-prod.yml +++ b/gukyuin/stblt-check/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