From 5f1d1c462bbf49bc6a22b9e17b49733bcc1e0bc6 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 20 六月 2025 19:01:13 +0800
Subject: [PATCH] zjh20250620

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java |   31 +++++++++++++++++++++++++++++--
 1 files changed, 29 insertions(+), 2 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 896e9b6..3150cf6 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
@@ -439,8 +439,8 @@
 
             ajaxResult = hisPDFUtil.hisPDFNew2(tjOrder, tjCustomer, reportTemplate,zongJianYiShiQianMing);
         } catch (Exception e) {
-//            e.printStackTrace();
-//            log.error(String.valueOf(e));
+            e.printStackTrace();
+            log.error(String.valueOf(e));
             throw new Exception(e);
         }
         if (!ajaxResult.get("code").toString().equals("200")) {
@@ -1813,6 +1813,33 @@
         }
     }
 
+
+//    @GetMapping("/previewBase64/{flag}/{TjNumber}")
+//    @ApiOperation(value = "涓嬭浇浣撴鎶ュ憡Base64")
+    public String previewBase64( @PathVariable("TjNumber") String tjNumber) {
+        try {
+            TjOrder tjOrder = tjOrderService.getOrderByTjNum(tjNumber);
+            TjCustomer tjCustomer = tjCustomerService.getById( tjOrder.getUserId());
+            String value = configService.selectConfigByKey("path_filePath");
+            String filePath = value + File.separator + tjCustomer.getCusId() + tjNumber + tjCustomer.getCusName() + "_鎶ュ憡.pdf";
+            File f = new File(filePath);
+            //            System.out.println("Base64: " + base64);
+            return fileToBase64(f);
+        } catch (IOException e) {
+            log.error(e.toString());
+            throw new RuntimeException(e);
+        }
+    }
+
+    public static String fileToBase64(File file) throws IOException {
+        try (FileInputStream fileInputStream = new FileInputStream(file)) {
+            byte[] fileBytes = new byte[(int) file.length()];
+            fileInputStream.read(fileBytes);
+            return Base64.getEncoder().encodeToString(fileBytes);
+        }
+    }
+
+
     @GetMapping("/previewprint/{flag}/{TjNumber}/{sfdy}")
     @ApiOperation(value = "涓嬭浇浣撴鎶ュ憡")
     public void previewprint(HttpServletResponse response, @PathVariable("flag") boolean flag, @PathVariable("TjNumber") String tjNumber,@PathVariable("sfdy") String sfdy) {

--
Gitblit v1.8.0