Merge pull request '국유인 연동 url 수정' (#120) from feat/infer_dev_260211 into develop

Reviewed-on: #120

src/main/java/com/kamco/cd/kamcoback/config/FileProperties.java

@@ -24,10 +24,12 @@ public class FileProperties {
   private String ptPath;
   private String datasetResponse;
   private TrainingData trainingData;
+  private String outputDir;
 
   @Getter
   @Setter
   public static class TrainingData {
+
     private String geojsonDir;
   }
 }

src/main/java/com/kamco/cd/kamcoback/config/StartupLogger.java

@@ -91,6 +91,7 @@ public class StartupLogger {
           │  Dataset Dir      : %s
           │  Model Dir        : %s
           │  PT Path          : %s
+          │  Output Dir       : %s
           ╠════════════════════════════════════════════════════════════════════════════════╣
           ║  INFERENCE CONFIGURATION                                                       ║
           ╠────────────────────────────────────────────────────────────────────────────────╣
@@ -118,6 +119,7 @@ public class StartupLogger {
             fileProperties.getDatasetDir() != null ? fileProperties.getDatasetDir() : "N/A",
             fileProperties.getModelDir() != null ? fileProperties.getModelDir() : "N/A",
             fileProperties.getPtPath() != null ? fileProperties.getPtPath() : "N/A",
+            fileProperties.getOutputDir() != null ? fileProperties.getOutputDir() : "N/A",
             inferenceProperties.getNfs() != null ? inferenceProperties.getNfs() : "N/A",
             inferenceProperties.getUrl() != null ? inferenceProperties.getUrl() : "N/A",
             inferenceProperties.getBatchUrl() != null ? inferenceProperties.getBatchUrl() : "N/A",

src/main/java/com/kamco/cd/kamcoback/gukyuin/service/GukYuinApiService.java

@@ -69,7 +69,7 @@ public class GukYuinApiService {
   @Value("${file.nfs}")
   private String nfs;
 
-  @Value("${inference.output-dir}")
+  @Value("${file.output-dir}")
   private String outputDir;
 
   @Transactional
@@ -459,8 +459,7 @@ public class GukYuinApiService {
     // 추론 shp 파일 생성되는 위치
     String kamconfsDatasetExportPathfsDatasetExportPath = outputDir;
     log.info("outputDir path : " + kamconfsDatasetExportPathfsDatasetExportPath);
-    if (!Files.isDirectory(
+    if (!Files.isDirectory(Path.of(kamconfsDatasetExportPathfsDatasetExportPath + info.getUid()))) {
-        Path.of(kamconfsDatasetExportPathfsDatasetExportPath + "/" + info.getUid()))) {
       return new ResponseObj(
           ApiResponseCode.NOT_FOUND_DATA, "파일 경로에 회차 실행 파일이 생성되지 않았습니다. 확인 부탁드립니다.");
     }
@@ -475,7 +474,7 @@ public class GukYuinApiService {
     reqDto.setCrtrYr(String.valueOf(info.getTargetYyyy()));
     reqDto.setChnDtctSno(String.valueOf(maxStage + 1));
     reqDto.setChnDtctId(info.getUid());
-    reqDto.setPathNm(kamconfsDatasetExportPathfsDatasetExportPath + "/" + info.getUid());
+    reqDto.setPathNm(kamconfsDatasetExportPathfsDatasetExportPath + info.getUid());
 
     // 1회차를 종료 상태로 처리하고 2회차를 보내야 함
     // 추론(learn), 학습데이터(inference) 둘 다 종료 처리

src/main/resources/application.yml

@@ -82,6 +82,8 @@ file:
   dataset-response: ${file.nfs}/dataset/response/
   training-data:
     geojson-dir: ${file.nfs}/dataset/request/
+  output-dir: ${file.nfs}/dataset/export/           # 마운트 경로 : 국유인 연계 등록할 추론 shp 파일
+
 inference:
   nfs: /kamco-nfs
   geojson-dir: ${inference.nfs}/requests/                   # 추론실행을 위한 파일생성경로