diff --git a/src/main/java/com/kri/gwcf/review/back/common/util/DownloadHeaderUtil.java b/src/main/java/com/kri/gwcf/review/back/common/util/DownloadHeaderUtil.java new file mode 100644 index 0000000..3e58010 --- /dev/null +++ b/src/main/java/com/kri/gwcf/review/back/common/util/DownloadHeaderUtil.java @@ -0,0 +1,14 @@ +package com.kri.gwcf.review.back.common.util; + +import java.net.URLEncoder; +import java.nio.charset.StandardCharsets; +import lombok.NoArgsConstructor; + +@NoArgsConstructor +public final class DownloadHeaderUtil { + + public static String attachmentContentDisposition(String fileName) { + return "attachment; filename*=UTF-8''" + + URLEncoder.encode(fileName, StandardCharsets.UTF_8).replace("+", "%20"); + } +} diff --git a/src/main/java/com/kri/gwcf/review/back/config/FileStorageProperties.java b/src/main/java/com/kri/gwcf/review/back/config/FileStorageProperties.java index 2e465c3..fc07db4 100644 --- a/src/main/java/com/kri/gwcf/review/back/config/FileStorageProperties.java +++ b/src/main/java/com/kri/gwcf/review/back/config/FileStorageProperties.java @@ -10,4 +10,5 @@ import org.springframework.boot.context.properties.ConfigurationProperties; public class FileStorageProperties { private String visitBaseDir; private String reviewBaseDir; -} \ No newline at end of file + private String reviewTemplateBaseDir; +} diff --git a/src/main/java/com/kri/gwcf/review/back/controller/MonitoringVisitController.java b/src/main/java/com/kri/gwcf/review/back/controller/MonitoringVisitController.java index b645112..57276ad 100644 --- a/src/main/java/com/kri/gwcf/review/back/controller/MonitoringVisitController.java +++ b/src/main/java/com/kri/gwcf/review/back/controller/MonitoringVisitController.java @@ -1,5 +1,7 @@ package com.kri.gwcf.review.back.controller; +import static com.kri.gwcf.review.back.common.util.DownloadHeaderUtil.attachmentContentDisposition; + import com.kri.common.feature.datetime.DateTimeUtil; import com.kri.common.feature.web.RequestUserContext; import com.kri.gwcf.review.back.dto.monitoring.MonitoringGpsRequestDto; @@ -11,7 +13,6 @@ import io.swagger.v3.oas.annotations.tags.Tag; import java.time.LocalDateTime; import java.util.List; import lombok.RequiredArgsConstructor; -import org.springframework.http.ContentDisposition; import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -87,8 +88,7 @@ public class MonitoringVisitController { byte[] bytes = visitService.downloadEvidenceZip(performanceId, userId); String fileName = "evidence_" + performanceId + "_" + userId + ".zip"; return ResponseEntity.ok() - .header(HttpHeaders.CONTENT_DISPOSITION, - ContentDisposition.attachment().filename(fileName).build().toString()) + .header(HttpHeaders.CONTENT_DISPOSITION, attachmentContentDisposition(fileName)) .contentType(MediaType.APPLICATION_OCTET_STREAM) .body(bytes); } diff --git a/src/main/java/com/kri/gwcf/review/back/controller/ReviewController.java b/src/main/java/com/kri/gwcf/review/back/controller/ReviewController.java index 398d49a..87ae9b7 100644 --- a/src/main/java/com/kri/gwcf/review/back/controller/ReviewController.java +++ b/src/main/java/com/kri/gwcf/review/back/controller/ReviewController.java @@ -2,16 +2,17 @@ package com.kri.gwcf.review.back.controller; import com.kri.common.feature.datetime.DateTimeUtil; import com.kri.common.feature.web.RequestUserContext; +import static com.kri.gwcf.review.back.common.util.DownloadHeaderUtil.attachmentContentDisposition; import com.kri.gwcf.review.back.dto.performance.PerformanceReviewDto; import com.kri.gwcf.review.back.dto.systemlog.UploadContentDto; import com.kri.gwcf.review.back.service.ReviewService; +import com.kri.gwcf.review.back.service.ReviewTemplateService; import com.kri.gwcf.review.back.service.common.SystemEventLogService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import java.time.LocalDateTime; import lombok.RequiredArgsConstructor; import org.springframework.core.io.Resource; -import org.springframework.http.ContentDisposition; import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -30,17 +31,19 @@ import org.springframework.web.multipart.MultipartFile; public class ReviewController { private final ReviewService reviewService; + private final ReviewTemplateService reviewTemplateService; private final SystemEventLogService systemEventLogService; @Operation(summary = "서면평가 시작 저장") - @PostMapping("/start/{performanceId}") + @PostMapping("/start/{performanceId}/{userId}") public PerformanceReviewDto startWrittenReview( @PathVariable Integer performanceId, + @PathVariable String userId, RequestUserContext ctx ) { LocalDateTime now = DateTimeUtil.nowKstLocalDateTime(); - PerformanceReviewDto result = reviewService.saveWrittenReviewStatus(performanceId, 1, ctx.getUserId(), now); - systemEventLogService.writeStartWrittenReviewLog(ctx.getUserId(), now, ctx.getClientIp(), performanceId); + PerformanceReviewDto result = reviewService.saveWrittenReviewStatus(performanceId, 1, userId, now); + systemEventLogService.writeStartWrittenReviewLog(userId, now, ctx.getClientIp(), performanceId); return result; } @@ -79,45 +82,64 @@ public class ReviewController { } @Operation(summary = "평가/모니터링 파일 조회") - @GetMapping("/{performanceId}/{reviewType}") + @GetMapping("/{performanceId}/{reviewType}/{userId}") public PerformanceReviewDto getReviewFile( @PathVariable Integer performanceId, @PathVariable Integer reviewType, - RequestUserContext ctx + @PathVariable String userId ) { - return reviewService.getReviewFile(performanceId, reviewType, ctx.getUserId()); + return reviewService.getReviewFile(performanceId, reviewType, userId); } @Operation(summary = "평가/모니터링 원본 파일 다운로드") - @GetMapping("/download/{performanceId}/{reviewType}") + @GetMapping("/download/{performanceId}/{reviewType}/{userId}") public ResponseEntity downloadOriginalFile( @PathVariable Integer performanceId, @PathVariable Integer reviewType, - RequestUserContext ctx + @PathVariable String userId ) { return download( - reviewService.getOriginalFileResource(performanceId, reviewType, ctx.getUserId()), - reviewService.getOriginalFileName(performanceId, reviewType, ctx.getUserId()) + reviewService.getOriginalFileResource(performanceId, reviewType, userId), + reviewService.getOriginalFileName(performanceId, reviewType, userId) ); } @Operation(summary = "PDF 변환 파일 조회/다운로드") - @GetMapping("/pdf/{performanceId}/{reviewType}") + @GetMapping("/pdf/{performanceId}/{reviewType}/{userId}") public ResponseEntity downloadPdfOrOriginalFile( @PathVariable Integer performanceId, @PathVariable Integer reviewType, - RequestUserContext ctx + @PathVariable String userId ) { return download( - reviewService.getPdfOrOriginalFileResource(performanceId, reviewType, ctx.getUserId()), - reviewService.getPdfOrOriginalFileName(performanceId, reviewType, ctx.getUserId()) + reviewService.getPdfOrOriginalFileResource(performanceId, reviewType, userId), + reviewService.getPdfOrOriginalFileName(performanceId, reviewType, userId) + ); + } + + @Operation(summary = "평가양식 업로드") + @PostMapping(value = "/template/upload/{reviewType}", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) + public String uploadReviewTemplate( + @PathVariable Integer reviewType, + @RequestParam("file") MultipartFile file + ) { + return reviewTemplateService.uploadReviewTemplate(reviewType, file); + } + + @Operation(summary = "평가양식 다운로드") + @GetMapping("/template/download/{reviewType}") + public ResponseEntity downloadReviewTemplate( + @PathVariable Integer reviewType + ) { + return download( + reviewTemplateService.getReviewTemplateResource(reviewType), + reviewTemplateService.getReviewTemplateFileName(reviewType) ); } private ResponseEntity download(Resource resource, String fileName) { return ResponseEntity.ok() - .header(HttpHeaders.CONTENT_DISPOSITION, - ContentDisposition.attachment().filename(fileName).build().toString()) + .header(HttpHeaders.CONTENT_DISPOSITION, attachmentContentDisposition(fileName)) .contentType(MediaType.APPLICATION_OCTET_STREAM) .body(resource); } diff --git a/src/main/java/com/kri/gwcf/review/back/dto/performance/PerformanceMonitoringVisitDto.java b/src/main/java/com/kri/gwcf/review/back/dto/performance/PerformanceMonitoringVisitDto.java index 0b1045b..04b2ffa 100644 --- a/src/main/java/com/kri/gwcf/review/back/dto/performance/PerformanceMonitoringVisitDto.java +++ b/src/main/java/com/kri/gwcf/review/back/dto/performance/PerformanceMonitoringVisitDto.java @@ -47,7 +47,7 @@ public class PerformanceMonitoringVisitDto { private String regUser; @Schema(description = "등록일시") - private LocalDateTime regDate; + private LocalDateTime regDt; public static PerformanceMonitoringVisitDto from(TPerformanceMonitoringVisitEntity entity) { if (entity == null) { @@ -64,7 +64,7 @@ public class PerformanceMonitoringVisitDto { .gpsAccuracyM(entity.getGpsAccuracyM()) .gpsRaw(entity.getGpsRaw()) .regUser(entity.getRegUser()) - .regDate(entity.getRegDt()) + .regDt(entity.getRegDt()) .build(); } } diff --git a/src/main/java/com/kri/gwcf/review/back/dto/performance/PerformanceReviewDto.java b/src/main/java/com/kri/gwcf/review/back/dto/performance/PerformanceReviewDto.java index 5993a00..e2a2e52 100644 --- a/src/main/java/com/kri/gwcf/review/back/dto/performance/PerformanceReviewDto.java +++ b/src/main/java/com/kri/gwcf/review/back/dto/performance/PerformanceReviewDto.java @@ -2,6 +2,7 @@ package com.kri.gwcf.review.back.dto.performance; import com.kri.gwcf.review.back.persistence.entity.TPerformanceReviewEntity; +import java.time.LocalDateTime; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; @@ -25,6 +26,9 @@ public class PerformanceReviewDto { @Schema(description = "등록 사용자") private String regUser; + @Schema(description = "평가 일시") + private LocalDateTime reviewDt; + @Schema(description = "평가 상태") private Integer reviewStatus; @@ -42,10 +46,13 @@ public class PerformanceReviewDto { return null; } + LocalDateTime reviewDt = entity.getModDt() != null ? entity.getModDt() : entity.getRegDt(); + return PerformanceReviewDto.builder() .performanceId(entity.getPerformanceId()) .reviewType(entity.getReviewType()) .regUser(entity.getRegUser()) + .reviewDt(reviewDt) .reviewStatus(entity.getReviewStatus()) .uploadFileName(entity.getUploadFileName()) .pdfConvert(entity.getPdfConvert()) diff --git a/src/main/java/com/kri/gwcf/review/back/persistence/entity/TPerformanceMonitoringVisitEntity.java b/src/main/java/com/kri/gwcf/review/back/persistence/entity/TPerformanceMonitoringVisitEntity.java index 86180f9..fce2aa8 100644 --- a/src/main/java/com/kri/gwcf/review/back/persistence/entity/TPerformanceMonitoringVisitEntity.java +++ b/src/main/java/com/kri/gwcf/review/back/persistence/entity/TPerformanceMonitoringVisitEntity.java @@ -86,7 +86,7 @@ public class TPerformanceMonitoringVisitEntity { entity.setGpsAccuracyM(dto.getGpsAccuracyM()); entity.setGpsRaw(dto.getGpsRaw()); entity.setRegUser(dto.getRegUser()); - entity.setRegDt(dto.getRegDate()); + entity.setRegDt(dto.getRegDt()); return entity; } diff --git a/src/main/java/com/kri/gwcf/review/back/service/ReviewService.java b/src/main/java/com/kri/gwcf/review/back/service/ReviewService.java index 7e3e629..de6ddc0 100644 --- a/src/main/java/com/kri/gwcf/review/back/service/ReviewService.java +++ b/src/main/java/com/kri/gwcf/review/back/service/ReviewService.java @@ -133,10 +133,13 @@ public class ReviewService extends AbstractFileService { try { Path dir = reviewDir(performanceId, reviewType); - String uploadFileName = saveFile(dir, file); + String uploadFileName = buildFileNameWithTime(file, now); + saveFile(dir, file, uploadFileName); Path uploadPath = dir.resolve(uploadFileName).normalize(); - String pdfFileName = convertToPdfIfPossible(uploadPath, dir); + String pdfFileName = isPdf(uploadFileName) + ? uploadFileName + : convertToPdfIfPossible(uploadPath, dir); boolean pdfConvert = StringUtil.hasText(pdfFileName); TPerformanceReviewEntity entity = performanceReviewRepository @@ -178,7 +181,7 @@ public class ReviewService extends AbstractFileService { } public String getOriginalFileName(Integer performanceId, Integer reviewType, String userId) { - return getReviewEntity(performanceId, reviewType, userId).getUploadFileName(); + return removeTimestampPrefix(getReviewEntity(performanceId, reviewType, userId).getUploadFileName()); } public PathResource getPdfOrOriginalFileResource(Integer performanceId, Integer reviewType, String userId) { @@ -191,9 +194,10 @@ public class ReviewService extends AbstractFileService { public String getPdfOrOriginalFileName(Integer performanceId, Integer reviewType, String userId) { TPerformanceReviewEntity entity = getReviewEntity(performanceId, reviewType, userId); - return StringUtil.isNullOrBlank(entity.getPdfFileName()) + String fileName = StringUtil.isNullOrBlank(entity.getPdfFileName()) ? entity.getUploadFileName() : entity.getPdfFileName(); + return removeTimestampPrefix(fileName); } private TPerformanceReviewEntity getReviewEntity(Integer performanceId, Integer reviewType, String userId) { @@ -260,4 +264,16 @@ public class ReviewService extends AbstractFileService { int dot = fileName.lastIndexOf('.'); return dot > 0 ? fileName.substring(0, dot) : fileName; } + + private boolean isPdf(String fileName) { + return ".pdf".equalsIgnoreCase(extractExtension(fileName)); + } + + private String removeTimestampPrefix(String fileName) { + if (StringUtil.isNullOrBlank(fileName)) { + return fileName; + } + + return fileName.replaceFirst("^\\d{4}-\\d{2}-\\d{2}_\\d{6}_", ""); + } } diff --git a/src/main/java/com/kri/gwcf/review/back/service/ReviewTemplateService.java b/src/main/java/com/kri/gwcf/review/back/service/ReviewTemplateService.java new file mode 100644 index 0000000..1e1b48d --- /dev/null +++ b/src/main/java/com/kri/gwcf/review/back/service/ReviewTemplateService.java @@ -0,0 +1,109 @@ +package com.kri.gwcf.review.back.service; + +import com.kri.common.feature.util.StringUtil; +import com.kri.common.feature.web.BusinessException; +import com.kri.gwcf.review.back.config.FileStorageProperties; +import com.kri.gwcf.review.back.service.file.AbstractFileService; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.Comparator; +import lombok.RequiredArgsConstructor; +import org.springframework.core.io.PathResource; +import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; + +@Service +@RequiredArgsConstructor +public class ReviewTemplateService extends AbstractFileService { + + private final FileStorageProperties fileStorageProperties; + + @Override + protected Path getBaseDir() { + return Path.of(fileStorageProperties.getReviewTemplateBaseDir()) + .toAbsolutePath() + .normalize(); + } + + public String uploadReviewTemplate(Integer reviewType, MultipartFile file) { + validateReviewTemplateType(reviewType); + if (file == null || file.isEmpty()) { + throw BusinessException.badRequest("EMPTY_FILE", "업로드된 파일이 없습니다."); + } + + String fileName = sanitizeFileName(file.getOriginalFilename()); + Path dir = templateDir(reviewType); + + try { + deleteExistingFiles(dir); + saveFile(dir, file, fileName); + return fileName; + } catch (IOException e) { + throw BusinessException.internalError("REVIEW_TEMPLATE_SAVE_FAILED", "평가양식 파일 저장 중 오류가 발생했습니다."); + } + } + + public PathResource getReviewTemplateResource(Integer reviewType) { + Path file = findReviewTemplateFile(reviewType); + return new PathResource(file); + } + + public String getReviewTemplateFileName(Integer reviewType) { + return findReviewTemplateFile(reviewType).getFileName().toString(); + } + + private Path findReviewTemplateFile(Integer reviewType) { + validateReviewTemplateType(reviewType); + Path dir = templateDir(reviewType); + if (!Files.isDirectory(dir)) { + throw BusinessException.notFound("REVIEW_TEMPLATE_NOT_FOUND", "평가양식 파일이 없습니다.") + .with("reviewType", reviewType); + } + + try (var files = Files.list(dir)) { + return files + .filter(Files::isRegularFile) + .sorted(Comparator.comparing(path -> path.getFileName().toString())) + .findFirst() + .orElseThrow(() -> BusinessException.notFound("REVIEW_TEMPLATE_NOT_FOUND", "평가양식 파일이 없습니다.") + .with("reviewType", reviewType)); + } catch (IOException e) { + throw BusinessException.internalError("REVIEW_TEMPLATE_READ_FAILED", "평가양식 파일 조회 중 오류가 발생했습니다."); + } + } + + private void deleteExistingFiles(Path dir) throws IOException { + if (!Files.isDirectory(dir)) { + return; + } + + try (var files = Files.list(dir)) { + for (Path file : files.filter(Files::isRegularFile).toList()) { + Files.deleteIfExists(file); + } + } + } + + private Path templateDir(Integer reviewType) { + return getBaseDir() + .resolve(String.valueOf(reviewType)) + .toAbsolutePath() + .normalize(); + } + + private void validateReviewTemplateType(Integer reviewType) { + if (!Integer.valueOf(1).equals(reviewType) && !Integer.valueOf(3).equals(reviewType)) { + throw BusinessException.badRequest("INVALID_REVIEW_TEMPLATE_TYPE", "유효하지 않은 평가양식 타입입니다.") + .with("reviewType", reviewType); + } + } + + private String sanitizeFileName(String originalFileName) { + if (StringUtil.isNullOrBlank(originalFileName)) { + return "review-template"; + } + + return Path.of(originalFileName).getFileName().toString(); + } +} diff --git a/src/main/java/com/kri/gwcf/review/back/service/VisitService.java b/src/main/java/com/kri/gwcf/review/back/service/VisitService.java index c0ae38a..e0575c2 100644 --- a/src/main/java/com/kri/gwcf/review/back/service/VisitService.java +++ b/src/main/java/com/kri/gwcf/review/back/service/VisitService.java @@ -62,7 +62,7 @@ public class VisitService extends AbstractFileService { String regUser, LocalDateTime regDt ) { - validateGps(gps); + //validateGps(gps); TPerformanceMonitoringVisitEntity entity = saveVisit( performanceId, 2, @@ -83,7 +83,7 @@ public class VisitService extends AbstractFileService { String regUser, LocalDateTime regDt ) { - validateGps(gps); + //validateGps(gps); String evidenceImg = String.join("|", saveEvidenceFiles(performanceId, regUser, files)); TPerformanceMonitoringVisitEntity entity = saveVisit( diff --git a/src/main/java/com/kri/gwcf/review/back/service/file/AbstractFileService.java b/src/main/java/com/kri/gwcf/review/back/service/file/AbstractFileService.java index 32b8cec..fff406e 100644 --- a/src/main/java/com/kri/gwcf/review/back/service/file/AbstractFileService.java +++ b/src/main/java/com/kri/gwcf/review/back/service/file/AbstractFileService.java @@ -8,6 +8,8 @@ import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.StandardCopyOption; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; import java.util.Optional; import org.springframework.web.multipart.MultipartFile; @@ -54,11 +56,20 @@ public abstract class AbstractFileService { String ext = extractExtension(original); String timestamp = DateTimeUtil.nowKstLocalDateTime() - .format(java.time.format.DateTimeFormatter.ofPattern("yyyyMMdd_HHmmss")); + .format(DateTimeFormatter.ofPattern("yyyyMMdd_HHmmss")); return prefix + "_" + timestamp + "_" + baseName + ext; } + protected String buildFileNameWithTime(MultipartFile file, LocalDateTime now) { + String original = Optional.ofNullable(file.getOriginalFilename()).orElse("file"); + String baseName = extractBaseName(original); + String ext = extractExtension(original); + String timestamp = now.format(DateTimeFormatter.ofPattern("yyyy-MM-dd_hhmmss")); + + return timestamp + "_" + baseName + ext; + } + protected Path createDirectories(Path dir) throws IOException { return Files.createDirectories(dir.toAbsolutePath().normalize()); } @@ -92,6 +103,7 @@ public abstract class AbstractFileService { throw BusinessException.internalError("WRONG_DIRECTORY","잘못된 파일 경로입니다."); } + Files.deleteIfExists(target); file.transferTo(target.toFile()); } diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml index affa9c7..c2b4c28 100644 --- a/src/main/resources/application.yaml +++ b/src/main/resources/application.yaml @@ -54,6 +54,7 @@ kri: - /api/v1/admin-cache/** - /api/v1/assign/confirm/*/* - /api/v1/performance/list/compact + - /api/v1/review/start/** - /api/v1/review/end/** swagger: @@ -68,6 +69,7 @@ kri: file: visit-base-dir: ./upload-file/visit review-base-dir: ./upload-file/review + review-template-base-dir: ./upload-file/review-template pdf-converter-command: soffice web: