From b87b01b5267a7715eba68253674f6843f76e0a5b Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期二, 08 四月 2025 18:05:56 +0800
Subject: [PATCH] 2025-04-08

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java |   27 ++++++---------------------
 1 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java
index 3243c0d..d683c46 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java
@@ -451,8 +451,8 @@
             tjReport.setTjNumber(String.valueOf(tjNumber));
             tjReport.setPath(urlValue + outputFileName1);
             String outputPath1 = value + File.separator;
-            String pdfBinary = getPDFBinary(outputPath1 + outputFileName1);
-            tjReport.setReport(pdfBinary);
+//            String pdfBinary = getPDFBinary(outputPath1 + outputFileName1);
+//            tjReport.setReport(pdfBinary);
             tjReport.setType("浣撴鎶ュ憡");
             tjReport.setPrint("pdf");
             tjReportService.save(tjReport);
@@ -976,7 +976,7 @@
 
     @GetMapping("/preview/{flag}/{TjNumber}")
     @ApiOperation(value = "涓嬭浇浣撴鎶ュ憡")
-    public void preview(HttpServletResponse response, @PathVariable("flag") boolean flag, @PathVariable("TjNumber") String tjNumber) {
+    public void preview(HttpServletResponse response, @PathVariable("flag") boolean flag, @PathVariable("TjNumber") String tjNumber) throws IOException {
         TjOrder tjOrder = tjOrderService.getOrderByTjNum(tjNumber);
         TjCustomer tjCustomer = tjCustomerService.getById( tjOrder.getUserId());
 //        LambdaQueryWrapper<TjReport> we = new LambdaQueryWrapper<>();
@@ -1005,7 +1005,6 @@
             if (flag) {
                 // 鍦ㄧ嚎鎵撳紑鏂瑰紡
                 URL u = new URL("file:///" + filePath);
-                //System.out.println(u);
                 String contentType = u.openConnection().getContentType();
                 response.setContentType(contentType);
                 response.setHeader("Content-Disposition", "inline;filename="
@@ -1021,17 +1020,6 @@
             while ((len = br.read(bs)) > 0) {
                 out.write(bs, 0, len);
             }
-//            if(null !=tjOrder.getHeshouTime() && tjOrder.getHeshouStatus()==1){
-//                TjReportPrint print=new TjReportPrint();
-//                print.setTjNumber(tjNumber);
-//                print.setPrintBy(SecurityUtils.getLoginUser().getUser().getNickName());
-//                print.setPrintTime(date);
-//                print.setPrintStatus("宸叉墦鍗�");
-//                if (printService.save(print)) {
-//                    tjOrder.setPrintLastTime(date);
-//                    tjOrderService.updateById(tjOrder);
-//                }
-//            }
             out.flush();
             out.close();
             br.close();
@@ -1039,6 +1027,7 @@
         } catch (IOException e) {
             e.printStackTrace();
             //System.out.println("pdf澶勭悊鏂囦欢寮傚父" + e);
+//            response.sendError(HttpServletResponse.SC_NOT_FOUND);
         } finally {
             if (out != null) {
                 try {
@@ -1073,13 +1062,9 @@
         key = key.replace("ltkjpeis10_","");
 
 //        String userId = SecurityUtils.getLoginUser().getUsername();
-        PDFBinaryUtil.base64StringToPDF(one.getReport(), FileUtil.mkdir(value).getPath() + File.separator + key + File.separator + tjCustomer.getCusId() + tjNumber + tjCustomer.getCusName() + "_浣撴鎶ュ憡.pdf");
-        String filePath = value + File.separator + key + File.separator + tjCustomer.getCusId() + tjNumber + tjCustomer.getCusName() + "_浣撴鎶ュ憡.pdf";
+//        PDFBinaryUtil.base64StringToPDF(one.getReport(), FileUtil.mkdir(value).getPath() + File.separator + key + File.separator + tjCustomer.getCusId() + tjNumber + tjCustomer.getCusName() + "_浣撴鎶ュ憡.pdf");
+        String filePath = value + File.separator + key + File.separator + tjCustomer.getCusId() + tjNumber + tjCustomer.getCusName() + "_鎶ュ憡.pdf";
         File f = new File(filePath);
-        if (filePath.isEmpty()) {
-            System.out.println("鏂囦欢涓嶅瓨鍦紒");
-            return;
-        }
         BufferedInputStream br = null;
         OutputStream out = null;
         FileInputStream fileInputStream = null;

--
Gitblit v1.8.0