diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentDocServiceImpl.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentDocServiceImpl.java index 1de7afe..ff32205 100755 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentDocServiceImpl.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentDocServiceImpl.java @@ -50,8 +50,8 @@ public class ExperimentDocServiceImpl extends ServiceImpl params) { - String absolutePath = templatePath + File.separator + docTempalteMap.get(fileName); + public String generateExperimentDoc(String experimentId, String fileName, String version) { + String absolutePath = templatePath + File.separator + version + File.separator + docTempalteMap.get(fileName); log.info("doc template path: " + absolutePath); if (!FileUtil.exist(absolutePath)) { throw new RuntimeException("模板文件不存在!"); @@ -64,9 +64,10 @@ public class ExperimentDocServiceImpl extends ServiceImpl params = new HashMap(); XWPFTemplate.compile(absolutePath).render(params).writeToFile(outputFile); String path = MinioUtil.upload(FileUtil.getInputStream(outputFile), - "experiment_doc/" + experimentId + "/" + fileName + ".docx"); + "experiment_doc/" + experimentId + "/" + version + "/" + fileName + ".docx"); return path; } catch (Exception e) { log.error(e.getMessage()); @@ -76,13 +77,14 @@ public class ExperimentDocServiceImpl extends ServiceImpl()); + String version = DateUtil.format(new Date(), DatePattern.PURE_DATETIME_PATTERN); + String filePath = generateExperimentDoc(experimentId, type, version); if (StringUtils.isNotBlank(filePath)) { ExperimentDoc experimentDoc = new ExperimentDoc(); experimentDoc.setDocType(type); experimentDoc.setExperimentId(experimentId); experimentDoc.setFilePath(filePath); - experimentDoc.setVersion(DateUtil.format(new Date(), DatePattern.PURE_DATETIME_PATTERN)); + experimentDoc.setVersion(version); this.save(experimentDoc); return experimentDoc; }