From 799c0abc3691c63806e978af57c2e16a96da7cca Mon Sep 17 00:00:00 2001
From: whycxzp <perryhsu@163.com>
Date: 星期五, 16 九月 2022 15:53:58 +0800
Subject: [PATCH] 更新图纸对比
---
src/main/java/com/whyc/service/MaterialService.java | 40 ++++++++++++++++++++++++----------------
1 files changed, 24 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/whyc/service/MaterialService.java b/src/main/java/com/whyc/service/MaterialService.java
index 67b9a48..a515f97 100644
--- a/src/main/java/com/whyc/service/MaterialService.java
+++ b/src/main/java/com/whyc/service/MaterialService.java
@@ -12,6 +12,7 @@
import com.whyc.pojo.ProductBom;
import com.whyc.util.DateUtil;
import com.whyc.util.*;
+import org.apache.commons.codec.binary.Base64;
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
import org.apache.poi.ss.usermodel.*;
import org.springframework.beans.factory.annotation.Autowired;
@@ -23,7 +24,10 @@
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
-import java.io.*;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
@@ -453,20 +457,24 @@
}
ByteArrayOutputStream stream = ImageDiff.compareImages(absoluteDwgPngPath, absoluteDwgPngPath2);
- String fileName = "name.png";
- OutputStream toClient = null;
- try {
- response.setContentType("application/octet-stream");
- response.addHeader("Content-Disposition","attachment;filename=" + fileName);
- toClient = response.getOutputStream();
- toClient.write(stream.toByteArray());
- toClient.flush();
- toClient.close();
- } catch (IOException e) {
- e.printStackTrace();
- }
-
-
- return null;
+ return new Response().setII(1,true, Base64.encodeBase64(stream.toByteArray()),null);
+ //String fileName = "name.png";
+ //OutputStream toClient = null;
+ //try {
+ // response.setContentType("application/octet-stream");
+ // response.setHeader("Content-Disposition","attachment;filename=" + fileName);
+ // response.addHeader("Pragma", "no-cache");
+ // response.addHeader("Cache-Control", "no-cache");
+ // toClient = response.getOutputStream();
+ // stream.writeTo(toClient);
+ // //toClient.write(stream.toByteArray());
+ // toClient.flush();
+ // toClient.close();
+ //} catch (IOException e) {
+ // e.printStackTrace();
+ //}
+ //
+ //
+ //return null;
}
}
--
Gitblit v1.9.1