|
@@ -15,6 +15,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
import com.github.jfcloud.common.core.constant.enums.YesNoEnum;
|
|
import com.github.jfcloud.common.core.constant.enums.YesNoEnum;
|
|
|
import com.github.jfcloud.common.file.core.FileProperties;
|
|
import com.github.jfcloud.common.file.core.FileProperties;
|
|
|
import com.github.jfcloud.common.file.core.FileTemplate;
|
|
import com.github.jfcloud.common.file.core.FileTemplate;
|
|
|
|
|
+import com.github.jfcloud.gene.config.Docx4jHelper;
|
|
|
import com.github.jfcloud.gene.file.entity.FileInfo;
|
|
import com.github.jfcloud.gene.file.entity.FileInfo;
|
|
|
import com.github.jfcloud.gene.file.mapper.FileInfoMapper;
|
|
import com.github.jfcloud.gene.file.mapper.FileInfoMapper;
|
|
|
import com.github.jfcloud.gene.file.service.FileInfoService;
|
|
import com.github.jfcloud.gene.file.service.FileInfoService;
|
|
@@ -25,7 +26,6 @@ import com.github.jfcloud.gene.util.WordUtil;
|
|
|
import com.github.jfcloud.web.controller.JfcloudRestController;
|
|
import com.github.jfcloud.web.controller.JfcloudRestController;
|
|
|
import lombok.RequiredArgsConstructor;
|
|
import lombok.RequiredArgsConstructor;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
-import org.docx4j.Docx4J;
|
|
|
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
import javax.servlet.http.HttpServletRequest;
|
|
@@ -75,7 +75,7 @@ public class FileInfoServiceImpl extends ServiceImpl<FileInfoMapper, FileInfo> i
|
|
|
try (InputStream inputStream = WordUtil.exportWord(modelName, dataMap);
|
|
try (InputStream inputStream = WordUtil.exportWord(modelName, dataMap);
|
|
|
ByteArrayOutputStream out = new ByteArrayOutputStream()) {
|
|
ByteArrayOutputStream out = new ByteArrayOutputStream()) {
|
|
|
//转化为docx文件
|
|
//转化为docx文件
|
|
|
- Docx4J.save(Docx4J.load(inputStream), out);
|
|
|
|
|
|
|
+ Docx4jHelper.convert(inputStream, out);
|
|
|
|
|
|
|
|
//上传至文件服务器
|
|
//上传至文件服务器
|
|
|
byte[] byteArray = out.toByteArray();
|
|
byte[] byteArray = out.toByteArray();
|