From e6935db4b362cf5cbb9a34640a23be669ff8ebe4 Mon Sep 17 00:00:00 2001
From: "jian.wang" <824612544@qq.com>
Date: Tue, 21 May 2024 14:48:18 +0800
Subject: [PATCH] =?UTF-8?q?bug:=E8=A7=A3=E5=86=B3pdf=E5=8E=8B=E7=BC=A9?=
 =?UTF-8?q?=E5=8C=85=E4=B8=8B=E8=BD=BD=E6=96=87=E4=BB=B6=E4=B8=AD=E6=96=87?=
 =?UTF-8?q?=E4=B9=B1=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templateSearch/TemplateSearchController.java          | 7 ++-----
 .../emr/service/batchExport/BatchExportServiceImpl.java   | 8 ++------
 src/main/java/com/emr/util/img2PdfUtil.java               | 3 +--
 3 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/emr/controller/templateSearch/TemplateSearchController.java b/src/main/java/com/emr/controller/templateSearch/TemplateSearchController.java
index 9a867c9..98a2752 100644
--- a/src/main/java/com/emr/controller/templateSearch/TemplateSearchController.java
+++ b/src/main/java/com/emr/controller/templateSearch/TemplateSearchController.java
@@ -36,7 +36,6 @@ import com.emr.vo.commomSearch.ScanPathVo;
 import com.emr.vo.templateSearch.Emr_Modle_RelatedVo;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -48,15 +47,14 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.*;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipOutputStream;
+import org.apache.tools.zip.ZipEntry;
+import org.apache.tools.zip.ZipOutputStream;
 
 /**
  * @ProjectName:TemplateSearchController
@@ -1337,7 +1335,6 @@ public class TemplateSearchController {
                 List<String> scanPathList = vo.getScanPathList();
                 //每个文件名
                 String fileName = vo.getInpatientNo().trim() + "-" + vo.getName().trim() + "-" + disDate.trim() + "_" + fmt.format(new Date());
-                fileName = java.net.URLEncoder.encode(fileName, "UTF-8");
                 zos.putNextEntry(new ZipEntry(fileName + ".pdf"));
                 //合成pdf
                 out = new ByteArrayOutputStream();
diff --git a/src/main/java/com/emr/service/batchExport/BatchExportServiceImpl.java b/src/main/java/com/emr/service/batchExport/BatchExportServiceImpl.java
index 8f07b33..309767b 100644
--- a/src/main/java/com/emr/service/batchExport/BatchExportServiceImpl.java
+++ b/src/main/java/com/emr/service/batchExport/BatchExportServiceImpl.java
@@ -8,13 +8,13 @@ import com.emr.util.Logger;
 import com.emr.util.img2PdfUtil;
 import com.emr.vo.ExportDetailsVo;
 import com.emr.vo.ExportTaskDetailsVo;
-import com.emr.vo.commomSearch.ScanPathVo;
-import com.itextpdf.kernel.pdf.PdfDocument;
 import com.itextpdf.text.Document;
 import com.itextpdf.text.Image;
 import com.itextpdf.text.PageSize;
 import com.itextpdf.text.pdf.*;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.tools.zip.ZipEntry;
+import org.apache.tools.zip.ZipOutputStream;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -26,10 +26,6 @@ import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipOutputStream;
-
-import static com.emr.util.img2PdfUtil.addWaterMark;
 
 /**
  * @ClassName BatchExportServiceImpl
diff --git a/src/main/java/com/emr/util/img2PdfUtil.java b/src/main/java/com/emr/util/img2PdfUtil.java
index f0131cb..c3b9b38 100644
--- a/src/main/java/com/emr/util/img2PdfUtil.java
+++ b/src/main/java/com/emr/util/img2PdfUtil.java
@@ -9,6 +9,7 @@ import com.lowagie.text.DocumentException;
 import com.lowagie.text.Element;
 import com.lowagie.text.pdf.*;
 import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
@@ -542,8 +543,6 @@ public class img2PdfUtil {
             ExceptionPrintUtil.printException(e);
             e.printStackTrace();
         } finally {
-            System.out.println("-------------------------第一个流---------------------"+ stamper);
-            System.out.println("-------------------------第二个流---------------------"+ reader);
             if (null != stamper) {
                 try {
                     stamper.close();