From 72f6490f736d60710b930d68dc087e6e503a9625 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 24 六月 2025 15:36:05 +0800
Subject: [PATCH] zjh20250624
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java | 130 ++++++------------------------------------
1 files changed, 20 insertions(+), 110 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..fae36ba 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
@@ -83,8 +83,8 @@
private IDictCompService dictCompService;
@Resource
private ITjReportTemplateService reportTemplateService;
- @Value("${path.filePath}")
- private String value;
+// @Value("${path.filePath}")
+// private String value;
@Value("${path.reportServer}")
private String urlValue;
@Resource
@@ -284,35 +284,8 @@
@GetMapping("/toPdf/{TjNumber}")
@ApiOperation(value = "鎵撳嵃浣撴鎶ュ憡涓簆df")
- @Transactional
+// @Transactional
public AjaxResult toPdf(@PathVariable("TjNumber") @ApiParam(value = "浣撴鍙�") String tjNumber) {
- // AjaxResult error = null;
- // 涔嬪墠鐨勪唬鐮� 浼樺寲閫熷害
-// System.out.println("----------------------------------oldFun寮�濮�-------------------------------------------------------");
-// error = oldFun(tjNumber);
-// System.out.println("--------------------------------------缁撴潫---------------------------------------------------");
- // 鎾ら攢鎿嶄綔
-// revocationReport(tjNumber);
-// 鏍规嵁鏌愪汉tj鍙蜂互鍙奝roId杩涜鎵撳嵃鍓嶇殑璇锋眰
-// tjCheckController.getTjdetailList(tjNumber,null,1);
-// List<UpdateOrderRemarkVo> updateOrderRemarkVos = new ArrayList<>();
-// UpdateOrderRemarkVo remarkVo = new UpdateOrderRemarkVo();
-// remarkVo.setRemarks("鏈寮傚父");
-// remarkVo.setTjNumber("02132240308102232");
-// remarkVo.setProId("1633660948860522555");
-// updateOrderRemarkVos.add(remarkVo);
-// tjCheckController.checkUpdateOrderRemark(updateOrderRemarkVos);
-// System.out.println("---------------------------------------newFun寮�濮�--------------------------------------------------");
- // 浠ュ墠娴嬭瘯pdf鏂规硶
-// error = newFun(tjNumber);
-// System.out.println("-------------------------------------------缁撴潫----------------------------------------------");
- // 鎾ら攢
-// revocationReport(tjNumber);
-// if (error != null) {
-// return error;
-// }
-// return AjaxResult.success("璇ョ敤鎴蜂綋妫�鏈畬鎴愶紝涓嶈兘鎵撳嵃鎶ュ憡锛侊紒锛�");
-
TjOrder tjOrder = tjOrderService.getOrderByTjNum(tjNumber);
if (null != tjOrder) {
String config = configService.selectConfigByKey("sfjcwjhyqxm");
@@ -333,11 +306,6 @@
wqa.eq(TjReport::getType, "浣撴鎶ュ憡");
Integer count = tjReportService.getSelectCount(wqa);
if (tjOrder.getReportTime() !=null || count != 0 ) {
-// tjOrder.setReportTime(null);
-// tjOrder.setCheckTime(null);
-// tjOrder.setCheckStatus(0);
-// tjOrder.setPrintLastTime(null);
-// tjOrderService.updateById(tjOrder);
return AjaxResult.error("璇ュ鎴锋姤鍛婂凡鐢熸垚锛佷笉鑳介噸澶嶇敓鎴愶紒鍙洿鎺ラ瑙堟垨鎵撳嵃锛�");
}
@@ -345,32 +313,6 @@
tjReportTemplateLambdaQueryWrapper.eq(TjReportTemplate::getFlag, 1);
tjReportTemplateLambdaQueryWrapper.eq(TjReportTemplate::getOpen, 0);
TjReportTemplate reportTemplate = reportTemplateService.getOne(tjReportTemplateLambdaQueryWrapper);
-// if (tjOrder.getTjCategory() != null) {
-// //鏌ヨ瀛楀吀
-// LambdaQueryWrapper<SysDictData> wqq = new LambdaQueryWrapper<>();
-// wqq.eq(SysDictData::getDictType, "dict_tjtype");
-// wqq.eq(SysDictData::getDictValue, tjOrder.getTjCategory());
-// SysDictData one = dictDataService.getOne(wqq);
-// if (one != null) {
-// //鏌ヨ瀛楀吀
-// LambdaQueryWrapper<SysDictData> wqq1 = new LambdaQueryWrapper<>();
-// wqq1.eq(SysDictData::getDictType, "report_template_type");
-// wqq1.eq(SysDictData::getDictLabel, one.getDictLabel());
-// SysDictData one1 = dictDataService.getOne(wqq1);
-// if (one1 != null) {
-// tjReportTemplateLambdaQueryWrapper.eq(TjReportTemplate::getFlag, one1.getDictValue());
-// } else {
-// tjReportTemplateLambdaQueryWrapper.eq(TjReportTemplate::getFlag, 1);
-// }
-// } else {
-// tjReportTemplateLambdaQueryWrapper.eq(TjReportTemplate::getFlag, 1);
-// }
-// tjReportTemplateLambdaQueryWrapper.eq(TjReportTemplate::getOpen, 0);
-// reportTemplate = reportTemplateService.getOne(tjReportTemplateLambdaQueryWrapper);
-// } else {
-// tjReportTemplateLambdaQueryWrapper.eq(TjReportTemplate::getOpen, 0);
-// reportTemplate = reportTemplateService.list(tjReportTemplateLambdaQueryWrapper).get(2);
-// }
Integer checkStatus = tjOrder.getCheckStatus();
if (checkStatus == 1) {
if ("鎶ヨ〃".equals(reportTemplate.getPrint())) {
@@ -384,25 +326,10 @@
LambdaUpdateWrapper<TjOrder> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.eq(TjOrder::getTjNumber, tjNumber);
updateWrapper.set(TjOrder::getReportTime, new Date());
-// updateWrapper.set(TjOrder::getPrintLastTime, new Date());
-// updateWrapper.set(TjOrder::getDownloadLastTime, new Date());
updateWrapper.set(TjOrder::getStatus, TjConstants.TJ_END);
tjOrderService.update(updateWrapper);
return AjaxResult.success("宸茬敓鎴愭姤鍛婏紒鍙洿鎺ョ偣鍑婚瑙堬紒");
}
-// String hisRegistrationId = tjOrder.getCardId();
-// Date createTime = tjOrder.getCreateTime();
-// SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-// String ksrq = dateFormat.format(createTime);
-// String jsrq = dateFormat.format(new Date());
-// HashMap<String, Object> params = new HashMap<>();
-// params.put("his_registration_id", hisRegistrationId);
-// params.put("ksbm", "");
-// params.put("pationid", "");
-// params.put("ksrq", ksrq);
-// params.put("jsrq", jsrq);
-// params.put("pagecount", 100);
-// params.put("page", 1);
LambdaQueryWrapper<TjCustomer> wq1 = new LambdaQueryWrapper<>();
wq1.eq(TjCustomer::getCusId, tjOrder.getUserId());
TjCustomer tjCustomer = tjCustomerService.getOne(wq1);
@@ -413,15 +340,14 @@
try {
return shengchengbgmoban(tjNumber, tjOrder, tjCustomer, reportTemplate,zongJianYiShiQianMing);
} catch (Exception e) {
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- log.error(String.valueOf(e));
+// throw new Exception(e);
+ log.error("鐢熸垚鎶ュ憡澶辫触锛�"+e.getMessage(),String.valueOf(e));
+ e.printStackTrace();
tjOrder.setReportTime(null);
tjOrder.setCheckTime(null);
tjOrder.setCheckStatus(0);
tjOrder.setPrintLastTime(null);
tjOrderService.updateById(tjOrder);
-
- logger.error(String.valueOf(e));
return AjaxResult.error("鐢熸垚鎶ュ憡澶辫触");
}
} else {
@@ -431,19 +357,16 @@
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 {
+ String value = configService.selectConfigByKey("path_filePath");
AjaxResult ajaxResult = null;
try {
-// ajaxResult = hisPDFUtil.hisPDF(tjOrder, tjCustomer, reportTemplate);
-// ajaxResult = hisPDFUtil.hisPDFNew(tjOrder, tjCustomer, reportTemplate);
-
ajaxResult = hisPDFUtil.hisPDFNew2(tjOrder, tjCustomer, reportTemplate,zongJianYiShiQianMing);
} catch (Exception e) {
- e.printStackTrace();
- log.error(String.valueOf(e));
+ throw new Exception(e);
}
if (!ajaxResult.get("code").toString().equals("200")) {
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return AjaxResult.error("鐢熸垚鎶ュ憡澶辫触");
} else {
Long userId = tjCustomer.getCusId();
String outputFileName1 = userId + tjNumber + tjCustomer.getCusName() + "_鎶ュ憡.pdf";
@@ -451,8 +374,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 +899,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<>();
@@ -986,6 +909,7 @@
// if (one == null) {
// return;
// }
+ String value = configService.selectConfigByKey("path_filePath");
String key = DataSourceContextHolder.getDataSourceKey();
key = key.replace("ltkjpeis10_","");
// String userId = SecurityUtils.getLoginUser().getUsername();
@@ -1005,7 +929,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 +944,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 +951,7 @@
} catch (IOException e) {
e.printStackTrace();
//System.out.println("pdf澶勭悊鏂囦欢寮傚父" + e);
+// response.sendError(HttpServletResponse.SC_NOT_FOUND);
} finally {
if (out != null) {
try {
@@ -1071,15 +984,11 @@
}
String key = DataSourceContextHolder.getDataSourceKey();
key = key.replace("ltkjpeis10_","");
-
+ String value = configService.selectConfigByKey("path_filePath");
// 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;
@@ -1147,8 +1056,9 @@
public AjaxResult preview(@RequestBody String data) {
String is_batch_report_use_sql = configService.selectConfigByKey("is_batch_report_use_sql");
List<String> tjNumbers = Arrays.stream(data.split(",")).collect(Collectors.toList());
+ String value = configService.selectConfigByKey("path_filePath");
if ("true".equals(is_batch_report_use_sql)) {
- return tjReportService.makeBatchReport(tjNumbers);
+ return tjReportService.makeBatchReport(tjNumbers, value);
} else {
return makeReport(tjNumbers);
}
--
Gitblit v1.8.0