From 523e9a596dc88ddf3b7b71d1e10ecfbe0b67a7d0 Mon Sep 17 00:00:00 2001 From: Moon Date: Thu, 15 Jan 2026 18:49:09 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=EA=B2=BD=EB=A1=9C=EC=84=A4=EC=A0=95?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application-dev.yml | 1 + src/main/resources/application-local.yml | 1 + src/main/resources/application-prod.yml | 13 +++++++------ 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 99593c56..0cb3c5ae 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -94,6 +94,7 @@ file: #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 inference: url: http://10.100.0.11:8000/jobs diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml index 1eb8c37b..42aafeda 100644 --- a/src/main/resources/application-local.yml +++ b/src/main/resources/application-local.yml @@ -80,6 +80,7 @@ file: 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 inference: url: http://10.100.0.11:8000/jobs diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index 51449152..0b65173d 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -43,18 +43,19 @@ mapsheet: file: - #sync-root-dir: D:/app/original-images/ - sync-root-dir: /app/original-images/ + #sync-root-dir: D:/kamco-nfs/images/ + sync-root-dir: /kamco-nfs/images/ sync-tmp-dir: ${file.sync-root-dir}/tmp sync-file-extention: tfw,tif - #dataset-dir: D:/app/dataset/ - dataset-dir: /app/dataset/ + #dataset-dir: D:/kamco-nfs/dataset/ + dataset-dir: /kamco-nfs/dataset/export/ dataset-tmp-dir: ${file.dataset-dir}tmp/ - #model-dir: D:/app/model/ - model-dir: /app/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 inference: url: http://10.100.0.11:8000/jobs From 9eebe4ac4b7d67cacad895e3caa8b45acccc1983 Mon Sep 17 00:00:00 2001 From: teddy Date: Thu, 15 Jan 2026 18:56:34 +0900 Subject: [PATCH 2/2] =?UTF-8?q?[KC-103]=20=EC=B6=94=EB=A1=A0=20=EC=8B=A4?= =?UTF-8?q?=ED=96=89=20=ED=8C=8C=EC=9D=BC=EB=AA=85=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/InferenceResultService.java | 16 ++++++++++++---- .../postgres/core/MapSheetMngCoreService.java | 15 ++++++++++++--- 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/kamco/cd/kamcoback/inference/service/InferenceResultService.java b/src/main/java/com/kamco/cd/kamcoback/inference/service/InferenceResultService.java index f005a071..e9ad2fa7 100644 --- a/src/main/java/com/kamco/cd/kamcoback/inference/service/InferenceResultService.java +++ b/src/main/java/com/kamco/cd/kamcoback/inference/service/InferenceResultService.java @@ -176,12 +176,18 @@ public class InferenceResultService { // 비교년도 geojson 파일 생성하여 경로 받기 String modelComparePath = getSceneInference( - String.valueOf(req.getCompareYyyy()), mapSheetNumList, req.getMapSheetScope()); + String.valueOf(req.getCompareYyyy()), + mapSheetNumList, + req.getMapSheetScope(), + req.getDetectOption()); // 기준년도 geojson 파일 생성하여 경로 받기 String modelTargetPath = getSceneInference( - String.valueOf(req.getTargetYyyy()), mapSheetNumList, req.getMapSheetScope()); + String.valueOf(req.getTargetYyyy()), + mapSheetNumList, + req.getMapSheetScope(), + req.getDetectOption()); // ai 서버에 전달할 파라미터 생성 pred_requests_areas predRequestsAreas = new pred_requests_areas(); @@ -391,8 +397,10 @@ public class InferenceResultService { * @param mapSheetScope EXCL : 추론제외, PREV 이전 년도 도엽 사용 * @return */ - private String getSceneInference(String yyyy, List mapSheetNums, String mapSheetScope) { - return mapSheetMngCoreService.getSceneInference(yyyy, mapSheetNums, mapSheetScope); + private String getSceneInference( + String yyyy, List mapSheetNums, String mapSheetScope, String detectOption) { + return mapSheetMngCoreService.getSceneInference( + yyyy, mapSheetNums, mapSheetScope, detectOption); } /** diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/core/MapSheetMngCoreService.java b/src/main/java/com/kamco/cd/kamcoback/postgres/core/MapSheetMngCoreService.java index cf56f24d..7b7a5d23 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/core/MapSheetMngCoreService.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/core/MapSheetMngCoreService.java @@ -4,6 +4,7 @@ import com.kamco.cd.kamcoback.common.exception.CustomApiException; import com.kamco.cd.kamcoback.common.geometry.GeoJsonFileWriter; import com.kamco.cd.kamcoback.common.geometry.GeoJsonFileWriter.ImageFeature; import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto; +import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto.DetectOption; import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto.MapSheetScope; import com.kamco.cd.kamcoback.mapsheet.dto.MapSheetMngDto; import com.kamco.cd.kamcoback.mapsheet.dto.MapSheetMngDto.MngListCompareDto; @@ -219,18 +220,26 @@ public class MapSheetMngCoreService { * @param mapSheetScope EXCL : 추론제외, PREV 이전 년도 도엽 사용 * @return */ - public String getSceneInference(String yyyy, List scenes, String mapSheetScope) { + public String getSceneInference( + String yyyy, List scenes, String mapSheetScope, String detectOption) { boolean isAll = MapSheetScope.ALL.getId().equals(mapSheetScope); + String optionSuffix = ""; + if (DetectOption.EXCL.getId().equals(detectOption)) { + optionSuffix = "_EXCL"; + } else if (DetectOption.PREV.getId().equals(detectOption)) { + optionSuffix = "_PREV"; + } + // 1) 경로/파일명 결정 String targetDir = "local".equals(activeEnv) ? System.getProperty("user.home") + "/geojson" : inferenceDir; String filename = isAll - ? String.format("%s_%s_ALL.geojson", yyyy, activeEnv) - : String.format("%s_%s.geojson", yyyy, activeEnv); + ? String.format("%s_%s_ALL%s.geojson", yyyy, activeEnv, optionSuffix) + : String.format("%s_%s%s.geojson", yyyy, activeEnv, optionSuffix); Path outputPath = Paths.get(targetDir, filename);