From 3b75c8cf561035c41d25d5b8765a7c89375ca264 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期日, 12 五月 2024 08:00:32 +0800
Subject: [PATCH] 各bug修复；
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsReportServiceImpl.java | 118 ++++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 96 insertions(+), 22 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 4195719..52eded4 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,34 +1,40 @@
package com.yuanchu.mom.service.impl;
-import com.alibaba.fastjson.JSON;
+import com.aspose.words.License;
+import com.aspose.words.SaveFormat;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.spire.doc.Document;
-import com.spire.doc.FileFormat;
+import com.deepoove.poi.XWPFTemplate;
+import com.deepoove.poi.data.Pictures;
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.InsReportMapper;
import com.yuanchu.mom.mapper.UserMapper;
+import com.yuanchu.mom.pojo.InsOrder;
import com.yuanchu.mom.pojo.InsReport;
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.core.io.ClassPathResource;
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.FileOutputStream;
import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Paths;
import java.time.LocalDateTime;
import java.util.HashMap;
import java.util.Map;
+import java.util.concurrent.CompletableFuture;
/**
* @author Administrator
@@ -51,6 +57,12 @@
@Value("${wordUrl}")
private String wordUrl;
+ @Value("${file.path}")
+ private String imgUrl;
+
+ @Resource
+ private InsOrderMapper insOrderMapper;
+
@Override
public Map<String, Object> pageInsReport(Page page, ReportPageDto reportPageDto) {
Map<String, Object> map = new HashMap<>();
@@ -59,18 +71,6 @@
if (map1.get("look") == 1) reportPageDto.setCreateUser(map1.get("userId"));
map.put("body", insReportMapper.pageInsReport(page, QueryWrappers.queryWrappers(reportPageDto)));
return map;
- }
-
- @Override
- public String wordToHtml(String path) {
- try(ByteArrayOutputStream outputStream = new ByteArrayOutputStream()) {
- Document document = new Document();
- document.loadFromFile(path.replace("/word", wordUrl));
- document.saveToFile(outputStream, FileFormat.Html);
- return outputStream.toString();
- } catch (Exception e) {
- throw new ErrorException("杞崲澶辫触");
- }
}
@Override
@@ -100,6 +100,9 @@
String url = insReport.getUrl();
//鎵嬪姩涓婁紶鎶ュ憡鍦板潃
String urlS = insReport.getUrlS();
+ wordInsertUrl(new HashMap<String, Object>(){{
+ put("writeUrl", Pictures.ofLocal(imgUrl+"/"+signatureUrl).create());
+ }}, (urlS==null?url:urlS).replace("/word", wordUrl));
return insReportMapper.updateById(insReport);
}
@@ -116,6 +119,7 @@
if (isExamine==0){
//濡傛灉瀹℃牳涓嶉�氳繃
insReport.setState(0);//鎻愪氦鐘舵�佹敼涓哄緟鎻愪氦
+ return insReportMapper.updateById(insReport);
}
//鑾峰彇瀹℃牳浜虹殑绛惧悕鍦板潃
String signatureUrl = userMapper.selectById(insReport.getExamineUserId()).getSignatureUrl();
@@ -123,12 +127,15 @@
String url = insReport.getUrl();
//鎵嬪姩涓婁紶鎶ュ憡鍦板潃
String urlS = insReport.getUrlS();
-
+ wordInsertUrl(new HashMap<String, Object>(){{
+ put("examineUrl", Pictures.ofLocal(imgUrl+"/"+signatureUrl).create());
+ }}, (urlS==null?url:urlS).replace("/word", wordUrl));
return insReportMapper.updateById(insReport);
}
//鎵瑰噯
@Override
+ @Transactional(rollbackFor = Exception.class)
public int ratifyReport(Integer id, Integer isRatify, String ratifyTell) {
InsReport insReport = insReportMapper.selectById(id);
insReport.setIsRatify(isRatify);
@@ -140,6 +147,7 @@
if (isRatify==0){
//濡傛灉鎵瑰噯涓嶉�氳繃
insReport.setState(0);//鎻愪氦鐘舵�佹敼涓哄緟鎻愪氦
+ return insReportMapper.updateById(insReport);
}
//鑾峰彇瀹℃牳浜虹殑绛惧悕鍦板潃
String signatureUrl = userMapper.selectById(insReport.getRatifyUserId()).getSignatureUrl();
@@ -147,9 +155,75 @@
String url = insReport.getUrl();
//鎵嬪姩涓婁紶鎶ュ憡鍦板潃
String urlS = insReport.getUrlS();
-
+ 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);
+ insOrderMapper.updateById(insOrder);
return insReportMapper.updateById(insReport);
}
+
+ @Override
+ public int wordInsertUrl(Map<String, Object> map, String url) {
+ XWPFTemplate template = XWPFTemplate.compile(url).render(map);
+ try {
+ template.writeAndClose(Files.newOutputStream(Paths.get(url)));
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ return 1;
+ }
+
+ @Override
+ public void wordToPdf(String path) {
+ CompletableFuture.supplyAsync(() -> {
+ try {
+ wordToPdf(path, path.replace(".docx", ".pdf"));
+ return null;
+ } catch (Exception e) {
+ throw new ErrorException("杞崲澶辫触");
+ }
+ }).thenAccept(res -> {
+ }).exceptionally(e -> {
+ e.printStackTrace();
+ return null;
+ });
+ }
+
+ public String wordToPdf(String wordPath,String pdfPath) {
+ FileOutputStream os = null;
+ try {
+ //鍑瘉 涓嶇劧鍒囨崲鍚庢湁姘村嵃
+// InputStream inputStream = this.getClass().getResourceAsStream("/lib/license.xml");
+ InputStream is = new ClassPathResource("/lib/license.xml").getInputStream();
+ License license = new License();
+ license.setLicense(is);
+ if (!license.getIsLicensed()) {
+ System.out.println("License楠岃瘉涓嶉�氳繃...");
+ return null;
+ }
+ //鐢熸垚涓�涓┖鐨凱DF鏂囦欢
+ File file = new File(pdfPath);
+ os = new FileOutputStream(file);
+ //瑕佽浆鎹㈢殑word鏂囦欢
+ com.aspose.words.Document doc = new com.aspose.words.Document(wordPath);
+ doc.save(os, SaveFormat.PDF);
+ } catch (Exception e) {
+ e.printStackTrace();
+ } finally {
+ if (os != null) {
+ try {
+ os.close();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+ return null;
+ }
}
--
Gitblit v1.9.3