From 3213b1e9a7685c796601638c415e7f8705d77596 Mon Sep 17 00:00:00 2001 From: teddy Date: Wed, 17 Dec 2025 15:35:14 +0900 Subject: [PATCH] spotlessApply --- .../kamcoback/common/enums/MngStateType.java | 3 +- .../kamcoback/common/enums/SyncStateType.java | 3 - .../kamco/cd/kamcoback/config/FileConfig.java | 3 +- .../mapsheet/MapSheetMngApiController.java | 40 +++++----- .../MapSheetMngFileCheckerApiController.java | 2 - .../mapsheet/dto/MapSheetMngDto.java | 10 +-- .../mapsheet/service/MapSheetMngService.java | 50 ++++++------- .../postgres/core/MapSheetMngCoreService.java | 5 +- .../postgres/entity/ErrorLogEntity.java | 3 +- .../mapsheet/MapSheetMngRepositoryImpl.java | 74 +++++++++---------- 10 files changed, 82 insertions(+), 111 deletions(-) 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 a0ff578a..1bedf2fc 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 = { @@ -150,16 +148,12 @@ 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/mapsheet/dto/MapSheetMngDto.java b/src/main/java/com/kamco/cd/kamcoback/mapsheet/dto/MapSheetMngDto.java index 079ae777..6b80ba50 100644 --- a/src/main/java/com/kamco/cd/kamcoback/mapsheet/dto/MapSheetMngDto.java +++ b/src/main/java/com/kamco/cd/kamcoback/mapsheet/dto/MapSheetMngDto.java @@ -107,10 +107,9 @@ public class MapSheetMngDto { return this.syncNotPaireExecCnt + this.syncDuplicateExecCnt + this.syncFaultExecCnt; } - public String getMngStateName() { String enumId = this.mngState; - if( enumId == null || enumId.isEmpty())enumId = "NOTYET"; + if (enumId == null || enumId.isEmpty()) enumId = "NOTYET"; MngStateType type = Enums.fromId(MngStateType.class, enumId); return type.getText(); @@ -180,8 +179,7 @@ public class MapSheetMngDto { private String errorCheckTfwFileName; private String errorCheckTifFileName; - //private List fileArray; - + // private List fileArray; public ErrorDataDto( Long hstUid, @@ -213,7 +211,7 @@ public class MapSheetMngDto { } private String getSyncStateName(String enumId) { - if( enumId == null || enumId.isEmpty())enumId = "NOTYET"; + if (enumId == null || enumId.isEmpty()) enumId = "NOTYET"; SyncStateType type = Enums.fromId(SyncStateType.class, enumId); return type.getText(); @@ -242,8 +240,6 @@ public class MapSheetMngDto { private String message; } - - @Getter @AllArgsConstructor public enum DataState implements EnumType { diff --git a/src/main/java/com/kamco/cd/kamcoback/mapsheet/service/MapSheetMngService.java b/src/main/java/com/kamco/cd/kamcoback/mapsheet/service/MapSheetMngService.java index b75b572a..f9bf629d 100644 --- a/src/main/java/com/kamco/cd/kamcoback/mapsheet/service/MapSheetMngService.java +++ b/src/main/java/com/kamco/cd/kamcoback/mapsheet/service/MapSheetMngService.java @@ -2,9 +2,6 @@ package com.kamco.cd.kamcoback.mapsheet.service; import static java.lang.String.CASE_INSENSITIVE_ORDER; -import com.kamco.cd.kamcoback.common.exception.DuplicateFileException; -import com.kamco.cd.kamcoback.common.exception.ValidationException; -import com.kamco.cd.kamcoback.common.utils.FIleChecker; 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.SrchFilesDepthDto; @@ -224,7 +221,6 @@ public class MapSheetMngService { return mapSheetMngCoreService.findMapSheetMng(mngYyyy); } - @Transactional public MapSheetMngDto.DmlReturn mngComplete(int mngYyyy) { @@ -268,36 +264,32 @@ public class MapSheetMngService { @Transactional public MapSheetMngDto.DmlReturn uploadPair( - MultipartFile tfwFile, - MultipartFile tifFile, - //String targetPath, - Long hstUid) { + MultipartFile tfwFile, + MultipartFile tifFile, + // String targetPath, + Long hstUid) { - // 파일 유효성 검증 - if (tfwFile == null || tfwFile.isEmpty() || tfwFile.getSize() == 0) { - return new MapSheetMngDto.DmlReturn("fail", "TFW 파일이(0Byte) 비어있습니다."); - }else if (tifFile == null || tifFile.isEmpty() || tifFile.getSize() == 0) { - return new MapSheetMngDto.DmlReturn("fail", "TIF 파일이(0Byte) 비어있습니다."); - } + // 파일 유효성 검증 + if (tfwFile == null || tfwFile.isEmpty() || tfwFile.getSize() == 0) { + return new MapSheetMngDto.DmlReturn("fail", "TFW 파일이(0Byte) 비어있습니다."); + } else if (tifFile == null || tifFile.isEmpty() || tifFile.getSize() == 0) { + return new MapSheetMngDto.DmlReturn("fail", "TIF 파일이(0Byte) 비어있습니다."); + } - if( ! tfwFile.getOriginalFilename() - .substring(tfwFile.getOriginalFilename().lastIndexOf('.') + 1) - .toLowerCase() - .equals("tfw") ) - { - return new MapSheetMngDto.DmlReturn("fail", "파일명이 TFW형식이 아닙니다."); - }else if( ! tifFile.getOriginalFilename() + if (!tfwFile + .getOriginalFilename() + .substring(tfwFile.getOriginalFilename().lastIndexOf('.') + 1) + .toLowerCase() + .equals("tfw")) { + return new MapSheetMngDto.DmlReturn("fail", "파일명이 TFW형식이 아닙니다."); + } else if (!tifFile + .getOriginalFilename() .substring(tifFile.getOriginalFilename().lastIndexOf('.') + 1) .toLowerCase() - .equals("tif") ) - { - return new MapSheetMngDto.DmlReturn("fail", "파일명이 TIF형식이 아닙니다."); - } - + .equals("tif")) { + return new MapSheetMngDto.DmlReturn("fail", "파일명이 TIF형식이 아닙니다."); + } return new MapSheetMngDto.DmlReturn("success", "파일 업로드 완료되었습니다."); - } - - } diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/core/MapSheetMngCoreService.java b/src/main/java/com/kamco/cd/kamcoback/postgres/core/MapSheetMngCoreService.java index 74bfd2b3..cf91ae0e 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/core/MapSheetMngCoreService.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/core/MapSheetMngCoreService.java @@ -44,18 +44,15 @@ public class MapSheetMngCoreService { mapSheetMngRepository.MapSheetMngComplete(mngYyyy); } - public Page findMapSheetErrorList( MapSheetMngDto.@Valid ErrorSearchReq searchReq) { return mapSheetMngRepository.findMapSheetErrorList(searchReq); } - public MapSheetMngDto.ErrorDataDto findMapSheetError(Long hstUid){ + public MapSheetMngDto.ErrorDataDto findMapSheetError(Long hstUid) { return mapSheetMngRepository.findMapSheetError(hstUid); } - - public MapSheetMngDto.DmlReturn uploadProcess(@Valid List hstUidList) { int count = 0; if (!Objects.isNull(hstUidList) && !hstUidList.isEmpty()) { 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/java/com/kamco/cd/kamcoback/postgres/repository/mapsheet/MapSheetMngRepositoryImpl.java b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/mapsheet/MapSheetMngRepositoryImpl.java index 8edc9eb9..a94f8612 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/mapsheet/MapSheetMngRepositoryImpl.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/mapsheet/MapSheetMngRepositoryImpl.java @@ -367,54 +367,54 @@ public class MapSheetMngRepositoryImpl extends QuerydslRepositorySupport return new PageImpl<>(foundContent, pageable, countQuery); } - @Override - public MapSheetMngDto.ErrorDataDto findMapSheetError(Long hstUid){ + public MapSheetMngDto.ErrorDataDto findMapSheetError(Long hstUid) { BooleanBuilder whereBuilder = new BooleanBuilder(); - whereBuilder.and( mapSheetMngHstEntity.hstUid.eq(hstUid)); + whereBuilder.and(mapSheetMngHstEntity.hstUid.eq(hstUid)); MapSheetMngDto.ErrorDataDto foundContent = - queryFactory - .select( - Projections.constructor( - MapSheetMngDto.ErrorDataDto.class, - mapSheetMngHstEntity.hstUid, - Expressions.stringTemplate( - "concat({0},substring({1}, 0, 6))", - mapInkx5kEntity.mapidNm, mapSheetMngHstEntity.mapSheetNum).as("map50kName"), - Expressions.stringTemplate( - "concat({0},substring({1}, 6, 8))", - mapInkx5kEntity.mapidNm, mapSheetMngHstEntity.mapSheetNum).as("map5kName"), - Expressions.stringTemplate( - "concat({0},substring({1}, 6, 8))", - mapInkx5kEntity.mapidNm, mapSheetMngHstEntity.mapSheetNum).as("mapSrcName"), - mapInkx5kEntity.fid, - mapSheetMngHstEntity.createdDate, - mapSheetMngHstEntity.syncState, - mapSheetMngHstEntity.syncTfwFileName, - mapSheetMngHstEntity.syncTifFileName, - mapSheetMngHstEntity.syncCheckState, - mapSheetMngHstEntity.syncCheckTfwFileName, - mapSheetMngHstEntity.syncCheckTifFileName - ) - ) - .from(mapSheetMngHstEntity) - .innerJoin(mapInkx5kEntity).on(mapSheetMngHstEntity.mapSheetNum.eq(mapInkx5kEntity.mapidcdNo)) - .where(whereBuilder) - .fetchOne(); + queryFactory + .select( + Projections.constructor( + MapSheetMngDto.ErrorDataDto.class, + mapSheetMngHstEntity.hstUid, + Expressions.stringTemplate( + "concat({0},substring({1}, 0, 6))", + mapInkx5kEntity.mapidNm, mapSheetMngHstEntity.mapSheetNum) + .as("map50kName"), + Expressions.stringTemplate( + "concat({0},substring({1}, 6, 8))", + mapInkx5kEntity.mapidNm, mapSheetMngHstEntity.mapSheetNum) + .as("map5kName"), + Expressions.stringTemplate( + "concat({0},substring({1}, 6, 8))", + mapInkx5kEntity.mapidNm, mapSheetMngHstEntity.mapSheetNum) + .as("mapSrcName"), + mapInkx5kEntity.fid, + mapSheetMngHstEntity.createdDate, + mapSheetMngHstEntity.syncState, + mapSheetMngHstEntity.syncTfwFileName, + mapSheetMngHstEntity.syncTifFileName, + mapSheetMngHstEntity.syncCheckState, + mapSheetMngHstEntity.syncCheckTfwFileName, + mapSheetMngHstEntity.syncCheckTifFileName)) + .from(mapSheetMngHstEntity) + .innerJoin(mapInkx5kEntity) + .on(mapSheetMngHstEntity.mapSheetNum.eq(mapInkx5kEntity.mapidcdNo)) + .where(whereBuilder) + .fetchOne(); return foundContent; } - public void MapSheetMngComplete(int mngYyyy) { long execCount = - queryFactory - .update(mapSheetMngEntity) - .set(mapSheetMngEntity.mngState, "COMPLETE") - .where(mapSheetMngEntity.mngYyyy.eq(mngYyyy)) - .execute(); + queryFactory + .update(mapSheetMngEntity) + .set(mapSheetMngEntity.mngState, "COMPLETE") + .where(mapSheetMngEntity.mngYyyy.eq(mngYyyy)) + .execute(); } @Override