diff --git a/physical-module-system/physical-system-biz/pom.xml b/physical-module-system/physical-system-biz/pom.xml index cc1958f..1656d31 100644 --- a/physical-module-system/physical-system-biz/pom.xml +++ b/physical-module-system/physical-system-biz/pom.xml @@ -23,11 +23,11 @@ poi-ooxml 4.1.2 - - com.deepoove - poi-tl - 1.12.2 - + + + + + org.jeecgframework.boot physical-system-api 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 a5bdfb8..ee85a88 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 @@ -5,19 +5,19 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.io.FileUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.deepoove.poi.XWPFTemplate; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import org.apache.poi.xwpf.usermodel.XWPFDocument; import org.jeecg.common.util.MinioUtil; import org.jeecg.modules.database.entity.*; import org.jeecg.modules.database.mapper.ExperimentDocMapper; import org.jeecg.modules.database.service.*; +import org.jeecgframework.poi.word.WordExportUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; -import java.io.File; -import java.io.IOException; +import java.io.*; import java.util.*; /** @@ -72,7 +72,10 @@ public class ExperimentDocServiceImpl extends ServiceImpl params = assembleParams(experimentId, fileName); - XWPFTemplate.compile(absolutePath).render(params).writeToFile(outputFile); + XWPFDocument doc = WordExportUtil.exportWord07(absolutePath, params); + FileOutputStream fos = new FileOutputStream(outputFile); + doc.write(fos); + fos.close(); String path = MinioUtil.upload(FileUtil.getInputStream(outputFile), "experiment_doc/" + experimentId + "/" + version + "/" + experiment.getName() + "-" + fileName + ".docx"); return path;