diff --git a/src/main/java/com/kamco/cd/kamcoback/common/enums/MngStateType.java b/src/main/java/com/kamco/cd/kamcoback/common/enums/MngStateType.java index 29e561e0..342064d6 100644 --- a/src/main/java/com/kamco/cd/kamcoback/common/enums/MngStateType.java +++ b/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 diff --git a/src/main/java/com/kamco/cd/kamcoback/common/enums/SyncStateType.java b/src/main/java/com/kamco/cd/kamcoback/common/enums/SyncStateType.java index 0bf0629d..2acba320 100644 --- a/src/main/java/com/kamco/cd/kamcoback/common/enums/SyncStateType.java +++ b/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; } } - - diff --git a/src/main/java/com/kamco/cd/kamcoback/config/FileConfig.java b/src/main/java/com/kamco/cd/kamcoback/config/FileConfig.java index aa657896..fb0ae08c 100644 --- a/src/main/java/com/kamco/cd/kamcoback/config/FileConfig.java +++ b/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"; - } diff --git a/src/main/java/com/kamco/cd/kamcoback/mapsheet/MapSheetMngApiController.java b/src/main/java/com/kamco/cd/kamcoback/mapsheet/MapSheetMngApiController.java index 08645dfa..36976c52 100644 --- a/src/main/java/com/kamco/cd/kamcoback/mapsheet/MapSheetMngApiController.java +++ b/src/main/java/com/kamco/cd/kamcoback/mapsheet/MapSheetMngApiController.java @@ -88,21 +88,20 @@ public class MapSheetMngApiController { @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) - }) + 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-complete") - public ApiResponseDto mngComplete( - @RequestParam @Valid int mngYyyy) { + public ApiResponseDto mngComplete(@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 uploadPair( - @RequestPart("tfw") MultipartFile tfwFile, - @RequestPart("tif") MultipartFile tifFile, - @RequestParam(value = "hstUid", required = false) Long hstUid) { - return ApiResponseDto.createOK( - mapSheetMngService.uploadPair(tfwFile, tifFile, hstUid)); + @RequestPart("tfw") MultipartFile tfwFile, + @RequestPart("tif") MultipartFile tifFile, + @RequestParam(value = "hstUid", required = false) Long hstUid) { + return ApiResponseDto.createOK(mapSheetMngService.uploadPair(tfwFile, tifFile, hstUid)); } diff --git a/src/main/java/com/kamco/cd/kamcoback/mapsheet/MapSheetMngFileCheckerApiController.java b/src/main/java/com/kamco/cd/kamcoback/mapsheet/MapSheetMngFileCheckerApiController.java index 6ba95edd..239bf383 100644 --- a/src/main/java/com/kamco/cd/kamcoback/mapsheet/MapSheetMngFileCheckerApiController.java +++ b/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 deleteFile(@RequestBody SrchFoldersDto dto) { diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/entity/ErrorLogEntity.java b/src/main/java/com/kamco/cd/kamcoback/postgres/entity/ErrorLogEntity.java index 498f3dc3..629cb6c2 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/entity/ErrorLogEntity.java +++ b/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) diff --git a/src/main/resources/db/migration/dump-kamco_cds-202512161836.tar b/src/main/resources/db/migration/dump-kamco_cds-202512171620.tar similarity index 97% rename from src/main/resources/db/migration/dump-kamco_cds-202512161836.tar rename to src/main/resources/db/migration/dump-kamco_cds-202512171620.tar index a6ac6730..8fc3e280 100644 Binary files a/src/main/resources/db/migration/dump-kamco_cds-202512161836.tar and b/src/main/resources/db/migration/dump-kamco_cds-202512171620.tar differ