Merge pull request 'develop' (#7) from develop into master
Reviewed-on: #7
This commit is contained in:
3
.gitignore
vendored
3
.gitignore
vendored
@@ -1,6 +1,8 @@
|
||||
HELP.md
|
||||
.gradle
|
||||
build/
|
||||
logs/
|
||||
upload-file/
|
||||
!gradle/wrapper/gradle-wrapper.jar
|
||||
!**/src/main/**/build/
|
||||
!**/src/test/**/build/
|
||||
@@ -19,6 +21,7 @@ bin/
|
||||
|
||||
### IntelliJ IDEA ###
|
||||
.idea
|
||||
.idea_bak
|
||||
*.iws
|
||||
*.iml
|
||||
*.ipr
|
||||
|
||||
@@ -0,0 +1,23 @@
|
||||
package com.kri.gwcf.review.back.config;
|
||||
|
||||
import java.util.concurrent.Executor;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
import org.springframework.scheduling.annotation.EnableAsync;
|
||||
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
|
||||
|
||||
@Configuration
|
||||
@EnableAsync
|
||||
public class AsyncConfig {
|
||||
|
||||
@Bean(name = "pdfConvertTaskExecutor")
|
||||
public Executor pdfConvertTaskExecutor() {
|
||||
ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
|
||||
executor.setCorePoolSize(1);
|
||||
executor.setMaxPoolSize(1);
|
||||
executor.setQueueCapacity(100);
|
||||
executor.setThreadNamePrefix("pdf-convert-");
|
||||
executor.initialize();
|
||||
return executor;
|
||||
}
|
||||
}
|
||||
@@ -36,7 +36,7 @@ public class PerformanceReviewDto {
|
||||
private String uploadFileName;
|
||||
|
||||
@Schema(description = "pdf로 변환성공 여부")
|
||||
private Boolean pdfConvert;
|
||||
private Short pdfConvert;
|
||||
|
||||
@Schema(description = "pdf로 변환된 파일명")
|
||||
private String pdfFileName;
|
||||
|
||||
@@ -36,12 +36,15 @@ public class TPerformanceReviewEntity {
|
||||
|
||||
@NotNull
|
||||
@Column(name = "is_pdf_convert", nullable = false)
|
||||
private Boolean pdfConvert;
|
||||
private Short pdfConvert;
|
||||
|
||||
@NotNull
|
||||
@Column(name = "pdf_file_name", nullable = false, length = 512)
|
||||
private String pdfFileName;
|
||||
|
||||
@Column(name = "pdf_convert_dt", insertable = false)
|
||||
private LocalDateTime pdfConvertDt;
|
||||
|
||||
@NotNull
|
||||
@ColumnDefault("CURRENT_TIMESTAMP")
|
||||
@Column(name = "reg_dt", nullable = false, updatable = false)
|
||||
|
||||
@@ -0,0 +1,133 @@
|
||||
package com.kri.gwcf.review.back.service;
|
||||
|
||||
import com.kri.common.feature.util.StringUtil;
|
||||
import com.kri.gwcf.review.back.persistence.entity.TPerformanceReviewEntity;
|
||||
import com.kri.gwcf.review.back.persistence.repository.PerformanceReviewRepository;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Path;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.HashSet;
|
||||
import java.util.Set;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
@Slf4j
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
public class ReviewPdfConvertService {
|
||||
|
||||
private static final short PDF_CONVERT_COMPLETE = 1;
|
||||
private static final short PDF_CONVERT_FAILED = 9;
|
||||
|
||||
private final PerformanceReviewRepository performanceReviewRepository;
|
||||
|
||||
@Value("${kri.file.pdf-converter-command:soffice}")
|
||||
private String pdfConverterCommand;
|
||||
|
||||
public void convertReviewFileToPdf(
|
||||
Integer performanceId,
|
||||
Integer reviewType,
|
||||
String userId,
|
||||
String uploadFileName,
|
||||
Path source,
|
||||
Path dir
|
||||
) {
|
||||
String pdfFileName = convertToPdfIfPossible(source, dir);
|
||||
if (StringUtil.isNullOrBlank(pdfFileName)) {
|
||||
updatePdfConvertFailure(performanceId, reviewType, userId, uploadFileName);
|
||||
log.warn(
|
||||
"Review PDF conversion failed. performanceId={}, reviewType={}, userId={}, uploadFileName={}",
|
||||
performanceId,
|
||||
reviewType,
|
||||
userId,
|
||||
uploadFileName
|
||||
);
|
||||
return;
|
||||
}
|
||||
|
||||
performanceReviewRepository
|
||||
.findByIdPerformanceIdAndIdReviewTypeAndIdRegUser(performanceId, reviewType, userId)
|
||||
.filter(entity -> uploadFileName.equals(entity.getUploadFileName()))
|
||||
.ifPresentOrElse(
|
||||
entity -> updatePdfConvertResult(entity, pdfFileName),
|
||||
() -> log.info(
|
||||
"Skipped stale review PDF conversion result. performanceId={}, reviewType={}, userId={}, uploadFileName={}, pdfFileName={}",
|
||||
performanceId,
|
||||
reviewType,
|
||||
userId,
|
||||
uploadFileName,
|
||||
pdfFileName
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
private void updatePdfConvertResult(TPerformanceReviewEntity entity, String pdfFileName) {
|
||||
entity.setPdfConvert(PDF_CONVERT_COMPLETE);
|
||||
entity.setPdfFileName(pdfFileName);
|
||||
entity.setPdfConvertDt(LocalDateTime.now());
|
||||
performanceReviewRepository.save(entity);
|
||||
}
|
||||
|
||||
private void updatePdfConvertFailure(
|
||||
Integer performanceId,
|
||||
Integer reviewType,
|
||||
String userId,
|
||||
String uploadFileName
|
||||
) {
|
||||
performanceReviewRepository
|
||||
.findByIdPerformanceIdAndIdReviewTypeAndIdRegUser(performanceId, reviewType, userId)
|
||||
.filter(entity -> uploadFileName.equals(entity.getUploadFileName()))
|
||||
.ifPresent(entity -> {
|
||||
entity.setPdfConvert(PDF_CONVERT_FAILED);
|
||||
entity.setPdfFileName("");
|
||||
entity.setPdfConvertDt(LocalDateTime.now());
|
||||
performanceReviewRepository.save(entity);
|
||||
});
|
||||
}
|
||||
|
||||
private String convertToPdfIfPossible(Path source, Path dir) {
|
||||
String extension = extractExtension(source.getFileName().toString()).toLowerCase();
|
||||
Set<String> targets = new HashSet<>(Set.of(".docx", ".hwpx", ".hwp", ".pptx", ".xlsx"));
|
||||
if (!targets.contains(extension)) {
|
||||
return "";
|
||||
}
|
||||
|
||||
try {
|
||||
Process process = new ProcessBuilder(
|
||||
pdfConverterCommand,
|
||||
"--headless",
|
||||
"--convert-to",
|
||||
"pdf",
|
||||
"--outdir",
|
||||
dir.toString(),
|
||||
source.toString()
|
||||
).redirectErrorStream(true).start();
|
||||
|
||||
boolean finished = process.waitFor(300, TimeUnit.SECONDS);
|
||||
if (!finished || process.exitValue() != 0) {
|
||||
process.destroyForcibly();
|
||||
return "";
|
||||
}
|
||||
|
||||
String baseName = stripExtension(source.getFileName().toString());
|
||||
Path pdf = dir.resolve(baseName + ".pdf").normalize();
|
||||
return Files.exists(pdf) ? pdf.getFileName().toString() : "";
|
||||
} catch (Exception e) {
|
||||
log.warn("Review PDF conversion error. source={}", source, e);
|
||||
return "";
|
||||
}
|
||||
}
|
||||
|
||||
private String stripExtension(String fileName) {
|
||||
int dot = fileName.lastIndexOf('.');
|
||||
return dot > 0 ? fileName.substring(0, dot) : fileName;
|
||||
}
|
||||
|
||||
private String extractExtension(String fileName) {
|
||||
int dot = fileName.lastIndexOf('.');
|
||||
return dot >= 0 ? fileName.substring(dot) : "";
|
||||
}
|
||||
}
|
||||
@@ -16,26 +16,41 @@ import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
import java.util.concurrent.Executor;
|
||||
import java.util.stream.Collectors;
|
||||
import java.util.zip.ZipEntry;
|
||||
import java.util.zip.ZipOutputStream;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.beans.factory.annotation.Qualifier;
|
||||
import org.springframework.core.io.PathResource;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import org.springframework.transaction.support.TransactionSynchronization;
|
||||
import org.springframework.transaction.support.TransactionSynchronizationManager;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
public class ReviewService extends AbstractFileService {
|
||||
|
||||
private static final short PDF_CONVERT_PENDING = 0;
|
||||
private static final short PDF_CONVERT_COMPLETE = 1;
|
||||
private static final short PDF_CONVERT_NOT_TARGET = 8;
|
||||
|
||||
private final PerformanceReviewRepository performanceReviewRepository;
|
||||
private final FileStorageProperties fileStorageProperties;
|
||||
private final ReviewPdfConvertService reviewPdfConvertService;
|
||||
private final Executor pdfConvertTaskExecutor;
|
||||
|
||||
@Value("${kri.file.pdf-converter-command:soffice}")
|
||||
private String pdfConverterCommand;
|
||||
public ReviewService(
|
||||
PerformanceReviewRepository performanceReviewRepository,
|
||||
FileStorageProperties fileStorageProperties,
|
||||
ReviewPdfConvertService reviewPdfConvertService,
|
||||
@Qualifier("pdfConvertTaskExecutor") Executor pdfConvertTaskExecutor
|
||||
) {
|
||||
this.performanceReviewRepository = performanceReviewRepository;
|
||||
this.fileStorageProperties = fileStorageProperties;
|
||||
this.reviewPdfConvertService = reviewPdfConvertService;
|
||||
this.pdfConvertTaskExecutor = pdfConvertTaskExecutor;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected Path getBaseDir() {
|
||||
@@ -76,7 +91,7 @@ public class ReviewService extends AbstractFileService {
|
||||
.regUser(userId)
|
||||
.build())
|
||||
.uploadFileName("")
|
||||
.pdfConvert(false)
|
||||
.pdfConvert(PDF_CONVERT_NOT_TARGET)
|
||||
.pdfFileName("")
|
||||
.regDt(now)
|
||||
.build());
|
||||
@@ -109,7 +124,7 @@ public class ReviewService extends AbstractFileService {
|
||||
.regUser(userId)
|
||||
.build())
|
||||
.uploadFileName("")
|
||||
.pdfConvert(false)
|
||||
.pdfConvert(PDF_CONVERT_NOT_TARGET)
|
||||
.pdfFileName("")
|
||||
.regDt(now)
|
||||
.build());
|
||||
@@ -139,10 +154,10 @@ public class ReviewService extends AbstractFileService {
|
||||
saveFile(dir, file, uploadFileName);
|
||||
Path uploadPath = dir.resolve(uploadFileName).normalize();
|
||||
|
||||
String pdfFileName = isPdf(uploadFileName)
|
||||
? uploadFileName
|
||||
: convertToPdfIfPossible(uploadPath, dir);
|
||||
boolean pdfConvert = StringUtil.hasText(pdfFileName);
|
||||
boolean pdfFile = isPdf(uploadFileName);
|
||||
boolean pdfConvertTarget = isPdfConvertTarget(uploadFileName);
|
||||
String pdfFileName = pdfFile ? uploadFileName : "";
|
||||
Short pdfConvert = resolveInitialPdfConvertStatus(pdfFile, pdfConvertTarget);
|
||||
|
||||
TPerformanceReviewEntity entity = performanceReviewRepository
|
||||
.findByIdPerformanceIdAndIdReviewTypeAndIdRegUser(performanceId, reviewType, userId)
|
||||
@@ -159,6 +174,7 @@ public class ReviewService extends AbstractFileService {
|
||||
entity.setUploadFileName(uploadFileName);
|
||||
entity.setPdfConvert(pdfConvert);
|
||||
entity.setPdfFileName(pdfFileName);
|
||||
entity.setPdfConvertDt(null);
|
||||
if (entity.getRegUser() == null) {
|
||||
entity.setRegUser(userId);
|
||||
entity.setRegDt(now);
|
||||
@@ -167,7 +183,12 @@ public class ReviewService extends AbstractFileService {
|
||||
entity.setModDt(now);
|
||||
}
|
||||
|
||||
return PerformanceReviewDto.from(performanceReviewRepository.save(entity));
|
||||
TPerformanceReviewEntity saved = performanceReviewRepository.save(entity);
|
||||
if (pdfConvert == PDF_CONVERT_PENDING) {
|
||||
convertPdfAfterCommit(performanceId, reviewType, userId, uploadFileName, uploadPath, dir);
|
||||
}
|
||||
|
||||
return PerformanceReviewDto.from(saved);
|
||||
} catch (IOException e) {
|
||||
throw BusinessException.internalError("REVIEW_FILE_SAVE_FAILED", "평가/모니터링 파일 저장 중 오류가 발생했습니다.");
|
||||
}
|
||||
@@ -177,6 +198,36 @@ public class ReviewService extends AbstractFileService {
|
||||
return PerformanceReviewDto.from(getReviewEntity(performanceId, reviewType, userId));
|
||||
}
|
||||
|
||||
private void convertPdfAfterCommit(
|
||||
Integer performanceId,
|
||||
Integer reviewType,
|
||||
String userId,
|
||||
String uploadFileName,
|
||||
Path uploadPath,
|
||||
Path dir
|
||||
) {
|
||||
Runnable task = () -> reviewPdfConvertService.convertReviewFileToPdf(
|
||||
performanceId,
|
||||
reviewType,
|
||||
userId,
|
||||
uploadFileName,
|
||||
uploadPath,
|
||||
dir
|
||||
);
|
||||
|
||||
if (TransactionSynchronizationManager.isSynchronizationActive()) {
|
||||
TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() {
|
||||
@Override
|
||||
public void afterCommit() {
|
||||
pdfConvertTaskExecutor.execute(task);
|
||||
}
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
pdfConvertTaskExecutor.execute(task);
|
||||
}
|
||||
|
||||
public PathResource getOriginalFileResource(Integer performanceId, Integer reviewType, String userId) {
|
||||
TPerformanceReviewEntity entity = getReviewEntity(performanceId, reviewType, userId);
|
||||
return toResource(reviewDir(performanceId, reviewType).resolve(entity.getUploadFileName()));
|
||||
@@ -303,38 +354,6 @@ public class ReviewService extends AbstractFileService {
|
||||
.normalize();
|
||||
}
|
||||
|
||||
private String convertToPdfIfPossible(Path source, Path dir) {
|
||||
String extension = extractExtension(source.getFileName().toString()).toLowerCase();
|
||||
Set<String> targets = new HashSet<>(Set.of(".docx", ".hwpx", ".hwp", ".pptx", ".xlsx"));
|
||||
if (!targets.contains(extension)) {
|
||||
return "";
|
||||
}
|
||||
|
||||
try {
|
||||
Process process = new ProcessBuilder(
|
||||
pdfConverterCommand,
|
||||
"--headless",
|
||||
"--convert-to",
|
||||
"pdf",
|
||||
"--outdir",
|
||||
dir.toString(),
|
||||
source.toString()
|
||||
).redirectErrorStream(true).start();
|
||||
|
||||
boolean finished = process.waitFor(60, TimeUnit.SECONDS);
|
||||
if (!finished || process.exitValue() != 0) {
|
||||
process.destroyForcibly();
|
||||
return "";
|
||||
}
|
||||
|
||||
String baseName = stripExtension(source.getFileName().toString());
|
||||
Path pdf = dir.resolve(baseName + ".pdf").normalize();
|
||||
return Files.exists(pdf) ? pdf.getFileName().toString() : "";
|
||||
} catch (Exception e) {
|
||||
return "";
|
||||
}
|
||||
}
|
||||
|
||||
private String stripExtension(String fileName) {
|
||||
int dot = fileName.lastIndexOf('.');
|
||||
return dot > 0 ? fileName.substring(0, dot) : fileName;
|
||||
@@ -344,6 +363,18 @@ public class ReviewService extends AbstractFileService {
|
||||
return ".pdf".equalsIgnoreCase(extractExtension(fileName));
|
||||
}
|
||||
|
||||
private Short resolveInitialPdfConvertStatus(boolean pdfFile, boolean pdfConvertTarget) {
|
||||
if (pdfFile) {
|
||||
return PDF_CONVERT_COMPLETE;
|
||||
}
|
||||
return pdfConvertTarget ? PDF_CONVERT_PENDING : PDF_CONVERT_NOT_TARGET;
|
||||
}
|
||||
|
||||
private boolean isPdfConvertTarget(String fileName) {
|
||||
String extension = extractExtension(fileName).toLowerCase();
|
||||
return Set.of(".docx", ".hwpx", ".hwp", ".pptx", ".xlsx").contains(extension);
|
||||
}
|
||||
|
||||
private String removeTimestampPrefix(String fileName) {
|
||||
if (StringUtil.isNullOrBlank(fileName)) {
|
||||
return fileName;
|
||||
|
||||
Reference in New Issue
Block a user