영상관리 수정 및 추가

src/main/java/com/kamco/cd/kamcoback/mapsheet/MapSheetMngApiController.java

@@ -57,11 +57,44 @@ public class MapSheetMngApiController {
     return ApiResponseDto.ok(mapSheetMngService.findMapSheetMngList(searchReq));
   }
 
+  @Operation(summary = "영상관리 > 데이터 등록", description = "영상관리 > 데이터 등록")
+  @ApiResponses(
+      value = {
+        @ApiResponse(
+            responseCode = "201",
+            description = "데이터 등록 성공",
+            content =
+                @Content(
+                    mediaType = "application/json",
+                    schema = @Schema(implementation = Long.class))),
+        @ApiResponse(responseCode = "400", description = "잘못된 요청 데이터", content = @Content),
+        @ApiResponse(responseCode = "404", description = "데이터를 찾을 수 없음", content = @Content),
+        @ApiResponse(responseCode = "500", description = "서버 오류", content = @Content)
+      })
+  @PutMapping("/mng-data-save")
+  public ApiResponseDto<MapSheetMngDto.DmlReturn> mngDataSave(
+      @RequestBody @Valid MapSheetMngDto.AddReq AddReq) {
+    return ApiResponseDto.ok(mapSheetMngService.mngDataSave(AddReq));
+  }
+
   /**
    * @param hstUidList
    * @return
    */
   @Operation(summary = "오류데이터 팝업 > 업로드 처리", description = "오류데이터 팝업 > 업로드 처리")
