From c363bf6cfce50283b6608c8c2ef408395f418f23 Mon Sep 17 00:00:00 2001 From: Moon Date: Thu, 18 Dec 2025 18:44:24 +0900 Subject: [PATCH] =?UTF-8?q?=ED=8F=B4=EB=8D=94,=20=ED=8C=8C=EC=9D=BC?= =?UTF-8?q?=EC=B0=BE=EA=B8=B0=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kamcoback/common/utils/FIleChecker.java | 18 +++++----- .../kamco/cd/kamcoback/config/FileConfig.java | 6 ++-- .../cd/kamcoback/mapsheet/dto/FileDto.java | 3 +- .../MapSheetMngFileCheckerService.java | 36 +++++++++---------- .../mapsheet/service/MapSheetMngService.java | 17 --------- 5 files changed, 33 insertions(+), 47 deletions(-) diff --git a/src/main/java/com/kamco/cd/kamcoback/common/utils/FIleChecker.java b/src/main/java/com/kamco/cd/kamcoback/common/utils/FIleChecker.java index 8ffe9d1e..07e396ce 100644 --- a/src/main/java/com/kamco/cd/kamcoback/common/utils/FIleChecker.java +++ b/src/main/java/com/kamco/cd/kamcoback/common/utils/FIleChecker.java @@ -306,13 +306,15 @@ public class FIleChecker { // int fileTotCnt = 0; // long fileTotSize = 0; - Predicate isTarget = p -> { - if (targetFileNm == null || targetFileNm.trim().isEmpty() || targetFileNm.trim().equals("*") ) { - return true; // 전체 파일 허용 - } - return p.getFileName().toString().contains(targetFileNm); - }; - + Predicate isTarget = + p -> { + if (targetFileNm == null + || targetFileNm.trim().isEmpty() + || targetFileNm.trim().equals("*")) { + return true; // 전체 파일 허용 + } + return p.getFileName().toString().contains(targetFileNm); + }; try (Stream stream = Files.walk(startPath, maxDepth)) { @@ -358,7 +360,7 @@ public class FIleChecker { public static Long getFileTotSize(List files) { Long fileTotSize = 0L; - if( files != null || files.size() > 0 ) { + if (files != null || files.size() > 0) { fileTotSize = files.stream().mapToLong(FIleChecker.Basic::getFileSize).sum(); } 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 9d63c309..1458d005 100644 --- a/src/main/java/com/kamco/cd/kamcoback/config/FileConfig.java +++ b/src/main/java/com/kamco/cd/kamcoback/config/FileConfig.java @@ -12,11 +12,11 @@ import org.springframework.stereotype.Component; @Setter public class FileConfig { - //private String rootSyncDir = "D:\\app\\original-images\\"; - //private String tmpSyncDir = rootSyncDir+"tmp\\"; + // private String rootSyncDir = "D:\\app\\original-images\\"; + // private String tmpSyncDir = rootSyncDir+"tmp\\"; private String rootSyncDir = "/app/original-images/"; - private String tmpSyncDir = rootSyncDir+"tmp/"; + private String tmpSyncDir = rootSyncDir + "tmp/"; private String syncFileExt = "tfw,tif"; } diff --git a/src/main/java/com/kamco/cd/kamcoback/mapsheet/dto/FileDto.java b/src/main/java/com/kamco/cd/kamcoback/mapsheet/dto/FileDto.java index 4b43e708..7e4aa544 100644 --- a/src/main/java/com/kamco/cd/kamcoback/mapsheet/dto/FileDto.java +++ b/src/main/java/com/kamco/cd/kamcoback/mapsheet/dto/FileDto.java @@ -145,7 +145,8 @@ public class FileDto { private final long fileTotSize; private final List files; - public FilesDto(String dirPath, int fileTotCnt, long fileTotSize, List files) { + public FilesDto( + String dirPath, int fileTotCnt, long fileTotSize, List files) { this.dirPath = dirPath; this.fileTotCnt = fileTotCnt; diff --git a/src/main/java/com/kamco/cd/kamcoback/mapsheet/service/MapSheetMngFileCheckerService.java b/src/main/java/com/kamco/cd/kamcoback/mapsheet/service/MapSheetMngFileCheckerService.java index 37f32be8..b1f28a60 100644 --- a/src/main/java/com/kamco/cd/kamcoback/mapsheet/service/MapSheetMngFileCheckerService.java +++ b/src/main/java/com/kamco/cd/kamcoback/mapsheet/service/MapSheetMngFileCheckerService.java @@ -7,7 +7,6 @@ import com.kamco.cd.kamcoback.common.exception.ValidationException; import com.kamco.cd.kamcoback.common.utils.FIleChecker; 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; import com.kamco.cd.kamcoback.mapsheet.dto.FileDto.FoldersDto; @@ -144,14 +143,15 @@ public class MapSheetMngFileCheckerService { int startPos = srchDto.getStartPos(); int endPos = srchDto.getEndPos(); - List files = FIleChecker.getFilesFromAllDepth( - srchDto.getDirPath(), - "*", - srchDto.getExtension(), - 1, - srchDto.getSortType(), - startPos, - endPos); + List files = + FIleChecker.getFilesFromAllDepth( + srchDto.getDirPath(), + "*", + srchDto.getExtension(), + 1, + srchDto.getSortType(), + startPos, + endPos); int fileListPos = 0; int fileTotCnt = files.size(); @@ -166,20 +166,20 @@ public class MapSheetMngFileCheckerService { int startPos = srchDto.getStartPos(); int endPos = srchDto.getEndPos(); - List files = FIleChecker.getFilesFromAllDepth( - srchDto.getDirPath(), - "*", - srchDto.getExtension(), - srchDto.getMaxDepth(), - srchDto.getSortType(), - startPos, - endPos); + List files = + FIleChecker.getFilesFromAllDepth( + srchDto.getDirPath(), + "*", + srchDto.getExtension(), + srchDto.getMaxDepth(), + srchDto.getSortType(), + startPos, + endPos); int fileListPos = 0; int fileTotCnt = files.size(); long fileTotSize = FIleChecker.getFileTotSize(files); - return new FilesDto(dirPath, fileTotCnt, fileTotSize, files); } 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 66ae260f..c42ed151 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 @@ -1,13 +1,7 @@ package com.kamco.cd.kamcoback.mapsheet.service; -import static java.lang.String.CASE_INSENSITIVE_ORDER; - import com.kamco.cd.kamcoback.common.utils.FIleChecker; import com.kamco.cd.kamcoback.config.FileConfig; -import com.kamco.cd.kamcoback.mapsheet.dto.FileDto.Basic; -import com.kamco.cd.kamcoback.mapsheet.dto.FileDto.FilesDto; -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.MapSheetMngDto; import com.kamco.cd.kamcoback.mapsheet.dto.MapSheetMngDto.AddReq; import com.kamco.cd.kamcoback.mapsheet.dto.MapSheetMngDto.DmlReturn; @@ -23,18 +17,8 @@ import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.nio.file.StandardCopyOption; -import java.nio.file.attribute.FileTime; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Comparator; -import java.util.Date; import java.util.List; -import java.util.Set; -import java.util.stream.Collectors; -import java.util.stream.Stream; import lombok.RequiredArgsConstructor; -import org.apache.commons.io.FilenameUtils; import org.springframework.data.domain.Page; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -48,7 +32,6 @@ public class MapSheetMngService { private final MapSheetMngCoreService mapSheetMngCoreService; private final FileConfig fileConfig; - public List findMapSheetMngList() { return mapSheetMngCoreService.findMapSheetMngList(); }