diff --git a/pav-server/src/main/java/com/palnet/biz/api/comn/file/service/ComnFileService.java b/pav-server/src/main/java/com/palnet/biz/api/comn/file/service/ComnFileService.java index c774be7e..da0631e9 100644 --- a/pav-server/src/main/java/com/palnet/biz/api/comn/file/service/ComnFileService.java +++ b/pav-server/src/main/java/com/palnet/biz/api/comn/file/service/ComnFileService.java @@ -12,6 +12,7 @@ import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.time.Instant; +import java.util.ArrayList; import java.util.List; import java.util.Objects; @@ -205,7 +206,7 @@ public class ComnFileService { if(!this.validCheck(files)) throw new CustomException(ErrorCode.NON_VALID_PARAMETER); - String fileGroupNo = lastFileGroupNo().toString(); + Integer fileGroupNo = lastFileGroupNo(); // TODO : 절대경로 String absPath = "/Users/igyeongdo/WokrSpace/"; @@ -215,22 +216,25 @@ public class ComnFileService { .append(this.BASE_PATH) .append(InstantUtils.toDateStringByFormat(Instant.now(), "yyyyMMdd")) .append("/") - .toString(); - - - + .toString(); - for(MultipartFile file : files){ + List comFileBas = new ArrayList<>(); + for(MultipartFile file : files){ String oriNm = file.getOriginalFilename(); String extension = oriNm.substring(oriNm.lastIndexOf(".")); String etc = String.valueOf(System.currentTimeMillis()); // 동명이인 방지 - String fileName = this.getLaancSaveName(ExtensionConstant.fromExtension(extension), fileGroupNo, "qna", etc); + String fileName = this.getLaancSaveName(ExtensionConstant.fromExtension(extension), fileGroupNo.toString(), "qna", etc); - log.error("fileName -> {}", fileName); - - try { - + ComFileBas node = new ComFileBas(); + node.setFileGroupNo(fileGroupNo); + node.setFilePath(fileUrl); + node.setFileExt(extension); + node.setCreateDt(Instant.now()); + node.setFileSaveNm(fileName); + node.setFileOriNm(oriNm); + + try { Path directoryPath = Paths.get(fileUrl); if (!Files.exists(directoryPath)) { Files.createDirectories(directoryPath); @@ -240,12 +244,21 @@ public class ComnFileService { File saveFile = new File(filePath); file.transferTo(saveFile); + + long fileSize = Files.size(Paths.get(filePath)) / 1024; + node.setFileSize(String.valueOf(fileSize)); } catch (IOException e) { e.printStackTrace(); } + String userId = jwtTokenUtil.getUserIdByToken(); + if (userId == null) userId = "NONE"; + node.setCreateUserId(userId); + + comFileBas.add(node); } + this.saveAll(comFileBas); return true; }