From bed432092780b40c46401357ef0119bc3e782740 Mon Sep 17 00:00:00 2001
From: ls <lslvxy@163.com>
Date: Wed, 9 Jul 2025 00:47:48 +0800
Subject: [PATCH] update

---
 .../ExperimentReportController.java           |   8 +--
 .../service/IExperimentDocService.java        |   2 +
 .../impl/ExperimentDocServiceImpl.java        |  49 ++++++++++++++++--
 templates/sybg.docx                           | Bin 38006 -> 38110 bytes
 4 files changed, 52 insertions(+), 7 deletions(-)

diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentReportController.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentReportController.java
index 2dbe84d..8438bfb 100644
--- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentReportController.java
+++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentReportController.java
@@ -127,8 +127,8 @@ public class ExperimentReportController extends JeecgController<ExperimentReport
             fileName = sampleName + "-" + modelBatch;
         }
         experimentReport.setReportName("试验报告-" + fileName);
-        experimentReportService.save(experimentReport);
-        experimentDocService.generate(experimentId, ExperimentDocType.sybg.getType());
+        boolean save = experimentReportService.save(experimentReport);
+        experimentDocService.generateExperimentReport( experimentReport.getId());
         return Result.OK("添加成功！");
     }
 
@@ -156,8 +156,8 @@ public class ExperimentReportController extends JeecgController<ExperimentReport
         //    experimentReport.setStatus(experimentReport.getLastStatus());
         //}
         experimentReportService.updateById(experimentReport);
-        experimentDocService.generate(report.getExperimentId(), ExperimentDocType.sybg.getType());
-        return Result.OK("编辑成功!");
+        String generate = experimentDocService.generateExperimentReport(experimentReport.getId());
+        return Result.OK(generate);
     }
 
     /**
diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentDocService.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentDocService.java
index b4cc8ca..04af6d7 100755
--- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentDocService.java
+++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentDocService.java
@@ -15,6 +15,8 @@ public interface IExperimentDocService extends IService<ExperimentDoc> {
 
     ExperimentDoc generate(String experimentId, String type);
 
+    String generateExperimentReport(String experimentReportId);
+
     List<ExperimentDoc> getHistoryByExperimentId(String experimentId, String type);
 
     ExperimentDoc getByExperimentId(String experimentId, String type);
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 f2119f0..b93d994 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
@@ -19,6 +19,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.xwpf.usermodel.*;
 import org.jeecg.common.util.DateUtils;
 import org.jeecg.common.util.MinioUtil;
+import org.jeecg.modules.database.constant.ExperimentDocType;
 import org.jeecg.modules.database.dto.RadiationDetailDTO;
 import org.jeecg.modules.database.dto.RadiationMapDTO;
 import org.jeecg.modules.database.entity.*;
@@ -232,9 +233,6 @@ public class ExperimentDocServiceImpl extends ServiceImpl<ExperimentDocMapper, E
                     FileUtil.mkdir(outputDir);
                 }
                 for (ExperimentReport experimentReport : reportList) {
-                    if (StringUtils.isNotBlank(experimentReport.getFileUrl())) {
-                        continue;
-                    }
                     Map<String, Object> params = assembleSybg(experimentId, experimentReport);
                     XWPFTemplate render = XWPFTemplate.compile(absolutePath).render(params);
                     String filePath = outputDir + File.separator + experimentReport.getReportName() + ".docx";
@@ -245,6 +243,7 @@ public class ExperimentDocServiceImpl extends ServiceImpl<ExperimentDocMapper, E
                     experimentReport.setFileUrl(reportPath);
                     experimentReportService.updateById(experimentReport);
                 }
+
                 File zip = ZipUtil.zip(outputDir);
                 String zipPath = MinioUtil.upload(FileUtil.getInputStream(zip),
                         "experiment_doc/" + experimentId + "/" + version + "/" + type + "-" + experiment.getName() + ".zip");
@@ -745,6 +744,50 @@ public class ExperimentDocServiceImpl extends ServiceImpl<ExperimentDocMapper, E
 
     }
 
+    @Override
+    public String generateExperimentReport(String experimentReportId) {
+        String version = DateUtil.format(new Date(), DatePattern.PURE_DATETIME_PATTERN);
+        ExperimentReport experimentReport = experimentReportService.getById(experimentReportId);
+        if (Objects.isNull(experimentReport)) {
+            return "";
+        }
+        String experimentId = experimentReport.getExperimentId();
+        String absolutePath = templatePath + File.separator + docTempalteMap.get(ExperimentDocType.sybg.getType());
+        log.info("doc template path: " + absolutePath);
+        if (!FileUtil.exist(absolutePath)) {
+            throw new RuntimeException("模板文件不存在！");
+        }
+        try {
+            Experiment experiment = experimentService.getById(experimentId);
+            if (Objects.isNull(experiment)) {
+                throw new RuntimeException("实验数据不存在！");
+            }
+            String tmpDirPath = FileUtil.getTmpDirPath();
+
+            List<String> pathList = new ArrayList<>();
+
+            String outputDir = tmpDirPath + ExperimentDocType.sybg.getType() + File.separator + experimentId + File.separator + version;
+            if (FileUtil.exist(outputDir)) {
+                FileUtil.del(outputDir);
+            }
+            if (!FileUtil.exist(outputDir)) {
+                FileUtil.mkdir(outputDir);
+            }
+            Map<String, Object> params = assembleSybg(experimentId, experimentReport);
+            XWPFTemplate render = XWPFTemplate.compile(absolutePath).render(params);
+            String filePath = outputDir + File.separator + experimentReport.getReportName() + ".docx";
+            render.writeToFile(filePath);
+            String reportPath = MinioUtil.upload(FileUtil.getInputStream(filePath),
+                    "experiment_doc/" + experimentId + "/" + version + "/" + experimentReport.getReportName() + ".docx");
+            experimentReport.setFileUrl(reportPath);
+            experimentReportService.updateById(experimentReport);
+            return reportPath;
+        } catch (Exception e) {
+            log.error(e.getMessage());
+            return "";
+        }
+    }
+
     @Override
     public ExperimentDoc generate(String experimentId, String type) {
         String version = DateUtil.format(new Date(), DatePattern.PURE_DATETIME_PATTERN);
diff --git a/templates/sybg.docx b/templates/sybg.docx
index ff672d38111c0b5b1f45a4030ea3e930225a1343..a6e481a2902efc1e9899a304b5f10dbefb1b912e 100644
GIT binary patch
delta 5396
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

delta 5271
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
RL;wbeiX?Voa`=BD{tp8AUUvWh