From 92db9e7f8e1f79f5b61266382149843159907157 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 12 八月 2025 18:03:00 +0800
Subject: [PATCH] zjh20250812
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java | 54 +++++++++++++++++++++++++++++++-----------------------
1 files changed, 31 insertions(+), 23 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..792f564 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
@@ -413,7 +413,7 @@
return shengchengbgmoban(tjNumber, tjOrder, tjCustomer, reportTemplate,zongJianYiShiQianMing);
} catch (Exception e) {
// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- log.error("鐢熸垚鎶ュ憡澶辫触锛�"+e.getMessage(),String.valueOf(e));
+ log.error("鐢熸垚鎶ュ憡澶辫触锛�",e);
tjOrder.setReportTime(null);
tjOrder.setCheckTime(null);
tjOrder.setCheckStatus(0);
@@ -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")) {
@@ -1741,15 +1741,6 @@
public void preview(HttpServletResponse response, @PathVariable("flag") boolean flag, @PathVariable("TjNumber") String tjNumber) {
TjOrder tjOrder = tjOrderService.getOrderByTjNum(tjNumber);
TjCustomer tjCustomer = tjCustomerService.getById( tjOrder.getUserId());
-// LambdaQueryWrapper<TjReport> we = new LambdaQueryWrapper<>();
-// we.eq(TjReport::getTjNumber, tjNumber);
-// we.eq(TjReport::getType, "浣撴鎶ュ憡");
-// TjReport one = tjReportService.getOne(we);
-// if (one == null) {
-// return;
-// }
-// String userId = SecurityUtils.getLoginUser().getUsername();
-// PDFBinaryUtil.base64StringToPDF(one.getReport(), FileUtil.mkdir(value).getPath() + File.separator + userId + tjNumber + tjCustomer.getCusName() + "_浣撴鎶ュ憡.pdf");
String value = configService.selectConfigByKey("path_filePath");
String filePath = value + File.separator + tjCustomer.getCusId() + tjNumber + tjCustomer.getCusName() + "_鎶ュ憡.pdf";
File f = new File(filePath);
@@ -1781,17 +1772,7 @@
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();
@@ -1813,6 +1794,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