merge develop

Reviewed-on: #100
Co-authored-by: dean[백병남] <byungnam.baek@dabeeo.com>
Co-committed-by: dean[백병남] <byungnam.baek@dabeeo.com>

src/main/java/com/kamco/cd/kamcoback/common/utils/FIleChecker.java

@@ -280,7 +280,8 @@ public class FIleChecker {
   }
 
   // kamco-nfs를 확인하는곳이 있어서 파라미터 추가 사용용도확인후 처리
-  public static List<Folder> getFolderAll(String dirPath, String sortType, int maxDepth,String nfsRootDir) {
+  public static List<Folder> getFolderAll(
+      String dirPath, String sortType, int maxDepth, String nfsRootDir) {
 
     Path startPath = Paths.get(dirPath);
 
@@ -311,7 +312,8 @@ public class FIleChecker {
 
                     // 이것이 필요한건가?
                     //                    boolean isShowHide =
-//                      !parentFolderNm.equals("kamco-nfs"); // 폴더 리스트에 kamco-nfs 하위만 나오도록 처리
+                    //                      !parentFolderNm.equals("kamco-nfs"); // 폴더 리스트에
+                    // kamco-nfs 하위만 나오도록 처리
                     boolean isShowHide =
                         !parentFolderNm.equals(nfsRootDir); // 폴더 리스트에 nfsRootDir 하위만 나오도록 처리
                     File file = new File(fullPath);

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

@@ -72,7 +72,6 @@ public class GukYuinApiService {
   //  @Value("${file.dataset-dir}")
   //  private String datasetDir;
 
-
   @Transactional
   public ChngDetectMastDto.RegistResDto regist(
       ChngDetectMastDto.ChnDetectMastReqDto chnDetectMastReq) {
@@ -458,7 +457,8 @@ public class GukYuinApiService {
     }
 
     //    String kamconfsDatasetExportPathfsDatasetExportPath = "/kamco-nfs/dataset/export/";
-    String kamconfsDatasetExportPathfsDatasetExportPath = String.format("%s%s", nfs, "/dataset/export/");
+    String kamconfsDatasetExportPathfsDatasetExportPath =
+        String.format("%s%s", nfs, "/dataset/export/");
     if (!Files.isDirectory(Path.of(kamconfsDatasetExportPathfsDatasetExportPath + info.getUid()))) {
       return new ResponseObj(
           ApiResponseCode.NOT_FOUND_DATA, "파일 경로에 회차 실행 파일이 생성되지 않았습니다. 확인 부탁드립니다.");

src/main/java/com/kamco/cd/kamcoback/inference/dto/InferenceSendDto.java

@@ -7,9 +7,7 @@ import lombok.Setter;
 import lombok.ToString;
 import lombok.extern.slf4j.Slf4j;
 
-/**
+/** AI API 추론 실행 DTO */
- * AI API 추론 실행 DTO
- */
 @Slf4j
 @Getter
 @Setter
@@ -27,7 +25,6 @@ public class InferenceSendDto {
   private String cd_model_type;
   private Double priority;
 
-
   @Getter
   @Setter
   @AllArgsConstructor
@@ -39,7 +36,5 @@ public class InferenceSendDto {
     private Integer input2_year;
     private String input1_scene_path;
     private String input2_scene_path;
-
-
   }
 }

src/main/java/com/kamco/cd/kamcoback/inference/service/InferenceResultService.java

@@ -474,7 +474,9 @@ public class InferenceResultService {
     //      if (dto.getPred_requests_areas() == null) {
     //        throw new IllegalStateException("pred_requests_areas is null");
     //      }
+    //
     // dto.getPred_requests_areas().setInput1_scene_path("/kamco-nfs/requests/2023_local.geojson");
+    //
     // dto.getPred_requests_areas().setInput2_scene_path("/kamco-nfs/requests/2024_local.geojson");
     //    }
 

src/main/java/com/kamco/cd/kamcoback/mapsheet/service/MapSheetMngService.java

@@ -47,7 +47,6 @@ public class MapSheetMngService {
   private final UploadService uploadService;
   private final UserUtil userUtil = new UserUtil();
 
-
   @Value("${file.root}")
   private String nfsRootDir;
 

src/main/java/com/kamco/cd/kamcoback/scheduler/service/MapSheetInferenceJobService.java

@@ -393,7 +393,9 @@ public class MapSheetInferenceJobService {
     //      if (dto.getPred_requests_areas() == null) {
     //        throw new IllegalStateException("pred_requests_areas is null");
     //      }
+    //
     // dto.getPred_requests_areas().setInput1_scene_path("/kamco-nfs/requests/2023_local.geojson");
+    //
     // dto.getPred_requests_areas().setInput2_scene_path("/kamco-nfs/requests/2024_local.geojson");
     //    }