diff --git a/src/main/java/com/kamco/cd/kamcoback/code/dto/CommonCodeDto.java b/src/main/java/com/kamco/cd/kamcoback/code/dto/CommonCodeDto.java index 46c35eb5..2b9c7e5a 100644 --- a/src/main/java/com/kamco/cd/kamcoback/code/dto/CommonCodeDto.java +++ b/src/main/java/com/kamco/cd/kamcoback/code/dto/CommonCodeDto.java @@ -103,8 +103,7 @@ public class CommonCodeDto { ZonedDateTime updatedDttm, String props1, String props2, - String props3 - ) { + String props3) { this.id = id; this.code = code; this.description = description; diff --git a/src/main/java/com/kamco/cd/kamcoback/config/GlobalExceptionHandler.java b/src/main/java/com/kamco/cd/kamcoback/config/GlobalExceptionHandler.java index 9d42bb7c..cb75db03 100644 --- a/src/main/java/com/kamco/cd/kamcoback/config/GlobalExceptionHandler.java +++ b/src/main/java/com/kamco/cd/kamcoback/config/GlobalExceptionHandler.java @@ -291,7 +291,7 @@ public class GlobalExceptionHandler { @ResponseStatus(HttpStatus.CONFLICT) @ExceptionHandler(DuplicateKeyException.class) public ApiResponseDto handlerDuplicateKeyException( - DuplicateKeyException e, HttpServletRequest request) { + DuplicateKeyException e, HttpServletRequest request) { log.warn("[DuplicateKeyException] resource :{} ", e.getMessage()); String codeName = "DUPLICATE_DATA"; diff --git a/src/main/java/com/kamco/cd/kamcoback/config/SecurityConfig.java b/src/main/java/com/kamco/cd/kamcoback/config/SecurityConfig.java index 3bb3f240..85b160fe 100644 --- a/src/main/java/com/kamco/cd/kamcoback/config/SecurityConfig.java +++ b/src/main/java/com/kamco/cd/kamcoback/config/SecurityConfig.java @@ -11,7 +11,6 @@ import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.config.http.SessionCreationPolicy; import org.springframework.security.web.SecurityFilterChain; -import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; @Configuration @EnableWebSecurity @@ -23,24 +22,30 @@ public class SecurityConfig { @Bean public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception { - http.csrf(csrf -> csrf.disable()) - .sessionManagement(sm -> sm.sessionCreationPolicy(SessionCreationPolicy.STATELESS)) - .formLogin(form -> form.disable()) - .httpBasic(basic -> basic.disable()) - .logout(logout -> logout.disable()) - // ๐Ÿ”ฅ ์—ฌ๊ธฐ์„œ ์šฐ๋ฆฌ๊ฐ€ ๋งŒ๋“  CustomAuthenticationProvider ํ•˜๋‚˜๋งŒ ๋“ฑ๋ก - .authenticationProvider(customAuthenticationProvider) - .authorizeHttpRequests( - auth -> - auth.requestMatchers( - "/api/auth/signin", - "/api/auth/refresh", - "/swagger-ui/**", - "/v3/api-docs/**") - .permitAll() - .anyRequest() - .authenticated()) - .addFilterBefore(jwtAuthenticationFilter, UsernamePasswordAuthenticationFilter.class); + http.csrf(csrf -> csrf.disable()) // CSRF ๋ณด์•ˆ ๊ธฐ๋Šฅ ๋น„ํ™œ์„ฑํ™” + .sessionManagement( + sm -> + sm.sessionCreationPolicy( + SessionCreationPolicy.STATELESS)) // ์„œ๋ฒ„ ์„ธ์…˜ ๋งŒ๋“ค์ง€ ์•Š์Œ ์š”์ฒญ์€ JWT ์ธ์ฆ + .formLogin(form -> form.disable()) // react์—์„œ ๋กœ๊ทธ์ธ ์š”์ฒญ ๊ด€๋ฆฌ + .httpBasic(basic -> basic.disable()) // ๊ธฐ๋ณธ basic ์ธ์ฆ ๋น„ํ™œ์„ฑํ™” JWT ์ธ์ฆ์‚ฌ์šฉ + .logout(logout -> logout.disable()) // ๊ธฐ๋ณธ ๋กœ๊ทธ์•„์›ƒ ๋น„ํ™œ์„ฑํ™” JWT๋Š” ์„œ๋ฒ„ ์ƒํƒœ๊ฐ€ ์—†์œผ๋ฏ€๋กœ ๋กœ๊ทธ์•„์›ƒ ์ฒ˜๋ฆฌ ํ•„์š” ์—†์Œ + .authenticationProvider( + customAuthenticationProvider) // ๋กœ๊ทธ์ธ ํŒจ์Šค์›Œ๋“œ ๋น„๊ต๋ฐฉ์‹ ์Šคํ”„๋ง ๊ธฐ๋ณธ Provider ์‚ฌ์šฉ์•ˆํ•จ ์ปค์Šคํ…€ ์‚ฌ์šฉ + .authorizeHttpRequests(auth -> auth.anyRequest().permitAll()); + // auth.requestMatchers( + // "/api/auth/signin", + // "/api/auth/refresh", + // "/swagger-ui/**", + // "/v3/api-docs/**") // ๋กœ๊ทธ์ธ ์—†์ด ์ ‘๊ทผ๊ฐ€๋Šฅ url + // .permitAll() + // .anyRequest() + // .authenticated()) + // .addFilterBefore( + // jwtAuthenticationFilter, + // UsernamePasswordAuthenticationFilter + // .class) // ์š”์ฒญ ๋“ค์–ด์˜ค๋ฉด ๋จผ์ € JWT ํ† ํฐ ๊ฒ€์‚ฌ ํ›„ security context ์— ์‚ฌ์šฉ์ž ์ •๋ณด ์ €์žฅ. + ; return http.build(); } diff --git a/src/main/java/com/kamco/cd/kamcoback/geojson/service/GeoJsonDataService.java b/src/main/java/com/kamco/cd/kamcoback/geojson/service/GeoJsonDataService.java index 273db83c..a32094c7 100644 --- a/src/main/java/com/kamco/cd/kamcoback/geojson/service/GeoJsonDataService.java +++ b/src/main/java/com/kamco/cd/kamcoback/geojson/service/GeoJsonDataService.java @@ -28,7 +28,7 @@ public class GeoJsonDataService { /** GeoJSON ํŒŒ์ผ๋“ค์„ ๋ฐ์ดํ„ฐ๋ฒ ์ด์Šค์— ์ €์žฅ */ public List processGeoJsonFiles( - Map geoJsonContents, String archiveFileName) { + Map geoJsonContents, String archiveFileName) { List savedIds = new ArrayList<>(); log.info("GeoJSON ํŒŒ์ผ ์ฒ˜๋ฆฌ ์‹œ์ž‘: {} ({}๊ฐœ ํŒŒ์ผ)", archiveFileName, geoJsonContents.size()); @@ -54,10 +54,10 @@ public class GeoJsonDataService { } log.info( - "GeoJSON ํŒŒ์ผ ์ฒ˜๋ฆฌ ์™„๋ฃŒ: {} (์„ฑ๊ณต: {}๊ฐœ, ์ „์ฒด: {}๊ฐœ)", - archiveFileName, - savedIds.size(), - geoJsonContents.size()); + "GeoJSON ํŒŒ์ผ ์ฒ˜๋ฆฌ ์™„๋ฃŒ: {} (์„ฑ๊ณต: {}๊ฐœ, ์ „์ฒด: {}๊ฐœ)", + archiveFileName, + savedIds.size(), + geoJsonContents.size()); return savedIds; } @@ -65,7 +65,7 @@ public class GeoJsonDataService { /** ๊ฐœ๋ณ„ ํŒŒ์ผ์„ ๋ณ„๋„ ํŠธ๋žœ์žญ์…˜์œผ๋กœ ์ฒ˜๋ฆฌ */ @Transactional public Long processGeoJsonFileWithTransaction( - String fileName, String geoJsonContent, String archiveFileName) { + String fileName, String geoJsonContent, String archiveFileName) { try { Long savedId = processGeoJsonFile(fileName, geoJsonContent, archiveFileName); if (savedId != null && isLearningModelResult(fileName, geoJsonContent)) { @@ -88,7 +88,7 @@ public class GeoJsonDataService { // ํŒŒ์ผ์ด ์ด๋ฏธ ์ฒ˜๋ฆฌ๋˜์—ˆ๋Š”์ง€ ํ™•์ธ String dataPath = generateDataPath(archiveFileName, fileName); Optional existingData = - mapSheetLearnDataRepository.findByDataPath(dataPath); + mapSheetLearnDataRepository.findByDataPath(dataPath); if (existingData.isPresent()) { log.warn("์ด๋ฏธ ์ฒ˜๋ฆฌ๋œ ํŒŒ์ผ์ž…๋‹ˆ๋‹ค: {}", dataPath); @@ -97,7 +97,7 @@ public class GeoJsonDataService { // ์ƒˆ ์—”ํ‹ฐํ‹ฐ ์ƒ์„ฑ ๋ฐ ์ €์žฅ MapSheetLearnDataEntity entity = - createMapSheetLearnDataEntity(fileName, geoJsonContent, archiveFileName, geoJsonNode); + createMapSheetLearnDataEntity(fileName, geoJsonContent, archiveFileName, geoJsonNode); MapSheetLearnDataEntity savedEntity = mapSheetLearnDataRepository.save(entity); return savedEntity.getId(); @@ -122,7 +122,7 @@ public class GeoJsonDataService { /** MapSheetLearnDataEntity ์ƒ์„ฑ */ private MapSheetLearnDataEntity createMapSheetLearnDataEntity( - String fileName, String geoJsonContent, String archiveFileName, JsonNode geoJsonNode) { + String fileName, String geoJsonContent, String archiveFileName, JsonNode geoJsonNode) { MapSheetLearnDataEntity entity = new MapSheetLearnDataEntity(); @@ -287,8 +287,8 @@ public class GeoJsonDataService { JsonNode properties = firstFeature.get("properties"); // ํ•™์Šต ๋ชจ๋ธ ํŠนํ™” ํ•„๋“œ ํ™•์ธ return properties.has("cd_prob") - || properties.has("class") - || (properties.has("before") && properties.has("after")); + || properties.has("class") + || (properties.has("before") && properties.has("after")); } } } @@ -301,7 +301,7 @@ public class GeoJsonDataService { /** ํ•™์Šต ๋ชจ๋ธ ๊ฒฐ๊ณผ์˜ geometry ๋ฐ์ดํ„ฐ ์ฒ˜๋ฆฌ - ์ตœ์ ํ™”๋œ ๋ฐฐ์น˜ ์ฒ˜๋ฆฌ */ public void processLearningModelGeometryOptimized( - Long dataUid, String geoJsonContent, String fileName) { + Long dataUid, String geoJsonContent, String fileName) { try { log.info("ํ•™์Šต ๋ชจ๋ธ geometry ๋ฐ์ดํ„ฐ ์ฒ˜๋ฆฌ ์‹œ์ž‘: {} (dataUid: {})", fileName, dataUid); @@ -309,7 +309,7 @@ public class GeoJsonDataService { // ๋ฉ”ํƒ€๋ฐ์ดํ„ฐ ์ถ”์ถœ String mapSheetName = - rootNode.has("name") ? rootNode.get("name").asText() : fileName.replace(".geojson", ""); + rootNode.has("name") ? rootNode.get("name").asText() : fileName.replace(".geojson", ""); // ํŒŒ์ผ๋ช…์—์„œ ์—ฐ๋„ ๋ฐ ์ง€๋„๋ฒˆํ˜ธ ์ถ”์ถœ (์บ ์ฝ”_2021_2022_35813023) String[] parts = mapSheetName.split("_"); @@ -347,7 +347,7 @@ public class GeoJsonDataService { try { JsonNode feature = features.get(j); MapSheetLearnDataGeomEntity geomEntity = - createGeometryEntity(feature, dataUid, beforeYear, afterYear, mapSheetNum); + createGeometryEntity(feature, dataUid, beforeYear, afterYear, mapSheetNum); if (geomEntity != null) { batch.add(geomEntity); } @@ -400,7 +400,7 @@ public class GeoJsonDataService { /** ๊ฐœ๋ณ„ feature์—์„œ geometry entity ์ƒ์„ฑ */ private MapSheetLearnDataGeomEntity createGeometryEntity( - JsonNode feature, Long dataUid, String beforeYear, String afterYear, String mapSheetNum) { + JsonNode feature, Long dataUid, String beforeYear, String afterYear, String mapSheetNum) { JsonNode properties = feature.get("properties"); JsonNode geometry = feature.get("geometry"); 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 7697b1c6..aa56b911 100644 --- a/src/main/java/com/kamco/cd/kamcoback/mapsheet/MapSheetMngApiController.java +++ b/src/main/java/com/kamco/cd/kamcoback/mapsheet/MapSheetMngApiController.java @@ -69,25 +69,23 @@ public class MapSheetMngApiController { @Operation(summary = "ํŒŒ์ผ๋ชฉ๋ก ์กฐํšŒ", description = "ํŒŒ์ผ๋ชฉ๋ก ์กฐํšŒ") @ApiResponses( - value = { - @ApiResponse( - responseCode = "200", - description = "์กฐํšŒ ์„ฑ๊ณต", - content = - @Content( - mediaType = "application/json", - schema = @Schema(implementation = CommonCodeDto.Basic.class))), - @ApiResponse(responseCode = "404", description = "์ฝ”๋“œ๋ฅผ ์ฐพ์„ ์ˆ˜ ์—†์Œ", content = @Content), - @ApiResponse(responseCode = "500", description = "์„œ๋ฒ„ ์˜ค๋ฅ˜", content = @Content) - }) + value = { + @ApiResponse( + responseCode = "200", + description = "์กฐํšŒ ์„ฑ๊ณต", + content = + @Content( + mediaType = "application/json", + schema = @Schema(implementation = CommonCodeDto.Basic.class))), + @ApiResponse(responseCode = "404", description = "์ฝ”๋“œ๋ฅผ ์ฐพ์„ ์ˆ˜ ์—†์Œ", content = @Content), + @ApiResponse(responseCode = "500", description = "์„œ๋ฒ„ ์˜ค๋ฅ˜", content = @Content) + }) @PostMapping("/file-all-list") public ApiResponseDto getAllFiles(@RequestBody SrchFilesDto srchDto) { return ApiResponseDto.createOK(mapSheetMngService.getFilesDepthAll(srchDto)); } - - /** * ์˜ค๋ฅ˜๋ฐ์ดํ„ฐ ๋ชฉ๋ก ์กฐํšŒ * 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 6ba902f3..90a3eced 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 @@ -24,15 +24,24 @@ public class FileDto { @AllArgsConstructor public static class SrchFilesDto { @Schema(description = "๋””๋ ‰ํ† ๋ฆฌ๊ฒฝ๋กœ", example = "/data") - @NotNull private String dirPath; + @NotNull + private String dirPath; + @Schema(description = "์ „์ฒด(*), cpg,dbf,geojson๋“ฑ", example = "*") - @NotNull private String extension; + @NotNull + private String extension; + @Schema(description = "ํŒŒ์ผ๋ช…(name), ์ตœ์ข…์ˆ˜์ •์ผ(date)", example = "name") - @NotNull private String sortType; + @NotNull + private String sortType; + @Schema(description = "ํŒŒ์ผ์‹œ์ž‘์œ„์น˜", example = "1") - @NotNull private Integer startPos; + @NotNull + private Integer startPos; + @Schema(description = "ํŒŒ์ผ์ข…๋ฃŒ์œ„์น˜", example = "100") - @NotNull private Integer endPos; + @NotNull + private Integer endPos; } @Schema(name = "FolderDto", description = "ํด๋” ์ •๋ณด") @@ -48,14 +57,14 @@ public class FileDto { private final Boolean isValid; public FolderDto( - String folderNm, - String parentFolderNm, - String parentPath, - String fullPath, - int depth, - long childCnt, - String lastModified, - Boolean isValid) { + String folderNm, + String parentFolderNm, + String parentPath, + String fullPath, + int depth, + long childCnt, + String lastModified, + Boolean isValid) { this.folderNm = folderNm; this.parentFolderNm = parentFolderNm; this.parentPath = parentPath; @@ -75,7 +84,8 @@ public class FileDto { private final int folderErrTotCnt; private final List folders; - public FoldersDto(String dirPath, int folderTotCnt, int folderErrTotCnt, List folders) { + public FoldersDto( + String dirPath, int folderTotCnt, int folderErrTotCnt, List folders) { this.dirPath = dirPath; this.folderTotCnt = folderTotCnt; @@ -84,8 +94,6 @@ public class FileDto { } } - - @Schema(name = "File Basic", description = "ํŒŒ์ผ ๊ธฐ๋ณธ ์ •๋ณด") @Getter public static class Basic { @@ -99,7 +107,13 @@ public class FileDto { private final String lastModified; public Basic( - String fileNm, String parentFolderNm, String parentPath, String fullPath, String extension, long fileSize, String lastModified) { + String fileNm, + String parentFolderNm, + String parentPath, + String fullPath, + String extension, + long fileSize, + String lastModified) { this.fileNm = fileNm; this.parentFolderNm = parentFolderNm; this.parentPath = parentPath; 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 1f29a5be..6dbf5cc8 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 @@ -40,7 +40,6 @@ public class MapSheetMngService { private final MapSheetMngCoreService mapSheetMngCoreService; - public FoldersDto getFolderAll(SrchFoldersDto srchDto) { Path startPath = Paths.get(srchDto.getDirPath()); @@ -70,8 +69,9 @@ public class MapSheetMngService { String parentPath = path.getParent().toString(); String fullPath = path.toAbsolutePath().toString(); - boolean isValid = !NameValidator.containsKorean(folderNm) && - !NameValidator.containsWhitespaceRegex(folderNm); + boolean isValid = + !NameValidator.containsKorean(folderNm) + && !NameValidator.containsWhitespaceRegex(folderNm); File directory = new File(fullPath); File[] childFolders = directory.listFiles(File::isDirectory); @@ -91,15 +91,14 @@ public class MapSheetMngService { } return new FolderDto( - folderNm, - parentFolderNm, - parentPath, - fullPath, - depth, - childCnt, - lastModified, - isValid - ); + folderNm, + parentFolderNm, + parentPath, + fullPath, + depth, + childCnt, + lastModified, + isValid); }) .collect(Collectors.toList()); @@ -110,15 +109,18 @@ public class MapSheetMngService { .reversed()); folderTotCnt = folderDtoList.size(); - folderErrTotCnt = (int)folderDtoList.stream() - .filter(dto -> dto.getIsValid().toString().equals("false") ) - .count(); + folderErrTotCnt = + (int) + folderDtoList.stream() + .filter(dto -> dto.getIsValid().toString().equals("false")) + .count(); } catch (IOException e) { throw new RuntimeException(e); } - // FoldersDto foldersDto = new FoldersDto(dirPath, folderTotCnt, folderErrTotCnt, folderDtoList); + // FoldersDto foldersDto = new FoldersDto(dirPath, folderTotCnt, folderErrTotCnt, + // folderDtoList); return new FoldersDto(dirPath, folderTotCnt, folderErrTotCnt, folderDtoList); } @@ -167,7 +169,9 @@ public class MapSheetMngService { long fileSize = file.length(); String lastModified = dttmFormat.format(new Date(file.lastModified())); - files.add(new FileDto.Basic(fileName, parentFolderNm, parentPath, fullPath, ext, fileSize, lastModified)); + files.add( + new FileDto.Basic( + fileName, parentFolderNm, parentPath, fullPath, ext, fileSize, lastModified)); fileTotCnt = fileTotCnt + 1; fileTotSize = fileTotSize + fileSize; @@ -182,15 +186,13 @@ public class MapSheetMngService { return filesDto; } - - public FilesDto getFilesDepthAll(SrchFilesDto srchDto) { int maxDepth = 20; Path startPath = Paths.get(srchDto.getDirPath()); String dirPath = srchDto.getDirPath(); String extension = srchDto.getExtension(); - String sortType = srchDto.getSortType(); + String sortType = srchDto.getSortType(); Set targetExtensions = createExtensionSet(extension); @@ -203,37 +205,36 @@ public class MapSheetMngService { try (Stream stream = Files.walk(startPath, maxDepth)) { fileDtoList = - stream - .filter(Files::isRegularFile) - .filter(p -> extension == null || - extension.equals("") || - extension.equals("*") || - targetExtensions.contains(extractExtension(p)) - ) - .sorted(getFileComparator(sortType)) - .map( - path -> { + stream + .filter(Files::isRegularFile) + .filter( + p -> + extension == null + || extension.equals("") + || extension.equals("*") + || targetExtensions.contains(extractExtension(p))) + .sorted(getFileComparator(sortType)) + .map( + path -> { + int depth = path.getNameCount(); - int depth = path.getNameCount(); + String fileNm = path.getFileName().toString(); + String ext = FilenameUtils.getExtension(fileNm); + String parentFolderNm = path.getParent().getFileName().toString(); + String parentPath = path.getParent().toString(); + String fullPath = path.toAbsolutePath().toString(); - String fileNm = path.getFileName().toString(); - String ext = FilenameUtils.getExtension(fileNm); - String parentFolderNm = path.getParent().getFileName().toString(); - String parentPath = path.getParent().toString(); - String fullPath = path.toAbsolutePath().toString(); + File file = new File(fullPath); + long fileSize = file.length(); + String lastModified = dttmFormat.format(new Date(file.lastModified())); - File file = new File(fullPath); - long fileSize = file.length(); - String lastModified = dttmFormat.format(new Date(file.lastModified())); - - return new FileDto.Basic(fileNm, parentFolderNm, parentPath, fullPath, ext, fileSize, lastModified); - }) - .collect(Collectors.toList()); + return new FileDto.Basic( + fileNm, parentFolderNm, parentPath, fullPath, ext, fileSize, lastModified); + }) + .collect(Collectors.toList()); fileTotCnt = fileDtoList.size(); - fileTotSize = fileDtoList.stream() - .mapToLong(FileDto.Basic::getFileSize) - .sum(); + fileTotSize = fileDtoList.stream().mapToLong(FileDto.Basic::getFileSize).sum(); /* if( sort.equals("name")) { @@ -267,10 +268,10 @@ public class MapSheetMngService { // "java, class" -> ["java", " class"] -> [".java", ".class"] return Arrays.stream(extensionString.split(",")) - .map(ext -> ext.trim()) - .filter(ext -> !ext.isEmpty()) - .map(ext -> "." + ext.toLowerCase()) - .collect(Collectors.toSet()); + .map(ext -> ext.trim()) + .filter(ext -> !ext.isEmpty()) + .map(ext -> "." + ext.toLowerCase()) + .collect(Collectors.toSet()); } public String extractExtension(Path path) { @@ -278,7 +279,7 @@ public class MapSheetMngService { int lastDotIndex = filename.lastIndexOf('.'); // ํ™•์žฅ์ž๊ฐ€ ์—†๊ฑฐ๋‚˜ ํŒŒ์ผ๋ช…์ด .์œผ๋กœ ๋๋‚˜๋Š” ๊ฒฝ์šฐ - if (lastDotIndex == -1 || lastDotIndex == filename.length() - 1 ) { + if (lastDotIndex == -1 || lastDotIndex == filename.length() - 1) { return ""; // ๋นˆ ๋ฌธ์ž์—ด ๋ฐ˜ํ™˜ } @@ -286,24 +287,21 @@ public class MapSheetMngService { return filename.substring(lastDotIndex).toLowerCase(); } - public Comparator getFileComparator(String sortType) { // ํŒŒ์ผ ์ด๋ฆ„ ๋น„๊ต ๊ธฐ๋ณธ Comparator (๋Œ€์†Œ๋ฌธ์ž ๋ฌด์‹œ) - Comparator nameComparator = Comparator.comparing( - path -> path.getFileName().toString(), - CASE_INSENSITIVE_ORDER - ); + Comparator nameComparator = + Comparator.comparing(path -> path.getFileName().toString(), CASE_INSENSITIVE_ORDER); - Comparator dateComparator = Comparator.comparing( - path -> { - try { - return Files.getLastModifiedTime(path); - } catch (IOException e) { - return FileTime.fromMillis(0); - } - } - ); + Comparator dateComparator = + Comparator.comparing( + path -> { + try { + return Files.getLastModifiedTime(path); + } catch (IOException e) { + return FileTime.fromMillis(0); + } + }); if ("name desc".equalsIgnoreCase(sortType)) { return nameComparator.reversed(); @@ -316,8 +314,6 @@ public class MapSheetMngService { } } - - public Page findMapSheetErrorList( MapSheetMngDto.@Valid searchReq searchReq) { return mapSheetMngCoreService.findMapSheetErrorList(searchReq); diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/core/CommonCodeCoreService.java b/src/main/java/com/kamco/cd/kamcoback/postgres/core/CommonCodeCoreService.java index a2b14051..87d12703 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/core/CommonCodeCoreService.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/core/CommonCodeCoreService.java @@ -35,21 +35,36 @@ public class CommonCodeCoreService new EntityNotFoundException( "parent id ๋ฅผ ์ฐพ์„ ์ˆ˜ ์—†์Šต๋‹ˆ๋‹ค. id : " + req.getParentId())); - Long existsCount = commonCodeRepository.findByParentIdCodeExists(req.getParentId(), req.getCode()); + Long existsCount = + commonCodeRepository.findByParentIdCodeExists(req.getParentId(), req.getCode()); if (existsCount > 0) { throw new DuplicateKeyException("์ด๋ฏธ ๋“ฑ๋ก๋˜์–ด ์žˆ์Šต๋‹ˆ๋‹ค."); } CommonCodeEntity entity = new CommonCodeEntity( - req.getCode(), req.getName(), req.getDescription(), req.getOrder(), req.isUsed(), req.getProps1(), req.getProps2(), req.getProps3()); + req.getCode(), + req.getName(), + req.getDescription(), + req.getOrder(), + req.isUsed(), + req.getProps1(), + req.getProps2(), + req.getProps3()); entity.addParent(parentCommonCodeEntity); return commonCodeRepository.save(entity).toDto(); } CommonCodeEntity entity = new CommonCodeEntity( - req.getCode(), req.getName(), req.getDescription(), req.getOrder(), req.isUsed(), req.getProps1(), req.getProps2(), req.getProps3()); + req.getCode(), + req.getName(), + req.getDescription(), + req.getOrder(), + req.isUsed(), + req.getProps1(), + req.getProps2(), + req.getProps3()); return commonCodeRepository.save(entity).toDto(); } @@ -60,7 +75,8 @@ public class CommonCodeCoreService .orElseThrow(() -> new EntityNotFoundException("common code ๋ฅผ ์ฐพ์„ ์ˆ˜ ์—†์Šต๋‹ˆ๋‹ค. id : " + id)); Long parentId = found.getParent() == null ? null : found.getParent().getId(); - Long existsCount = commonCodeRepository.findByParentIdCodeExiststoUpdate(id, parentId, req.getCode()); + Long existsCount = + commonCodeRepository.findByParentIdCodeExiststoUpdate(id, parentId, req.getCode()); if (existsCount > 0) { throw new DuplicateKeyException("์ด๋ฏธ ๋“ฑ๋ก๋˜์–ด ์žˆ์Šต๋‹ˆ๋‹ค."); } @@ -76,8 +92,7 @@ public class CommonCodeCoreService found.getDeleted(), req.getProps1(), req.getProps2(), - req.getProps3() - ); + req.getProps3()); return commonCodeRepository.save(entity).toDto(); } diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/entity/CommonCodeEntity.java b/src/main/java/com/kamco/cd/kamcoback/postgres/entity/CommonCodeEntity.java index 9344ccbd..e8c3e319 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/entity/CommonCodeEntity.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/entity/CommonCodeEntity.java @@ -74,7 +74,14 @@ public class CommonCodeEntity extends CommonDateEntity { private String props3; public CommonCodeEntity( - String code, String name, String description, Integer order, Boolean used, String props1, String props2, String props3) { + String code, + String name, + String description, + Integer order, + Boolean used, + String props1, + String props2, + String props3) { this.code = code; this.name = name; this.description = description; @@ -86,7 +93,16 @@ public class CommonCodeEntity extends CommonDateEntity { } public CommonCodeEntity( - Long id, String code, String name, String description, Integer order, Boolean used, Boolean deleted, String props1, String props2, String props3) { + Long id, + String code, + String name, + String description, + Integer order, + Boolean used, + Boolean deleted, + String props1, + String props2, + String props3) { this.id = id; this.code = code; this.name = name; @@ -101,20 +117,19 @@ public class CommonCodeEntity extends CommonDateEntity { public CommonCodeDto.Basic toDto() { return new CommonCodeDto.Basic( - this.id, - this.code, - this.description, - this.name, - this.order, - this.used, - this.deleted, - this.children.stream().map(CommonCodeEntity::toDto).toList(), - super.getCreatedDate(), - super.getModifiedDate(), - this.props1, - this.props2, - this.props3 - ); + this.id, + this.code, + this.description, + this.name, + this.order, + this.used, + this.deleted, + this.children.stream().map(CommonCodeEntity::toDto).toList(), + super.getCreatedDate(), + super.getModifiedDate(), + this.props1, + this.props2, + this.props3); } public void addParent(CommonCodeEntity parent) { diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/entity/MapSheetLearnDataEntity.java b/src/main/java/com/kamco/cd/kamcoback/postgres/entity/MapSheetLearnDataEntity.java index 0224dd26..4591050c 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/entity/MapSheetLearnDataEntity.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/entity/MapSheetLearnDataEntity.java @@ -25,9 +25,9 @@ public class MapSheetLearnDataEntity { @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "tb_map_sheet_learn_data_id_gen") @SequenceGenerator( - name = "tb_map_sheet_learn_data_id_gen", - sequenceName = "tb_map_sheet_learn_data_data_uid", - allocationSize = 1) + name = "tb_map_sheet_learn_data_id_gen", + sequenceName = "tb_map_sheet_learn_data_data_uid", + allocationSize = 1) @Column(name = "data_uid", nullable = false) private Long id; diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/entity/MapSheetLearnDataGeomEntity.java b/src/main/java/com/kamco/cd/kamcoback/postgres/entity/MapSheetLearnDataGeomEntity.java index 6d7cebcb..0ad8cc5c 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/entity/MapSheetLearnDataGeomEntity.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/entity/MapSheetLearnDataGeomEntity.java @@ -21,12 +21,12 @@ public class MapSheetLearnDataGeomEntity { @Id @GeneratedValue( - strategy = GenerationType.SEQUENCE, - generator = "tb_map_sheet_learn_data_geom_id_gen") + strategy = GenerationType.SEQUENCE, + generator = "tb_map_sheet_learn_data_geom_id_gen") @SequenceGenerator( - name = "tb_map_sheet_learn_data_geom_id_gen", - sequenceName = "tb_map_sheet_learn_data_geom_geom_uid", - allocationSize = 1) + name = "tb_map_sheet_learn_data_geom_id_gen", + sequenceName = "tb_map_sheet_learn_data_geom_geom_uid", + allocationSize = 1) @Column(name = "geo_uid", nullable = false) private Long id; diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/code/CommonCodeRepositoryCustom.java b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/code/CommonCodeRepositoryCustom.java index 232d8866..78c1721b 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/code/CommonCodeRepositoryCustom.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/code/CommonCodeRepositoryCustom.java @@ -3,7 +3,6 @@ package com.kamco.cd.kamcoback.postgres.repository.code; import com.kamco.cd.kamcoback.code.dto.CommonCodeDto; import com.kamco.cd.kamcoback.postgres.entity.CommonCodeEntity; import jakarta.validation.constraints.NotEmpty; - import java.util.List; import java.util.Optional; diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/code/CommonCodeRepositoryImpl.java b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/code/CommonCodeRepositoryImpl.java index 90d97d3d..8e5bebb7 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/code/CommonCodeRepositoryImpl.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/code/CommonCodeRepositoryImpl.java @@ -99,26 +99,22 @@ public class CommonCodeRepositoryImpl implements CommonCodeRepositoryCustom { @Override public Long findByParentIdCodeExists(Long parentId, String code) { return queryFactory - .select(commonCodeEntity.code.count()) - .from(commonCodeEntity) - .where( - commonCodeEntity.parent.id.eq(parentId), - commonCodeEntity.code.eq(code) - ) - .fetchOne(); + .select(commonCodeEntity.code.count()) + .from(commonCodeEntity) + .where(commonCodeEntity.parent.id.eq(parentId), commonCodeEntity.code.eq(code)) + .fetchOne(); } @Override public Long findByParentIdCodeExiststoUpdate(Long id, Long parentId, String code) { return queryFactory - .select(commonCodeEntity.code.count()) - .from(commonCodeEntity) - .where( - commonCodeEntity.parent.id.eq(parentId), - commonCodeEntity.code.eq(code), - commonCodeEntity.id.ne(id) - ) - .fetchOne(); + .select(commonCodeEntity.code.count()) + .from(commonCodeEntity) + .where( + commonCodeEntity.parent.id.eq(parentId), + commonCodeEntity.code.eq(code), + commonCodeEntity.id.ne(id)) + .fetchOne(); } private List findAllByIds(Set ids) {