From cfdaaae8690e188f6971057259873aa408ebc9e3 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期四, 25 四月 2024 16:49:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsReportServiceImpl.java | 27 +++++++++++++++++++++------
1 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsReportServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsReportServiceImpl.java
index 7e38126..2392e16 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsReportServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsReportServiceImpl.java
@@ -1,6 +1,5 @@
package com.yuanchu.mom.service.impl;
-import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -11,9 +10,7 @@
import com.spire.doc.FileFormat;
import com.yuanchu.mom.common.GetLook;
import com.yuanchu.mom.common.PrintChina;
-import com.yuanchu.mom.dto.InsOrderPlanDTO;
import com.yuanchu.mom.dto.ReportPageDto;
-import com.yuanchu.mom.dto.SampleOrderDto;
import com.yuanchu.mom.exception.ErrorException;
import com.yuanchu.mom.mapper.InsOrderMapper;
import com.yuanchu.mom.mapper.UserMapper;
@@ -22,21 +19,19 @@
import com.yuanchu.mom.service.InsReportService;
import com.yuanchu.mom.mapper.InsReportMapper;
import com.yuanchu.mom.utils.QueryWrappers;
-import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.io.ByteArrayOutputStream;
-import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
import java.util.HashMap;
import java.util.Map;
+import java.util.concurrent.CompletableFuture;
/**
* @author Administrator
@@ -172,6 +167,7 @@
wordInsertUrl(new HashMap<String, Object>(){{
put("ratifyUrl", Pictures.ofLocal(imgUrl+"/"+signatureUrl).create());
}}, (urlS==null?url:urlS).replace("/word", wordUrl));
+ wordToPdf((urlS == null ? url : urlS).replace("/word", wordUrl));
InsOrder insOrder = new InsOrder();
insOrder.setId(insReportMapper.selectById(id).getInsOrderId());
insOrder.setState(4);
@@ -189,6 +185,25 @@
}
return 1;
}
+
+ @Override
+ public void wordToPdf(String path) {
+ CompletableFuture.supplyAsync(() -> {
+ try(ByteArrayOutputStream outputStream = new ByteArrayOutputStream()) {
+ Document document = new Document();
+ document.loadFromFile(path);
+ document.saveToFile(path.replace(".docx", ".pdf"), FileFormat.PDF);
+ System.out.println(path.replace(".docx", ".pdf"));
+ return null;
+ } catch (Exception e) {
+ throw new ErrorException("杞崲澶辫触");
+ }
+ }).thenAccept(res -> {
+ }).exceptionally(e -> {
+ e.printStackTrace();
+ return null;
+ });
+ }
}
--
Gitblit v1.9.3