diff --git a/label/review-to-geojson/.gradle/9.3.1/executionHistory/executionHistory.bin b/label/review-to-geojson/.gradle/9.3.1/executionHistory/executionHistory.bin index 210ddda..c97e926 100644 Binary files a/label/review-to-geojson/.gradle/9.3.1/executionHistory/executionHistory.bin and b/label/review-to-geojson/.gradle/9.3.1/executionHistory/executionHistory.bin differ diff --git a/label/review-to-geojson/.gradle/9.3.1/executionHistory/executionHistory.lock b/label/review-to-geojson/.gradle/9.3.1/executionHistory/executionHistory.lock index 4ded7e7..8bce03b 100644 Binary files a/label/review-to-geojson/.gradle/9.3.1/executionHistory/executionHistory.lock and b/label/review-to-geojson/.gradle/9.3.1/executionHistory/executionHistory.lock differ diff --git a/label/review-to-geojson/.gradle/9.3.1/fileHashes/fileHashes.bin b/label/review-to-geojson/.gradle/9.3.1/fileHashes/fileHashes.bin index 88e2afe..634b7a8 100644 Binary files a/label/review-to-geojson/.gradle/9.3.1/fileHashes/fileHashes.bin and b/label/review-to-geojson/.gradle/9.3.1/fileHashes/fileHashes.bin differ diff --git a/label/review-to-geojson/.gradle/9.3.1/fileHashes/fileHashes.lock b/label/review-to-geojson/.gradle/9.3.1/fileHashes/fileHashes.lock index 1a96d4d..7de3950 100644 Binary files a/label/review-to-geojson/.gradle/9.3.1/fileHashes/fileHashes.lock and b/label/review-to-geojson/.gradle/9.3.1/fileHashes/fileHashes.lock differ diff --git a/label/review-to-geojson/.gradle/9.3.1/fileHashes/resourceHashesCache.bin b/label/review-to-geojson/.gradle/9.3.1/fileHashes/resourceHashesCache.bin index bf80f42..cc0d043 100644 Binary files a/label/review-to-geojson/.gradle/9.3.1/fileHashes/resourceHashesCache.bin and b/label/review-to-geojson/.gradle/9.3.1/fileHashes/resourceHashesCache.bin differ diff --git a/label/review-to-geojson/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/label/review-to-geojson/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 2fb9754..887eeac 100644 Binary files a/label/review-to-geojson/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/label/review-to-geojson/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/label/review-to-geojson/.gradle/buildOutputCleanup/outputFiles.bin b/label/review-to-geojson/.gradle/buildOutputCleanup/outputFiles.bin index 3702002..b77be5f 100644 Binary files a/label/review-to-geojson/.gradle/buildOutputCleanup/outputFiles.bin and b/label/review-to-geojson/.gradle/buildOutputCleanup/outputFiles.bin differ diff --git a/label/review-to-geojson/.gradle/file-system.probe b/label/review-to-geojson/.gradle/file-system.probe index 6231241..aa54cc9 100644 Binary files a/label/review-to-geojson/.gradle/file-system.probe and b/label/review-to-geojson/.gradle/file-system.probe differ diff --git a/label/review-to-geojson/build/classes/java/main/com/kamcoback/cd/review/service/ReviewToGeojsonRunner.class b/label/review-to-geojson/build/classes/java/main/com/kamcoback/cd/review/service/ReviewToGeojsonRunner.class new file mode 100644 index 0000000..2072122 Binary files /dev/null and b/label/review-to-geojson/build/classes/java/main/com/kamcoback/cd/review/service/ReviewToGeojsonRunner.class differ diff --git a/label/review-to-geojson/build/libs/TrainingDataReview-0.0.1-SNAPSHOT-plain.jar b/label/review-to-geojson/build/libs/TrainingDataReview-0.0.1-SNAPSHOT-plain.jar index 54ed953..64b5fb6 100644 Binary files a/label/review-to-geojson/build/libs/TrainingDataReview-0.0.1-SNAPSHOT-plain.jar and b/label/review-to-geojson/build/libs/TrainingDataReview-0.0.1-SNAPSHOT-plain.jar differ diff --git a/label/review-to-geojson/build/libs/review-to-geojson.jar b/label/review-to-geojson/build/libs/review-to-geojson.jar index f723b9f..c734ee7 100644 Binary files a/label/review-to-geojson/build/libs/review-to-geojson.jar and b/label/review-to-geojson/build/libs/review-to-geojson.jar differ diff --git a/label/review-to-geojson/build/resources/main/application-prod.yml b/label/review-to-geojson/build/resources/main/application-prod.yml index 471febd..1d17099 100644 --- a/label/review-to-geojson/build/resources/main/application-prod.yml +++ b/label/review-to-geojson/build/resources/main/application-prod.yml @@ -84,28 +84,28 @@ mapsheet: baseurl: /app/detect/result #현재사용안함 file: - sync-root-dir: /kamco-nfs/images/ - sync-tmp-dir: /kamco-nfs/repo/tmp # image upload temp dir + sync-root-dir: /data/images/ + sync-tmp-dir: /data/repo/tmp # image upload temp dir sync-file-extention: tfw,tif - #dataset-dir: D:/kamco-nfs/model_output/ #변경 model_output - dataset-dir: /kamco-nfs/model_output/export/ # 마운트경로 AI 추론결과 + #dataset-dir: D:/data/model_output/ #변경 model_output + dataset-dir: /data/model_output/export/ # 마운트경로 AI 추론결과 dataset-tmp-dir: ${file.dataset-dir}tmp/ - #model-dir: D:/kamco-nfs/ckpt/model/ - model-dir: /kamco-nfs/ckpt/model/ # 학습서버에서 트레이닝한 모델업로드경로 + #model-dir: D:/data/ckpt/model/ + model-dir: /data/ckpt/model/ # 학습서버에서 트레이닝한 모델업로드경로 model-tmp-dir: ${file.model-dir}tmp/ model-file-extention: pth,json,py - pt-path: /kamco-nfs/ckpt/v6-cls-checkpoints/ + pt-path: /data/ckpt/v6-cls-checkpoints/ pt-FileName: yolov8_6th-6m.pt - dataset-response: /kamco-nfs/dataset/response/ + dataset-response: /data/dataset/response/ inference: url: http://127.0.0.1:8000/jobs batch-url: http://127.0.0.1:8000/batches - geojson-dir: /kamco-nfs/requests/ # 학습서버에서 트레이닝한 모델업로드경로 - jar-path: /kamco-nfs/repo/jar/shp-exporter.jar # 추론실행을 위한 파일생성경로 + geojson-dir: /data/requests/ # 학습서버에서 트레이닝한 모델업로드경로 + jar-path: /data/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: /kamco-nfs/dataset/request/ + geojson-dir: /data/dataset/request/ layer: geoserver-url: https://kamco.geo-dev.gs.dabeeo.com diff --git a/label/review-to-geojson/build/tmp/compileJava/previous-compilation-data.bin b/label/review-to-geojson/build/tmp/compileJava/previous-compilation-data.bin index dadb6d7..cc6ceb8 100644 Binary files a/label/review-to-geojson/build/tmp/compileJava/previous-compilation-data.bin and b/label/review-to-geojson/build/tmp/compileJava/previous-compilation-data.bin differ diff --git a/label/review-to-geojson/src/main/java/com/kamcoback/cd/review/service/ReviewToGeojsonRunner.java b/label/review-to-geojson/src/main/java/com/kamcoback/cd/review/service/ReviewToGeojsonRunner.java new file mode 100644 index 0000000..2df6bb8 --- /dev/null +++ b/label/review-to-geojson/src/main/java/com/kamcoback/cd/review/service/ReviewToGeojsonRunner.java @@ -0,0 +1,26 @@ +package com.kamcoback.cd.review.service; + +import java.time.LocalDate; +import lombok.RequiredArgsConstructor; +import org.springframework.boot.CommandLineRunner; +import org.springframework.stereotype.Component; + +@Component +@RequiredArgsConstructor +public class ReviewToGeojsonRunner implements CommandLineRunner { + + private final TrainingDataReviewJobService jobService; + + @Override + public void run(String... args) { + LocalDate baseDate = null; + + for (String arg : args) { + if (arg.startsWith("baseDate=")) { + baseDate = LocalDate.parse(arg.split("=")[1]); + } + } + + jobService.exportGeojsonLabelingGeom(baseDate); + } +} diff --git a/label/review-to-geojson/src/main/resources/application-prod.yml b/label/review-to-geojson/src/main/resources/application-prod.yml index 471febd..1d17099 100644 --- a/label/review-to-geojson/src/main/resources/application-prod.yml +++ b/label/review-to-geojson/src/main/resources/application-prod.yml @@ -84,28 +84,28 @@ mapsheet: baseurl: /app/detect/result #현재사용안함 file: - sync-root-dir: /kamco-nfs/images/ - sync-tmp-dir: /kamco-nfs/repo/tmp # image upload temp dir + sync-root-dir: /data/images/ + sync-tmp-dir: /data/repo/tmp # image upload temp dir sync-file-extention: tfw,tif - #dataset-dir: D:/kamco-nfs/model_output/ #변경 model_output - dataset-dir: /kamco-nfs/model_output/export/ # 마운트경로 AI 추론결과 + #dataset-dir: D:/data/model_output/ #변경 model_output + dataset-dir: /data/model_output/export/ # 마운트경로 AI 추론결과 dataset-tmp-dir: ${file.dataset-dir}tmp/ - #model-dir: D:/kamco-nfs/ckpt/model/ - model-dir: /kamco-nfs/ckpt/model/ # 학습서버에서 트레이닝한 모델업로드경로 + #model-dir: D:/data/ckpt/model/ + model-dir: /data/ckpt/model/ # 학습서버에서 트레이닝한 모델업로드경로 model-tmp-dir: ${file.model-dir}tmp/ model-file-extention: pth,json,py - pt-path: /kamco-nfs/ckpt/v6-cls-checkpoints/ + pt-path: /data/ckpt/v6-cls-checkpoints/ pt-FileName: yolov8_6th-6m.pt - dataset-response: /kamco-nfs/dataset/response/ + dataset-response: /data/dataset/response/ inference: url: http://127.0.0.1:8000/jobs batch-url: http://127.0.0.1:8000/batches - geojson-dir: /kamco-nfs/requests/ # 학습서버에서 트레이닝한 모델업로드경로 - jar-path: /kamco-nfs/repo/jar/shp-exporter.jar # 추론실행을 위한 파일생성경로 + geojson-dir: /data/requests/ # 학습서버에서 트레이닝한 모델업로드경로 + jar-path: /data/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: /kamco-nfs/dataset/request/ + geojson-dir: /data/dataset/request/ layer: geoserver-url: https://kamco.geo-dev.gs.dabeeo.com