From 7e73e7699d55b4b229bef4dc5d89e01aedef5a19 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期一, 19 五月 2025 17:13:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java | 77 +++++++++++++++++++-------------------
1 files changed, 38 insertions(+), 39 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 dc8cccb..c585dbb 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
@@ -283,7 +283,7 @@
@GetMapping("/toPdf/{TjNumber}")
@ApiOperation(value = "鎵撳嵃浣撴鎶ュ憡涓簆df")
- @Transactional
+// @Transactional
public AjaxResult toPdf(@PathVariable("TjNumber") @ApiParam(value = "浣撴鍙�") String tjNumber) {
// AjaxResult error = null;
// 涔嬪墠鐨勪唬鐮� 浼樺寲閫熷害
@@ -412,15 +412,15 @@
try {
return shengchengbgmoban(tjNumber, tjOrder, tjCustomer, reportTemplate,zongJianYiShiQianMing);
} catch (Exception e) {
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- log.error(String.valueOf(e));
+// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ log.error("鐢熸垚鎶ュ憡澶辫触锛�"+e.getMessage(),String.valueOf(e));
tjOrder.setReportTime(null);
tjOrder.setCheckTime(null);
tjOrder.setCheckStatus(0);
tjOrder.setPrintLastTime(null);
tjOrderService.updateById(tjOrder);
- logger.error(String.valueOf(e));
+// logger.error(String.valueOf(e));
return AjaxResult.error("鐢熸垚鎶ュ憡澶辫触");
}
} else {
@@ -430,7 +430,7 @@
return AjaxResult.error();
}
- public AjaxResult shengchengbgmoban(String tjNumber, TjOrder tjOrder, TjCustomer tjCustomer, TjReportTemplate reportTemplate,TjReportTemplate zongJianYiShiQianMing) {
+ public AjaxResult shengchengbgmoban(String tjNumber, TjOrder tjOrder, TjCustomer tjCustomer, TjReportTemplate reportTemplate,TjReportTemplate zongJianYiShiQianMing) throws Exception {
AjaxResult ajaxResult = null;
try {
// ajaxResult = hisPDFUtil.hisPDF(tjOrder, tjCustomer, reportTemplate);
@@ -438,11 +438,13 @@
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")) {
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return AjaxResult.error("鐢熸垚鎶ュ憡澶辫触");
} else {
Long userId = tjCustomer.getCusId();
String outputFileName1 = userId + tjNumber + tjCustomer.getCusName() + "_鎶ュ憡.pdf";
@@ -450,8 +452,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);
@@ -1736,21 +1738,17 @@
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 filePath = value + File.separator + userId + tjNumber + tjCustomer.getCusName() + "_浣撴鎶ュ憡.pdf";
+// 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 filePath = value + 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;
@@ -1767,13 +1765,13 @@
String contentType = u.openConnection().getContentType();
response.setContentType(contentType);
response.setHeader("Content-Disposition", "inline;filename="
- + userId + tjNumber + ".pdf");
+ + tjCustomer.getCusId() + tjNumber + ".pdf");
} else {
// 绾笅杞芥柟寮�
response.setContentType("application/x-msdownload");
response.setContentType("application/pdf;charset=utf-8");
response.setHeader("Content-Disposition", "attachment;filename="
- + userId + tjNumber + ".pdf");
+ + tjCustomer.getCusId() + tjNumber + ".pdf");
}
out = response.getOutputStream();
while ((len = br.read(bs)) > 0) {
@@ -1820,17 +1818,18 @@
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 filePath = value + File.separator + userId + tjNumber + tjCustomer.getCusName() + "_浣撴鎶ュ憡.pdf";
+// 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 filePath = value + File.separator + userId + tjNumber + tjCustomer.getCusName() + "_浣撴鎶ュ憡.pdf";
+ String filePath = value + File.separator + tjCustomer.getCusId() + tjNumber + tjCustomer.getCusName() + "_鎶ュ憡.pdf";
File f = new File(filePath);
if (filePath.isEmpty()) {
System.out.println("鏂囦欢涓嶅瓨鍦紒");
@@ -1852,13 +1851,13 @@
String contentType = u.openConnection().getContentType();
response.setContentType(contentType);
response.setHeader("Content-Disposition", "inline;filename="
- + userId + tjNumber + ".pdf");
+ + tjCustomer.getCusId() + tjNumber + ".pdf");
} else {
// 绾笅杞芥柟寮�
response.setContentType("application/x-msdownload");
response.setContentType("application/pdf;charset=utf-8");
response.setHeader("Content-Disposition", "attachment;filename="
- + userId + tjNumber + ".pdf");
+ + tjCustomer.getCusId() + tjNumber + ".pdf");
}
out = response.getOutputStream();
while ((len = br.read(bs)) > 0) {
--
Gitblit v1.8.0