Merge remote-tracking branch 'origin/feat/dev_251201' into feat/dev_251201

# Conflicts:
#	src/main/java/com/kamco/cd/kamcoback/mapsheet/dto/MapSheetMngDto.java
#	src/main/java/com/kamco/cd/kamcoback/mapsheet/service/MapSheetMngService.java
#	src/main/java/com/kamco/cd/kamcoback/postgres/core/MapSheetMngCoreService.java
#	src/main/java/com/kamco/cd/kamcoback/postgres/repository/mapsheet/MapSheetMngRepositoryImpl.java

src/main/java/com/kamco/cd/kamcoback/common/enums/MngStateType.java

@@ -9,10 +9,9 @@ import lombok.Getter;
 public enum MngStateType implements EnumType {
   NOTYET("미처리"),
   PROCESSING("진행중"),
-  DONE  ("싱크완료"),
+  DONE("싱크완료"),
   COMPLETE("작업완료");
 
-
   private final String desc;
 
   @Override

src/main/java/com/kamco/cd/kamcoback/common/enums/SyncStateType.java

@@ -4,7 +4,6 @@ import com.kamco.cd.kamcoback.config.enums.EnumType;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
-
 @Getter
 @AllArgsConstructor
 public enum SyncStateType implements EnumType {
@@ -28,5 +27,3 @@ public enum SyncStateType implements EnumType {
     return desc;
   }
 }
-
-

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

@@ -12,7 +12,6 @@ import org.springframework.stereotype.Component;
 @Setter
 public class FileConfig {
 
-  //private String rootSyncDir = "D:\\app\\original-images";
+  // private String rootSyncDir = "D:\\app\\original-images";
   private String rootSyncDir = "/app/original-images";
-
 }

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

@@ -88,21 +88,20 @@ public class MapSheetMngApiController {
 
   @Operation(summary = "영상관리 > 작업완료", description = "영상관리 > 작업완료")
   @ApiResponses(
-    value = {
+      value = {
-      @ApiResponse(
+        @ApiResponse(
-        responseCode = "201",
+            responseCode = "201",
-        description = "작업완료 처리 성공",
+            description = "작업완료 처리 성공",
-        content =
+            content =
-        @Content(
+                @Content(
-          mediaType = "application/json",
+                    mediaType = "application/json",
-          schema = @Schema(implementation = Long.class))),
+                    schema = @Schema(implementation = Long.class))),
-      @ApiResponse(responseCode = "400", description = "잘못된 요청 데이터", content = @Content),
+        @ApiResponse(responseCode = "400", description = "잘못된 요청 데이터", content = @Content),
-      @ApiResponse(responseCode = "404", description = "코드를 찾을 수 없음", content = @Content),
+        @ApiResponse(responseCode = "404", description = "코드를 찾을 수 없음", content = @Content),
-      @ApiResponse(responseCode = "500", description = "서버 오류", content = @Content)
+        @ApiResponse(responseCode = "500", description = "서버 오류", content = @Content)
-    })
+      })
   @PutMapping("/mng-complete")
-  public ApiResponseDto<MapSheetMngDto.DmlReturn> mngComplete(
+  public ApiResponseDto<MapSheetMngDto.DmlReturn> mngComplete(@RequestParam @Valid int mngYyyy) {
-    @RequestParam @Valid int mngYyyy) {
     return ApiResponseDto.ok(mapSheetMngService.mngComplete(mngYyyy));
   }
 
@@ -118,7 +117,6 @@ public class MapSheetMngApiController {
     return ApiResponseDto.ok(mapSheetMngService.findMapSheetErrorList(searchReq));
   }
 
-
   @Operation(summary = "오류데이터 팝업 > 업로드 처리", description = "오류데이터 팝업 > 업로드 처리")
   @ApiResponses(
       value = {
@@ -147,17 +145,13 @@ public class MapSheetMngApiController {
     return ApiResponseDto.ok(mapSheetMngService.updateExceptUseInference(hstUidList));
   }
 
-
-
-
   @Operation(summary = "페어 파일 업로드", description = "TFW/TIF 두 파일을 쌍으로 업로드 및 검증")
   @PostMapping(value = "/upload-pair", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
   public ApiResponseDto<MapSheetMngDto.DmlReturn> uploadPair(
-    @RequestPart("tfw") MultipartFile tfwFile,
+      @RequestPart("tfw") MultipartFile tfwFile,
-    @RequestPart("tif") MultipartFile tifFile,
+      @RequestPart("tif") MultipartFile tifFile,
-    @RequestParam(value = "hstUid", required = false) Long hstUid) {
+      @RequestParam(value = "hstUid", required = false) Long hstUid) {
-    return ApiResponseDto.createOK(
+    return ApiResponseDto.createOK(mapSheetMngService.uploadPair(tfwFile, tifFile, hstUid));
-      mapSheetMngService.uploadPair(tfwFile, tifFile, hstUid));
   }
 
 

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

@@ -83,8 +83,6 @@ public class MapSheetMngFileCheckerApiController {
         mapSheetMngFileCheckerService.uploadFile(file, targetPath, overwrite, hstUid));
   }
 
-
-
   @Operation(summary = "파일 삭제", description = "중복 파일 등 파일 삭제")
   @PostMapping("/delete")
   public ApiResponseDto<Boolean> deleteFile(@RequestBody SrchFoldersDto dto) {

src/main/java/com/kamco/cd/kamcoback/postgres/entity/ErrorLogEntity.java

@@ -5,12 +5,11 @@ import com.kamco.cd.kamcoback.log.dto.EventType;
 import com.kamco.cd.kamcoback.postgres.CommonCreateEntity;
 import jakarta.persistence.*;
 import jakarta.validation.constraints.Size;
+import java.time.ZonedDateTime;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
-import java.time.ZonedDateTime;
-
 @Entity
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)