260629_01_ENH: 매뉴얼 1개 추가 및 code controller 보안 해제, 리뷰 파일 다운로드 관련 수정
This commit is contained in:
@@ -1,5 +1,6 @@
|
||||
package com.kri.gwcf.review.back.common.consts;
|
||||
|
||||
import java.util.List;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
@NoArgsConstructor
|
||||
@@ -8,4 +9,8 @@ public final class GwcfConstant {
|
||||
public static final String SYSTEM_USER_NAME = "SYSTEM";
|
||||
public static final Integer WRITTEN_USER_ROLE = 2021;
|
||||
public static final Integer MONITORING_USER_ROLE = 9003;
|
||||
|
||||
public static final List<Integer> REVIEW_TYPE = List.of(1, 3);
|
||||
|
||||
public static final List<Integer> REVIEW_CLASSIFICATION = List.of(1, 5, 99);
|
||||
}
|
||||
|
||||
@@ -98,10 +98,7 @@ public class ReviewController {
|
||||
@PathVariable Integer reviewType,
|
||||
@PathVariable String userId
|
||||
) {
|
||||
return download(
|
||||
reviewService.getOriginalFileResource(performanceId, reviewType, userId),
|
||||
reviewService.getOriginalFileName(performanceId, reviewType, userId)
|
||||
);
|
||||
return download(reviewService.getOriginalFileResource(performanceId, reviewType, userId));
|
||||
}
|
||||
|
||||
@Operation(summary = "평가/모니터링 원본 파일 압축 다운로드")
|
||||
@@ -110,10 +107,7 @@ public class ReviewController {
|
||||
@PathVariable Integer performanceId,
|
||||
@PathVariable Integer reviewType
|
||||
) {
|
||||
return download(
|
||||
reviewService.getOriginalFileZipResource(performanceId, reviewType),
|
||||
reviewService.getOriginalFileZipName(performanceId, reviewType)
|
||||
);
|
||||
return download(reviewService.getOriginalFileZipResource(performanceId, reviewType));
|
||||
}
|
||||
|
||||
@Operation(summary = "PDF 변환 파일 조회/다운로드")
|
||||
@@ -123,10 +117,7 @@ public class ReviewController {
|
||||
@PathVariable Integer reviewType,
|
||||
@PathVariable String userId
|
||||
) {
|
||||
return download(
|
||||
reviewService.getPdfOrOriginalFileResource(performanceId, reviewType, userId),
|
||||
reviewService.getPdfOrOriginalFileName(performanceId, reviewType, userId)
|
||||
);
|
||||
return download(reviewService.getPdfOrOriginalFileResource(performanceId, reviewType, userId));
|
||||
}
|
||||
|
||||
@Operation(summary = "평가양식 업로드")
|
||||
@@ -145,10 +136,7 @@ public class ReviewController {
|
||||
@PathVariable Integer reviewType,
|
||||
@PathVariable Integer classification
|
||||
) {
|
||||
return download(
|
||||
reviewTemplateService.getReviewTemplateResource(reviewType, classification),
|
||||
reviewTemplateService.getReviewTemplateFileName(reviewType, classification)
|
||||
);
|
||||
return download(reviewTemplateService.getReviewTemplateResource(reviewType, classification));
|
||||
}
|
||||
|
||||
@Operation(summary = "평가양식 pdf 다운로드")
|
||||
@@ -157,15 +145,12 @@ public class ReviewController {
|
||||
@PathVariable Integer reviewType,
|
||||
@PathVariable Integer classification
|
||||
) {
|
||||
return download(
|
||||
reviewTemplateService.getReviewTemplatePdfResource(reviewType, classification),
|
||||
reviewTemplateService.getReviewTemplatePdfFileName(reviewType, classification)
|
||||
);
|
||||
return download(reviewTemplateService.getReviewTemplatePdfResource(reviewType, classification));
|
||||
}
|
||||
|
||||
private ResponseEntity<Resource> download(Resource resource, String fileName) {
|
||||
private ResponseEntity<Resource> download(Resource resource) {
|
||||
return ResponseEntity.ok()
|
||||
.header(HttpHeaders.CONTENT_DISPOSITION, attachmentContentDisposition(fileName))
|
||||
.header(HttpHeaders.CONTENT_DISPOSITION, attachmentContentDisposition(resource.getFilename()))
|
||||
.contentType(MediaType.APPLICATION_OCTET_STREAM)
|
||||
.body(resource);
|
||||
}
|
||||
|
||||
@@ -182,10 +182,6 @@ public class ReviewService extends AbstractFileService {
|
||||
return toResource(reviewDir(performanceId, reviewType).resolve(entity.getUploadFileName()));
|
||||
}
|
||||
|
||||
public String getOriginalFileName(Integer performanceId, Integer reviewType, String userId) {
|
||||
return removeTimestampPrefix(getReviewEntity(performanceId, reviewType, userId).getUploadFileName());
|
||||
}
|
||||
|
||||
public PathResource getOriginalFileZipResource(Integer performanceId, Integer reviewType) {
|
||||
List<TPerformanceReviewEntity> reviews = performanceReviewRepository.findAll()
|
||||
.stream()
|
||||
@@ -232,10 +228,6 @@ public class ReviewService extends AbstractFileService {
|
||||
}
|
||||
}
|
||||
|
||||
public String getOriginalFileZipName(Integer performanceId, Integer reviewType) {
|
||||
return getOriginalFileZipBaseName(performanceId, reviewType) + ".zip";
|
||||
}
|
||||
|
||||
private String buildZipEntryName(TPerformanceReviewEntity review, Set<String> entryNames) {
|
||||
String userId = StringUtil.isNullOrBlank(review.getRegUser()) ? "user" : review.getRegUser();
|
||||
String fileName = removeTimestampPrefix(review.getUploadFileName());
|
||||
@@ -283,14 +275,6 @@ public class ReviewService extends AbstractFileService {
|
||||
return toResource(reviewDir(performanceId, reviewType).resolve(fileName));
|
||||
}
|
||||
|
||||
public String getPdfOrOriginalFileName(Integer performanceId, Integer reviewType, String userId) {
|
||||
TPerformanceReviewEntity entity = getReviewEntity(performanceId, reviewType, userId);
|
||||
String fileName = StringUtil.isNullOrBlank(entity.getPdfFileName())
|
||||
? entity.getUploadFileName()
|
||||
: entity.getPdfFileName();
|
||||
return removeTimestampPrefix(fileName);
|
||||
}
|
||||
|
||||
private TPerformanceReviewEntity getReviewEntity(Integer performanceId, Integer reviewType, String userId) {
|
||||
return performanceReviewRepository.findByIdPerformanceIdAndIdReviewTypeAndIdRegUser(
|
||||
performanceId,
|
||||
|
||||
@@ -1,5 +1,8 @@
|
||||
package com.kri.gwcf.review.back.service;
|
||||
|
||||
import static com.kri.gwcf.review.back.common.consts.GwcfConstant.REVIEW_CLASSIFICATION;
|
||||
import static com.kri.gwcf.review.back.common.consts.GwcfConstant.REVIEW_TYPE;
|
||||
|
||||
import com.kri.common.feature.util.StringUtil;
|
||||
import com.kri.common.feature.web.BusinessException;
|
||||
import com.kri.gwcf.review.back.config.FileStorageProperties;
|
||||
@@ -7,6 +10,7 @@ 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.Arrays;
|
||||
import java.util.Comparator;
|
||||
import java.util.HashSet;
|
||||
import java.util.Set;
|
||||
@@ -59,19 +63,11 @@ public class ReviewTemplateService extends AbstractFileService {
|
||||
return new PathResource(file);
|
||||
}
|
||||
|
||||
public String getReviewTemplateFileName(Integer reviewType, Integer classification) {
|
||||
return findReviewTemplateFile(reviewType, classification, false).getFileName().toString();
|
||||
}
|
||||
|
||||
public PathResource getReviewTemplatePdfResource(Integer reviewType, Integer classification) {
|
||||
Path file = findReviewTemplateFile(reviewType, classification, true);
|
||||
return new PathResource(file);
|
||||
}
|
||||
|
||||
public String getReviewTemplatePdfFileName(Integer reviewType, Integer classification) {
|
||||
return findReviewTemplateFile(reviewType, classification, true).getFileName().toString();
|
||||
}
|
||||
|
||||
private Path findReviewTemplateFile(Integer reviewType, Integer classification, boolean pdf) {
|
||||
validateReviewTemplateType(reviewType);
|
||||
validateReviewTemplateClassification(classification);
|
||||
@@ -157,14 +153,14 @@ public class ReviewTemplateService extends AbstractFileService {
|
||||
}
|
||||
|
||||
private void validateReviewTemplateType(Integer reviewType) {
|
||||
if (!Integer.valueOf(1).equals(reviewType) && !Integer.valueOf(3).equals(reviewType)) {
|
||||
if (!REVIEW_TYPE.contains(reviewType)) {
|
||||
throw BusinessException.badRequest("INVALID_REVIEW_TEMPLATE_TYPE", "유효하지 않은 평가양식 타입입니다.")
|
||||
.with("reviewType", reviewType);
|
||||
}
|
||||
}
|
||||
|
||||
private void validateReviewTemplateClassification(Integer classification) {
|
||||
if (!Integer.valueOf(1).equals(classification) && !Integer.valueOf(5).equals(classification)) {
|
||||
if (!REVIEW_CLASSIFICATION.contains(classification)) {
|
||||
throw BusinessException.badRequest("INVALID_REVIEW_TEMPLATE_CLASSIFICATION", "유효하지 않은 평가양식 분류입니다.")
|
||||
.with("classification", classification);
|
||||
}
|
||||
|
||||
@@ -56,6 +56,7 @@ kri:
|
||||
- /api/v1/performance/list/compact
|
||||
- /api/v1/review/start/**
|
||||
- /api/v1/review/end/**
|
||||
- /api/v1/code/*
|
||||
|
||||
swagger:
|
||||
enabled: true
|
||||
|
||||
Reference in New Issue
Block a user