ClientApps/CN_Gather
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

微调

Browse Source
This commit is contained in:
caozehui
2025-12-10 09:17:31 +08:00
parent eb068b76a4
commit 5105e77823
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
detection/src/main/java/com/njcn/gather/report/service/impl/PqReportServiceImpl.java
View File

@@ -310,8 +310,8 @@ public class PqReportServiceImpl extends ServiceImpl<PqReportMapper, PqReport> i
private void uploadFile(ReportParam reportParam, PqReport pqReport, boolean isAdd) { private void uploadFile(ReportParam reportParam, PqReport pqReport, boolean isAdd) {
MultipartFile baseFile = reportParam.getBaseFile(); MultipartFile baseFile = reportParam.getBaseFile();
MultipartFile detailFile = reportParam.getDetailFile(); MultipartFile detailFile = reportParam.getDetailFile();
String relativePath = File.separator + reportParam.getName() + File.separator + reportParam.getVersion() + File.separator; String relativePath = reportParam.getName() + File.separator + reportParam.getVersion() + File.separator;
String newDir = templatePath + relativePath; String newDir = templatePath + File.separator + relativePath;
long FILE_SIZE_LIMIT = 5 * 1024 * 1024; long FILE_SIZE_LIMIT = 5 * 1024 * 1024;
if (isAdd) { if (isAdd) {
@@ -388,13 +388,13 @@ public class PqReportServiceImpl extends ServiceImpl<PqReportMapper, PqReport> i
// 文件夹重命名 // 文件夹重命名
String oldBasePathStr = oldPqReport.getBasePath(); String oldBasePathStr = oldPqReport.getBasePath();
String baseName = oldBasePathStr.substring(oldBasePathStr.lastIndexOf(File.separator) + 1); String baseName = oldBasePathStr.substring(oldBasePathStr.lastIndexOf(File.separator) + 1);
Path oldBasePath = Paths.get(templatePath + oldBasePathStr); Path oldBasePath = Paths.get(templatePath + File.separator + oldBasePathStr);
Path newBasePath = Paths.get(newDir + baseName); Path newBasePath = Paths.get(newDir + baseName);
pqReport.setBasePath(relativePath + baseName); pqReport.setBasePath(relativePath + baseName);
String oldDetailPathStr = oldPqReport.getDetailPath(); String oldDetailPathStr = oldPqReport.getDetailPath();
String detailName = oldDetailPathStr.substring(oldDetailPathStr.lastIndexOf(File.separator) + 1); String detailName = oldDetailPathStr.substring(oldDetailPathStr.lastIndexOf(File.separator) + 1);
Path oldDetailPath = Paths.get(templatePath + oldDetailPathStr); Path oldDetailPath = Paths.get(templatePath + File.separator + oldDetailPathStr);
Path newDetailPath = Paths.get(newDir + detailName); Path newDetailPath = Paths.get(newDir + detailName);
pqReport.setDetailPath(relativePath + detailName); pqReport.setDetailPath(relativePath + detailName);
@@ -420,13 +420,13 @@ public class PqReportServiceImpl extends ServiceImpl<PqReportMapper, PqReport> i
if (!baseFileOriginalFilename.isEmpty()) { if (!baseFileOriginalFilename.isEmpty()) {
pqReport.setBasePath(relativePath + baseFileOriginalFilename); pqReport.setBasePath(relativePath + baseFileOriginalFilename);
Paths.get(templatePath + oldPqReport.getBasePath()).toFile().delete(); Paths.get(templatePath + File.separator + oldPqReport.getBasePath()).toFile().delete();
Paths.get(newDir + oldPqReport.getBasePath().substring(oldPqReport.getBasePath().lastIndexOf(File.separator) + 1)).toFile().delete(); Paths.get(newDir + oldPqReport.getBasePath().substring(oldPqReport.getBasePath().lastIndexOf(File.separator) + 1)).toFile().delete();
this.uploadFile(baseFile, newDir + baseFileOriginalFilename); this.uploadFile(baseFile, newDir + baseFileOriginalFilename);
} }
if (!detailFileOriginalFilename.isEmpty()) { if (!detailFileOriginalFilename.isEmpty()) {
pqReport.setDetailPath(relativePath + detailFileOriginalFilename); pqReport.setDetailPath(relativePath + detailFileOriginalFilename);
Paths.get(templatePath + oldPqReport.getDetailPath()).toFile().delete(); Paths.get(templatePath + File.separator + oldPqReport.getDetailPath()).toFile().delete();
Paths.get(newDir + oldPqReport.getDetailPath().substring(oldPqReport.getDetailPath().lastIndexOf(File.separator) + 1)).toFile().delete(); Paths.get(newDir + oldPqReport.getDetailPath().substring(oldPqReport.getDetailPath().lastIndexOf(File.separator) + 1)).toFile().delete();
this.uploadFile(detailFile, newDir + detailFileOriginalFilename); this.uploadFile(detailFile, newDir + detailFileOriginalFilename);
} }
@@ -801,8 +801,8 @@ public class PqReportServiceImpl extends ServiceImpl<PqReportMapper, PqReport> i
if (Objects.isNull(report)) { if (Objects.isNull(report)) {
throw new BusinessException(ReportResponseEnum.REPORT_TEMPLATE_NOT_EXIST); throw new BusinessException(ReportResponseEnum.REPORT_TEMPLATE_NOT_EXIST);
} }
Path basePath = Paths.get(templatePath + report.getBasePath()); Path basePath = Paths.get(templatePath + File.separator + report.getBasePath());
Path detailPath = Paths.get(templatePath + report.getDetailPath()); Path detailPath = Paths.get(templatePath + File.separator + report.getDetailPath());
try (InputStream baseInputStream = Files.newInputStream(basePath); try (InputStream baseInputStream = Files.newInputStream(basePath);
InputStream detailInputStream = Files.newInputStream(detailPath)) { InputStream detailInputStream = Files.newInputStream(detailPath)) {
WordprocessingMLPackage detailModelDocument = WordprocessingMLPackage.load(detailInputStream); WordprocessingMLPackage detailModelDocument = WordprocessingMLPackage.load(detailInputStream);
@@ -878,8 +878,8 @@ public class PqReportServiceImpl extends ServiceImpl<PqReportMapper, PqReport> i
if (Objects.isNull(report)) { if (Objects.isNull(report)) {
throw new BusinessException(ReportResponseEnum.REPORT_TEMPLATE_NOT_EXIST); throw new BusinessException(ReportResponseEnum.REPORT_TEMPLATE_NOT_EXIST);
} }
Path basePath = Paths.get(templatePath + report.getBasePath()); Path basePath = Paths.get(templatePath + File.separator + report.getBasePath());
Path detailPath = Paths.get(templatePath + report.getDetailPath()); Path detailPath = Paths.get(templatePath + File.separator + report.getDetailPath());
try (InputStream baseInputStream = Files.newInputStream(basePath); try (InputStream baseInputStream = Files.newInputStream(basePath);
InputStream detailInputStream = Files.newInputStream(detailPath)) { InputStream detailInputStream = Files.newInputStream(detailPath)) {
WordprocessingMLPackage detailModelDocument = WordprocessingMLPackage.load(detailInputStream); WordprocessingMLPackage detailModelDocument = WordprocessingMLPackage.load(detailInputStream);