+  @ApiResponses(
+      value = {
+        @ApiResponse(
+            responseCode = "201",
+            description = "공통코드 저장 성공",
+            content =
+                @Content(
+                    mediaType = "application/json",
+                    schema = @Schema(implementation = Long.class))),
+        @ApiResponse(responseCode = "400", description = "잘못된 요청 데이터", content = @Content),
+        @ApiResponse(responseCode = "404", description = "코드를 찾을 수 없음", content = @Content),
+        @ApiResponse(responseCode = "500", description = "서버 오류", content = @Content)
+      })
   @PutMapping("/upload-process")
   public ApiResponseDto<MapSheetMngDto.DmlReturn> uploadProcess(
       @RequestBody @Valid List<Long> hstUidList) {

src/main/java/com/kamco/cd/kamcoback/mapsheet/MapSheetMngFileCheckerApiController.java

@@ -5,10 +5,8 @@ import com.kamco.cd.kamcoback.code.service.CommonCodeService;
 import com.kamco.cd.kamcoback.config.api.ApiResponseDto;
 import com.kamco.cd.kamcoback.mapsheet.dto.FileDto.FilesDto;
 import com.kamco.cd.kamcoback.mapsheet.dto.FileDto.FoldersDto;
-import com.kamco.cd.kamcoback.mapsheet.dto.FileDto.SrchFilesDepthDto;
 import com.kamco.cd.kamcoback.mapsheet.dto.FileDto.SrchFilesDto;
 import com.kamco.cd.kamcoback.mapsheet.dto.FileDto.SrchFoldersDto;
-import com.kamco.cd.kamcoback.mapsheet.dto.ImageryDto;
 import com.kamco.cd.kamcoback.mapsheet.service.MapSheetMngFileCheckerService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.media.Content;
@@ -16,7 +14,6 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.responses.ApiResponses;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -32,7 +29,7 @@ public class MapSheetMngFileCheckerApiController {
   private final CommonCodeService commonCodeService;
   private final MapSheetMngFileCheckerService mapSheetMngFileCheckerService;
 
-  @Operation(summary = "폴더 조회", description = "폴더 조회")
+  @Operation(summary = "폴더 조회", description = "폴더 조회 (ROOT:/app/original-images 이하로 경로입력)")
   @ApiResponses(
       value = {
         @ApiResponse(
@@ -47,6 +44,7 @@ public class MapSheetMngFileCheckerApiController {
       })
   @PostMapping("/folder-list")
   public ApiResponseDto<FoldersDto> getDir(@RequestBody SrchFoldersDto srchDto) {
+
     return ApiResponseDto.createOK(mapSheetMngFileCheckerService.getFolderAll(srchDto));
   }
 
@@ -69,6 +67,7 @@ public class MapSheetMngFileCheckerApiController {
     return ApiResponseDto.createOK(mapSheetMngFileCheckerService.getFilesAll(srchDto));
   }
 
+  /*
   @Operation(summary = "지정폴더(하위폴더포함) 파일목록 조회", description = "지정폴더(하위폴더포함) 파일목록 조회")
   @ApiResponses(
       value = {
@@ -106,4 +105,7 @@ public class MapSheetMngFileCheckerApiController {
       @RequestBody @Valid ImageryDto.searchReq searchReq) {
     return ApiResponseDto.ok(mapSheetMngFileCheckerService.syncProcess(searchReq));
   }
+
+
+   */
 }

src/main/java/com/kamco/cd/kamcoback/mapsheet/dto/FileDto.java

@@ -15,7 +15,7 @@ public class FileDto {
   @NoArgsConstructor
   @AllArgsConstructor
   public static class SrchFoldersDto {
-    @Schema(description = "디렉토리경로", example = "D:\\kamco")
+    @Schema(description = "디렉토리경로(ROOT:/app/original-images)", example = "")
     @NotNull
     private String dirPath;
   }

src/main/java/com/kamco/cd/kamcoback/mapsheet/dto/MapSheetMngDto.java

@@ -1,7 +1,9 @@
 package com.kamco.cd.kamcoback.mapsheet.dto;
 
+import com.kamco.cd.kamcoback.common.utils.interfaces.JsonFormatDttm;
 import com.kamco.cd.kamcoback.config.enums.EnumType;
 import io.swagger.v3.oas.annotations.media.Schema;
+import java.time.ZonedDateTime;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -62,6 +64,19 @@ public class MapSheetMngDto {
     private DataState dataState;
   }
 
+  @Schema(name = "MngAddReq", description = "영상관리 생성 요청")
+  @Getter
+  @Setter
+  @NoArgsConstructor
+  @AllArgsConstructor
+  public static class AddReq {
+    @Schema(description = "관리년도", example = "2022")
+    private int mngYyyy;
+
+    @Schema(description = "선택폴더경로", example = "D:\\app\\original-images\\2022")
+    private String mngPath;
+  }
+
   @Schema(name = "MngDto", description = "영상관리 검색 리턴")
   @Getter
   @Setter
@@ -72,17 +87,18 @@ public class MapSheetMngDto {
     private int mngYyyy;
     private String mngState;
     private String syncState;
-    private String mngStateDttm;
-    private String syncStateDttm;
-    // private int sheetCnt;
-    // private int exceptCnt;
-    private String mngPath;
-    private String createdDttm;
-    private Long createdUid;
-    private String updatedDttm;
-    private Long updatedUid;
+    private String syncCheckState;
+    private Long syncTotCnt;
+    private Long syncStateDoneCnt;
+    private Long syncCheckStateDoneCnt;
+    private Long syncNotFileCnt;
+    private Long syncTypeErrorCnt;
+    private Long syncSizeErrorCnt;
+    @JsonFormatDttm private ZonedDateTime rgstStrtDttm;
+    @JsonFormatDttm private ZonedDateTime rgstEndDttm;
   }
 
+
   @Schema(name = "DmlReturn", description = "영상관리 DML 수행 후 리턴")
   @Getter
   @Setter

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

@@ -3,6 +3,7 @@ package com.kamco.cd.kamcoback.mapsheet.service;
 import static java.lang.String.CASE_INSENSITIVE_ORDER;
 
 import com.kamco.cd.kamcoback.common.utils.NameValidator;
+import com.kamco.cd.kamcoback.config.FileConfig;
 import com.kamco.cd.kamcoback.mapsheet.dto.FileDto;
 import com.kamco.cd.kamcoback.mapsheet.dto.FileDto.FilesDto;
 import com.kamco.cd.kamcoback.mapsheet.dto.FileDto.FolderDto;
@@ -38,11 +39,15 @@ import org.springframework.transaction.annotation.Transactional;
 public class MapSheetMngFileCheckerService {
 
   private final MapSheetMngFileCheckerCoreService mapSheetMngFileCheckerCoreService;
+  private final FileConfig fileConfig;
 
   public FoldersDto getFolderAll(SrchFoldersDto srchDto) {
 
-    Path startPath = Paths.get(srchDto.getDirPath());
-    String dirPath = srchDto.getDirPath();
+    Path startPath = Paths.get(fileConfig.getRootSyncDir() + srchDto.getDirPath());
+    String dirPath = fileConfig.getRootSyncDir() + srchDto.getDirPath();
+
+    // Path startPath = Paths.get(fileConfig.getRootSyncDir()+srchDto.getDirPath());
+    // String dirPath =  fileConfig.getRootSyncDir()+srchDto.getDirPath();
 
     int maxDepth = 1;
 

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

@@ -222,6 +222,10 @@ public class MapSheetMngService {
     return mapSheetMngCoreService.findMapSheetMngList(searchReq);
   }
 
+  public MapSheetMngDto.DmlReturn mngDataSave(@Valid MapSheetMngDto.AddReq AddReq) {
+    return mapSheetMngCoreService.mngDataSave(AddReq);
+  }
+
   public MapSheetMngDto.DmlReturn uploadProcess(@Valid List<Long> hstUidList) {
     return mapSheetMngCoreService.uploadProcess(hstUidList);
   }