From c42f62b32bac302a7ac9fcde7489f7c5fc6e11aa Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 06 十二月 2024 15:35:17 +0800
Subject: [PATCH] zjh20241205-3
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java | 525 +++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 445 insertions(+), 80 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 ba93a39..5441cdd 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
@@ -2,10 +2,10 @@
import java.io.*;
import java.net.URL;
-import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.text.NumberFormat;
+import java.text.SimpleDateFormat;
import java.util.*;
import java.util.List;
import java.util.stream.Collectors;
@@ -20,7 +20,6 @@
import com.itextpdf.text.*;
import com.itextpdf.text.pdf.*;
import com.itextpdf.text.pdf.draw.LineSeparator;
-import com.ltkj.common.annotation.Log;
import com.ltkj.common.core.domain.entity.SysDictData;
import com.ltkj.common.utils.DateUtils;
import com.ltkj.common.utils.PDFDocumentUtil;
@@ -29,20 +28,20 @@
import com.ltkj.framework.config.MatchUtils;
import com.ltkj.hosp.domain.*;
import com.ltkj.hosp.service.*;
-import com.ltkj.hosp.vodomain.UpdateOrderRemarkVo;
import com.ltkj.mall.mallOrderUtils.TjConstants;
import com.ltkj.system.service.ISysConfigService;
import com.ltkj.system.service.ISysDictDataService;
import com.ltkj.system.service.ISysUserService;
import com.ltkj.web.config.pdfutils.MergePdf;
-import com.ltkj.web.config.pdfutils.MyHeaderFooter;
import com.ltkj.web.config.pdfutils.PDFBinaryUtil;
import com.ltkj.web.config.pdfutils.PdfUtils;
+import com.ltkj.web.controller.his.HisPDFUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
import org.springframework.web.bind.annotation.*;
@@ -59,7 +58,7 @@
*/
@RestController
@RequestMapping("/system/report")
-@Api(tags = "浣撴鎶ュ憡")
+@Api(tags = "AAAA_浣撴鎶ュ憡")
@Transactional
public class TjReportController extends BaseController {
@Resource
@@ -97,21 +96,24 @@
private ISysDictDataService dictDataService;
@Resource
private ITbTransitionService transitionService;
-
@Autowired
private ITjBigPositiveService tjBigPositiveService;
+ @Autowired
+ private HisPDFUtil hisPDFUtil;
@GetMapping("/savePdf")
@ApiOperation(value = "浠庢湰鍦板瓨鍌ㄦā鏉垮埌鏁版嵁搴�")
public AjaxResult savePdf() {
//浠庢枃浠跺湴鍧�璇诲叆PDF鏂囦欢 浠呭瓨鍌ㄤ竴娆�
- String base64String = PDFBinaryUtil.getPDFBinary("D:\\Tjreport\\浣撴妯℃澘5.pdf");
+ String base64String = PDFBinaryUtil.getPDFBinary(configService.selectConfigByKey("default_pdf5Template"));
+ reportTemplateService.remove(new LambdaQueryWrapper<TjReportTemplate>().eq(TjReportTemplate::getName,"浣撴鎶ュ憡妯℃澘5"));
TjReportTemplate tem = new TjReportTemplate();
tem.setName("浣撴鎶ュ憡妯℃澘5");
tem.setRemark("浣撴鎶ュ憡妯℃澘5");
tem.setTemplate(base64String);
tem.setFlag("1");
tem.setOpen("0");
+ tem.setCreateTime(DateUtil.date());
final boolean save = reportTemplateService.save(tem);
if (save) {
return AjaxResult.success("淇濆瓨鎴愬姛");
@@ -271,7 +273,7 @@
@ApiOperation(value = "鎵撳嵃浣撴鎶ュ憡涓簆df")
@Transactional
public AjaxResult toPdf(@PathVariable("TjNumber") @ApiParam(value = "浣撴鍙�") String tjNumber) {
- AjaxResult error = null;
+ // AjaxResult error = null;
// 涔嬪墠鐨勪唬鐮� 浼樺寲閫熷害
// System.out.println("----------------------------------oldFun寮�濮�-------------------------------------------------------");
// error = oldFun(tjNumber);
@@ -287,15 +289,173 @@
// remarkVo.setProId("1633660948860522555");
// updateOrderRemarkVos.add(remarkVo);
// tjCheckController.checkUpdateOrderRemark(updateOrderRemarkVos);
- System.out.println("---------------------------------------newFun寮�濮�--------------------------------------------------");
- error = newFun(tjNumber);
- System.out.println("-------------------------------------------缁撴潫----------------------------------------------");
+// System.out.println("---------------------------------------newFun寮�濮�--------------------------------------------------");
+ // 浠ュ墠娴嬭瘯pdf鏂规硶
+// error = newFun(tjNumber);
+// System.out.println("-------------------------------------------缁撴潫----------------------------------------------");
// 鎾ら攢
// revocationReport(tjNumber);
- if (error != null) {
- return error;
+// if (error != null) {
+// return error;
+// }
+// return AjaxResult.success("璇ョ敤鎴蜂綋妫�鏈畬鎴愶紝涓嶈兘鎵撳嵃鎶ュ憡锛侊紒锛�");
+ String config = configService.selectConfigByKey("sfjcwjhyqxm");
+ if(null != config && config.equalsIgnoreCase("Y")){
+ int num = tjOrderRemarkService.getTjYqOrderRemarkByTjNum(tjNumber);
+ if (num > 0) return AjaxResult.error("瀛樺湪鏈鎴栧欢鏈熼」鐩殏涓嶈兘鐢熸垚鎶ュ憡!!!");
}
- return AjaxResult.success("璇ョ敤鎴蜂綋妫�鏈畬鎴愶紝涓嶈兘鎵撳嵃鎶ュ憡锛侊紒锛�");
+
+// String configByKey = configService.selectConfigByKey("sfkqdyhis");
+ String configByKey = "Y";
+ LambdaQueryWrapper<TjOrder> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(TjOrder::getTjNumber, tjNumber);
+ TjOrder tjOrder = tjOrderService.getOne(queryWrapper);
+ if (null != tjOrder) {
+
+ //鍒ゆ柇琛ㄤ腑鏈夋病鏈夎浣撴鎶ュ憡 涓嶈兘閲嶅鐢熸垚
+ LambdaQueryWrapper<TjReport> wqa = new LambdaQueryWrapper<>();
+ wqa.eq(TjReport::getTjNumber, tjNumber);
+ wqa.eq(TjReport::getType, "浣撴鎶ュ憡");
+ Integer count = tjReportService.getSelectCount(wqa);
+
+ if (tjOrder.getReportTime() !=null || count != 0 ) {
+ return AjaxResult.error("璇ュ鎴锋姤鍛婂凡鐢熸垚锛佷笉鑳介噸澶嶇敓鎴愶紒鍙洿鎺ラ瑙堟垨鎵撳嵃锛�");
+ }
+
+ LambdaQueryWrapper<TjReportTemplate> tjReportTemplateLambdaQueryWrapper = new LambdaQueryWrapper<>();
+ 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())) {
+ TjReport tjReport = new TjReport();
+ tjReport.setTjNumber(String.valueOf(tjNumber));
+ tjReport.setPath(reportTemplate.getUrl() + "?tjNum=" + tjNumber);
+ tjReport.setType("浣撴鎶ュ憡");
+ tjReport.setPrint("鎶ヨ〃");
+ tjReportService.save(tjReport);
+ //淇敼order琛ㄤ腑鐨勬墦鍗版姤鍛婃椂闂翠负褰撳墠鏃堕棿
+ 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();
+ Date finishTime = tjOrder.getFinishTime();
+ 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);
+ try {
+ return shengchengbgmoban(tjNumber, tjOrder, tjCustomer, reportTemplate);
+ } catch (Exception e) {
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ e.printStackTrace();
+ // 璋冪敤鎾ら攢
+// tjReportController.backOnlyCheckType(tjNumber);
+ logger.error("鐢熸垚鎶ュ憡寮傚父");
+ return AjaxResult.error("鐢熸垚鎶ュ憡澶辫触");
+ }
+ } else {
+ return AjaxResult.error("璇峰厛鎬绘");
+ }
+ }
+ return AjaxResult.error();
+ }
+
+ public AjaxResult shengchengbgmoban(String tjNumber, TjOrder tjOrder, TjCustomer tjCustomer, TjReportTemplate reportTemplate) throws Exception {
+ AjaxResult ajaxResult = hisPDFUtil.hisPDF(tjOrder, tjCustomer, reportTemplate);
+ if (!ajaxResult.get("code").toString().equals("200")) {
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ } else {
+ Long userId = tjCustomer.getCusId();
+ String outputFileName1 = userId + tjNumber + tjCustomer.getCusName() + "_鎶ュ憡.pdf";
+ TjReport tjReport = new TjReport();
+ tjReport.setTjNumber(String.valueOf(tjNumber));
+ tjReport.setPath(urlValue + outputFileName1);
+ String outputPath1 = value + File.separator;
+ String pdfBinary = getPDFBinary(outputPath1 + outputFileName1);
+ tjReport.setReport(pdfBinary);
+ tjReport.setType("浣撴鎶ュ憡");
+ tjReport.setPrint("pdf");
+ tjReportService.save(tjReport);
+ Date date = new Date();
+ // LambdaUpdateWrapper<TjOrder> updateWrapper = new LambdaUpdateWrapper<>();
+// updateWrapper.eq(TjOrder::getTjNumber, tjNumber);
+// updateWrapper.set(TjOrder::getReportTime, date);
+// updateWrapper.set(TjOrder::getPrintLastTime, date);
+// updateWrapper.set(TjOrder::getDownloadLastTime,date);
+// updateWrapper.set(TjOrder::getStatus, TjConstants.TJ_END);
+ tjOrder.setStatus(TjConstants.TJ_END);
+ tjOrder.setReportTime(date);
+ tjOrder.setPrintLastTime(date);
+ tjOrder.setDownloadLastTime(date);
+ tjOrderService.updateById(tjOrder);
+ }
+ return ajaxResult;
+ }
+
+
+ /**
+ * 鎾ら攢
+ * @param tjNumber
+ */
+ @Transactional(propagation = Propagation.REQUIRES_NEW)
+ public void backOnlyCheckType(String tjNumber) {
+ QueryWrapper<TjOrder> wq2 = new QueryWrapper<>();
+ wq2.eq("tj_number", tjNumber);
+ TjOrder one = tjOrderService.getOne(wq2);
+ one.setCheckStatus(0);
+ String config = configService.selectConfigByKey("tj_confirm");
+ if ("Y".equals(config)) {
+ one.setStatus(TjConstants.TJ_CHECK);
+ } else {
+ one.setStatus(TjConstants.TJ_CONFIRM);
+ }
+ //灏嗙姸鎬佹敼涓烘湭瀹℃牳
+ tjOrderService.updateById(one);
}
private AjaxResult newFun(String tjNumber) {
@@ -466,7 +626,7 @@
for (String key : data.keySet()) {
form.setField(key, data.get(key).toString());
}
- System.out.println("pdf濉厖琛ㄥ崟鏁版嵁鑰楁椂锛�"+(System.currentTimeMillis() - pdfMkStart));
+ System.out.println("pdf濉厖琛ㄥ崟鏁版嵁鑰楁椂锛�" + (System.currentTimeMillis() - pdfMkStart));
//璁剧疆涓烘棤娉曠紪杈�
ps.setFormFlattening(true);
ps.close();
@@ -535,11 +695,11 @@
}
}
long fujianEnd = System.currentTimeMillis();
- System.out.println("闄勪欢鏌ヨ鑰楁椂锛�"+(fujianEnd - fujianStart));
- System.out.println("鏂囦欢淇濆瓨鍓嶈�楁椂锛�"+(fujianEnd - pdfMkStart));
+ System.out.println("闄勪欢鏌ヨ鑰楁椂锛�" + (fujianEnd - fujianStart));
+ System.out.println("鏂囦欢淇濆瓨鍓嶈�楁椂锛�" + (fujianEnd - pdfMkStart));
// 淇濆瓨pdf鏂囦欢
copy.close();
- String outputPath1 = value + "\\";
+ String outputPath1 = value + File.separator;
String outputFileName1 = userId + tjNumber + tjCustomer.getCusName() + "new_浣撴鎶ュ憡.pdf";
File file = new File(outputPath1 + outputFileName1);
BufferedOutputStream outputStream = new BufferedOutputStream(new FileOutputStream(file));
@@ -650,12 +810,8 @@
//pdfWriter.setPageEvent(new MyHeaderFooter());// 椤电湁椤佃剼
document.open();
document.add(new Header("鍋ュ悍浣撴缁撴灉", "鍋ュ悍浣撴缁撴灉"));
- long addTableStartTime = System.currentTimeMillis();
Map<TjOrderRemark, List<TjPdfVO>> tjOrderRemarkObjectMap = addTable(tjNumber);
- System.out.println("addTable鏂规硶鑰楁椂锛�" + (System.currentTimeMillis() - addTableStartTime) + "ms");
- addTableStartTime = System.currentTimeMillis();
Map<TjOrderRemark, List<TjPdfVO>> tjOrderRemarkListMap = addHuaYanTable(tjNumber);
- System.out.println("addHuaYanTable鏂规硶鑰楁椂锛�" + (System.currentTimeMillis() - addTableStartTime) + "ms");
tjOrderRemarkObjectMap.putAll(tjOrderRemarkListMap);
for (Map.Entry<TjOrderRemark, List<TjPdfVO>> entry : tjOrderRemarkObjectMap.entrySet()) {
List<TjPdfVO> value = entry.getValue();
@@ -869,7 +1025,7 @@
String template = reportTemplate.getTemplate();
String userId = SecurityUtils.getLoginUser().getUsername();
if (template != null) {
- PDFBinaryUtil.base64StringToPDF(template, FileUtil.mkdir(value).getPath() + "\\" + userId + "浣撴鎶ュ憡灏侀潰妯℃澘.pdf");
+ PDFBinaryUtil.base64StringToPDF(template, FileUtil.mkdir(value).getPath() + File.separator + userId + "浣撴鎶ュ憡灏侀潰妯℃澘.pdf");
}
// --------浠ヤ笂------- 鏍规嵁鏁版嵁搴撲腑鐨勬ā鏉夸簩杩涘埗鏂囦欢 杞琾df 鍒涘缓鏂囦欢澶� 灏唒df鏀捐繘鏈湴鏂囦欢澶�
@@ -892,8 +1048,8 @@
tjOrderDetail.setProject(tjProject);
}
- String inputFileName = value + "\\" + userId + "浣撴鎶ュ憡灏侀潰妯℃澘.pdf";
- String outputFileName = value + "\\" + userId + "浣撴鎶ュ憡灏侀潰椤�.pdf";
+ String inputFileName = value + File.separator + userId + "浣撴鎶ュ憡灏侀潰妯℃澘.pdf";
+ String outputFileName = value + File.separator + userId + "浣撴鎶ュ憡灏侀潰椤�.pdf";
OutputStream os = null;
PdfStamper ps = null;
PdfReader reader = null;
@@ -1016,7 +1172,7 @@
//璁剧疆鏂囨。鐨勯〉杈硅窛灏辨槸璺濈椤甸潰杈逛笂鐨勮窛绂伙紝鍒嗗埆涓猴細宸﹁竟璺濓紝鍙宠竟璺濓紝涓婅竟璺濓紝涓嬭竟璺�
document.setMargins(70, 70, 40, 40);
//鐢熸垚pdf鐨勪綅缃互鍙婂悕绉�
- String fileName = value + "\\" + userId + tjNumber + "浣撴鎶ュ憡椤圭洰璇︽儏椤�.pdf";
+ String fileName = value + File.separator + userId + tjNumber + "浣撴鎶ュ憡椤圭洰璇︽儏椤�.pdf";
OutputStream outputStream = Files.newOutputStream(Paths.get(fileName));
PdfWriter pdfWriter = PdfWriter.getInstance(document, outputStream);
@@ -1183,7 +1339,7 @@
// TjReport one11111 = tjReportService.getOne(rtwq1);
// if(null !=one11111){
// String report1 = one11111.getReport();
-// PDFBinaryUtil.base64StringToPDF(report1, FileUtil.mkdir(value).getPath() + "\\" + userId + "鍖诲鍚嶈瘝.pdf");
+// PDFBinaryUtil.base64StringToPDF(report1, FileUtil.mkdir(value).getPath() + File.separator + userId + "鍖诲鍚嶈瘝.pdf");
// }
LambdaQueryWrapper<TjReport> rtwq = new LambdaQueryWrapper<>();
@@ -1192,7 +1348,7 @@
TjReport one1111 = tjReportService.getOne(rtwq);
if (null != one1111) {
String report = one1111.getReport();
- PDFBinaryUtil.base64StringToPDF(report, FileUtil.mkdir(value).getPath() + "\\" + tjNumber + userId + "蹇冪數鍥�.pdf");
+ PDFBinaryUtil.base64StringToPDF(report, FileUtil.mkdir(value).getPath() + File.separator + tjNumber + userId + "蹇冪數鍥�.pdf");
}
LambdaQueryWrapper<TjReport> rtwq12 = new LambdaQueryWrapper<>();
@@ -1201,27 +1357,27 @@
TjReport one111112 = tjReportService.getOne(rtwq12);
if (null != one111112) {
String report12 = one111112.getReport();
- PDFBinaryUtil.base64StringToPDF(report12, FileUtil.mkdir(value).getPath() + "\\" + tjNumber + userId + "闄勪欢.pdf");
+ PDFBinaryUtil.base64StringToPDF(report12, FileUtil.mkdir(value).getPath() + File.separator + tjNumber + userId + "闄勪欢.pdf");
}
//鍚堝苟
String[] files1 = null;
if (one1111 != null) {
if (one111112 != null) {
- files1 = new String[]{value + "\\" + userId + "浣撴鎶ュ憡灏侀潰椤�.pdf", value + "\\" + userId + tjNumber + "浣撴鎶ュ憡椤圭洰璇︽儏椤�.pdf", value + "\\" + tjNumber + userId + "闄勪欢.pdf", value + "\\" + tjNumber + userId + "蹇冪數鍥�.pdf"};
+ files1 = new String[]{value + File.separator + userId + "浣撴鎶ュ憡灏侀潰椤�.pdf", value + File.separator + userId + tjNumber + "浣撴鎶ュ憡椤圭洰璇︽儏椤�.pdf", value + File.separator + tjNumber + userId + "闄勪欢.pdf", value + File.separator + tjNumber + userId + "蹇冪數鍥�.pdf"};
} else {
- files1 = new String[]{value + "\\" + userId + "浣撴鎶ュ憡灏侀潰椤�.pdf", value + "\\" + userId + tjNumber + "浣撴鎶ュ憡椤圭洰璇︽儏椤�.pdf", value + "\\" + tjNumber + userId + "蹇冪數鍥�.pdf"};
+ files1 = new String[]{value + File.separator + userId + "浣撴鎶ュ憡灏侀潰椤�.pdf", value + File.separator + userId + tjNumber + "浣撴鎶ュ憡椤圭洰璇︽儏椤�.pdf", value + File.separator + tjNumber + userId + "蹇冪數鍥�.pdf"};
}
} else {
if (one111112 != null) {
- files1 = new String[]{value + "\\" + userId + "浣撴鎶ュ憡灏侀潰椤�.pdf", value + "\\" + userId + tjNumber + "浣撴鎶ュ憡椤圭洰璇︽儏椤�.pdf", value + "\\" + tjNumber + userId + "闄勪欢.pdf"};
+ files1 = new String[]{value + File.separator + userId + "浣撴鎶ュ憡灏侀潰椤�.pdf", value + File.separator + userId + tjNumber + "浣撴鎶ュ憡椤圭洰璇︽儏椤�.pdf", value + File.separator + tjNumber + userId + "闄勪欢.pdf"};
} else {
- files1 = new String[]{value + "\\" + userId + "浣撴鎶ュ憡灏侀潰椤�.pdf", value + "\\" + userId + tjNumber + "浣撴鎶ュ憡椤圭洰璇︽儏椤�.pdf"};
+ files1 = new String[]{value + File.separator + userId + "浣撴鎶ュ憡灏侀潰椤�.pdf", value + File.separator + userId + tjNumber + "浣撴鎶ュ憡椤圭洰璇︽儏椤�.pdf"};
}
}
//鍚堝苟
-// String[] files1 = {value + "\\" + userId + "浣撴鎶ュ憡灏侀潰椤�.pdf", value + "\\" + userId + tjNumber+"浣撴鎶ュ憡椤圭洰璇︽儏椤�.pdf", value + "\\" +tjNumber+ userId + "闄勪欢.pdf", value + "\\" + tjNumber + userId + "蹇冪數鍥�.pdf"};
- String outputPath1 = value + "\\";
+// String[] files1 = {value + File.separator + userId + "浣撴鎶ュ憡灏侀潰椤�.pdf", value + File.separator + userId + tjNumber+"浣撴鎶ュ憡椤圭洰璇︽儏椤�.pdf", value + File.separator +tjNumber+ userId + "闄勪欢.pdf", value + File.separator + tjNumber + userId + "蹇冪數鍥�.pdf"};
+ String outputPath1 = value + File.separator;
String outputFileName1 = userId + tjNumber + tjCustomer.getCusName() + "_浣撴鎶ュ憡.pdf";
File file1 = new File(outputPath1 + outputFileName1);
@@ -1240,11 +1396,11 @@
tjReport.setPrint("pdf");
tjReportService.save(tjReport);
- //FileUtil.del(value + "\\" + tjNumber + "浣撴鎶ュ憡.pdf");
- //FileUtil.del(value + "\\" + userId + "浣撴鎶ュ憡灏侀潰妯℃澘.pdf");
- //FileUtil.del(value + "\\" + userId +tjNumber+ "浣撴鎶ュ憡椤圭洰璇︽儏椤�.pdf");
- //FileUtil.del(value + "\\" + userId + "浣撴鎶ュ憡灏侀潰椤�.pdf");
- //FileUtil.del(value + "\\" + userId + "蹇冪數鍥�.pdf");
+ //FileUtil.del(value + File.separator + tjNumber + "浣撴鎶ュ憡.pdf");
+ //FileUtil.del(value + File.separator + userId + "浣撴鎶ュ憡灏侀潰妯℃澘.pdf");
+ //FileUtil.del(value + File.separator + userId +tjNumber+ "浣撴鎶ュ憡椤圭洰璇︽儏椤�.pdf");
+ //FileUtil.del(value + File.separator + userId + "浣撴鎶ュ憡灏侀潰椤�.pdf");
+ //FileUtil.del(value + File.separator + userId + "蹇冪數鍥�.pdf");
//淇敼order琛ㄤ腑鐨勬墦鍗版姤鍛婃椂闂翠负褰撳墠鏃堕棿
@@ -1263,7 +1419,7 @@
e.printStackTrace();
return AjaxResult.success("PDF瀵煎嚭澶辫触");
} finally {
- transitionService.deletedTbTransitionListByCusIdAndTjNum(tjCustomer.getCusIdcard(), tjOrder.getCardId());
+// transitionService.deletedTbTransitionListByCusIdAndTjNum(tjCustomer.getCusIdcard(), tjOrder.getCardId());
}
}
}
@@ -1315,9 +1471,7 @@
printReport.put(tjOrderRemark, null);
}
// extracted(printReport, one, customer);
- long start = System.currentTimeMillis();
extractedNew(printReport, one, customer);
- System.out.println("extractedNew鏂规硶鑰楁椂锛�"+(System.currentTimeMillis() - start));
return printReport;
}
@@ -1327,36 +1481,12 @@
//鍒涘缓map 閿负鐖堕」鐩� 鍊间负瀛愰」鐩泦鍚�
Map<TjOrderRemark, List<TjPdfVO>> printReport = new LinkedHashMap<>();
//鏌ュ埌璇ュ鎴风殑浣撴璁板綍
-// LambdaQueryWrapper<TjOrder> wq1 = new LambdaQueryWrapper<>();
-// wq1.eq(TjOrder::getTjNumber, tjNumber);
-// TjOrder one = tjOrderService.getOne(wq1);
//鎷垮埌浣撴璁板綍鐨刼rderid锛屾煡鍑洪」鐩缁嗕俊鎭�
-// LambdaQueryWrapper<TjOrderDetail> wq = new LambdaQueryWrapper<>();
-// wq.eq(TjOrderDetail::getOrderId, one.getOrderId());
-// //20230323鍒ゆ柇椤圭洰宸叉
-// wq.ne(TjOrderDetail::getTjStatus, 0);
-// wq.eq(TjOrderDetail::getProId,projectService.getHuaYanProId());
-// List<TjOrderDetail> tjOrderDetails = tjOrderDetailService.list(wq);
- List<TjOrderDetail> tjOrderDetails = tjOrderDetailService.addHuaYanTable(tjNumber);
- //閬嶅巻浣撴璁板綍 灏嗛」鐩殑鍏蜂綋淇℃伅
- //閬嶅巻瀹㈡埛鎵�閫夌殑椤圭洰(鍖呭惈瀛愰」鐖堕」)
-// for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
-// TjProject tjProject = projectService.getById(tjOrderDetail.getProId());
-// if (null != tjProject) {
-// tjOrderDetail.setProject(tjProject);
-// }
-// }
-// LambdaQueryWrapper<TjCustomer> wq22 = new LambdaQueryWrapper<>();
-// wq22.eq(TjCustomer::getCusId, one.getUserId());
-// TjCustomer customer = tjCustomerService.getOne(wq22);
-// LambdaQueryWrapper<TjOrderRemark> wqq = new LambdaQueryWrapper<>();
-// wqq.eq(TjOrderRemark::getTjNumber, tjNumber);
-// wqq.eq(TjOrderRemark::getDeptId,"241");
-// List<TjOrderRemark> tjOrderRemarks = tjOrderRemarkService.list(wqq);
- List<TjOrderRemark> tjOrderRemarks = tjOrderRemarkService.addHuaYanTable(tjNumber);
+ List<TjOrderDetail> tjOrderDetails = tjOrderDetailService.addHuaYanAndCgTable(tjNumber);
+ List<TjOrderRemark> tjOrderRemarks = tjOrderRemarkService.addHuaYanAndCgTable(tjNumber);
for (TjOrderRemark tjOrderRemark : tjOrderRemarks) {
printReport.put(tjOrderRemark, null);
}
@@ -1364,7 +1494,7 @@
for (Map.Entry<TjOrderRemark, List<TjPdfVO>> entry : printReport.entrySet()) {
List<TjPdfVO> tjPdfVOS = new ArrayList<>();
for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
- if (entry.getKey().getProId().equals(tjOrderDetail.getProId())) {
+ if (entry.getKey().getProsId().equals(tjOrderDetail.getProsId())) {
TjPdfVO tjPdfVO = new TjPdfVO();
tjPdfVO.setProName(tjOrderDetail.getProName());
if (null != tjOrderDetail.getYcbz() && !tjOrderDetail.getYcbz().equals("")) {
@@ -1379,7 +1509,7 @@
}
}
printReport.put(entry.getKey(), tjPdfVOS);
- if (tjPdfVOS.size() == 0) {
+ if (tjPdfVOS.isEmpty()) {
toRemoveKeys.add(entry.getKey());
}
}
@@ -1469,7 +1599,7 @@
});
List<Long> proIds = tjOrderDetails.stream().map(TjOrderDetail::getProId).collect(Collectors.toList());
LambdaQueryWrapper<TjProject> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.in(TjProject::getProId,proIds);
+ queryWrapper.in(TjProject::getProId, proIds);
List<TjProject> projectList = projectService.list(queryWrapper);
for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
TjProject tjProject = projectList.stream().filter(item -> item.getProId().equals(tjOrderDetail.getProId())).collect(Collectors.toList()).get(0);
@@ -1480,11 +1610,11 @@
System.out.println("'''''''''''''''''''''''''''''''''''" + tjOrderDetail.getOrderDetailId());
}
// 鍒ゆ柇鍦╟ollect涓槸鍚﹀瓨鍦�
- if (collect.contains(tjOrderDetail.getProject().getProParentId())){
+ if (collect.contains(tjOrderDetail.getProject().getProParentId())) {
LambdaQueryWrapper<TjStandard> wq6 = new LambdaQueryWrapper<>();
wq6.eq(TjStandard::getProId, tjOrderDetail.getProId());
List<TjStandard> list2 = tjStandardService.list(wq6);
- if (list2.size() == 0) {
+ if (list2.isEmpty()) {
TjStandard s = new TjStandard();
s.setCompany(" ");
s.setTjStandardLtValue(" ");
@@ -1534,9 +1664,9 @@
tjPdfVOS.add(tjPdfVO);
}
}
- printReport.entrySet().stream().forEach(item->{
+ printReport.entrySet().stream().forEach(item -> {
List<TjPdfVO> pdfVOS = hashMap.get(item.getKey().getProId());
- printReport.put(item.getKey(),pdfVOS);
+ printReport.put(item.getKey(), pdfVOS);
});
}
@@ -1596,9 +1726,9 @@
}
String userId = SecurityUtils.getLoginUser().getUsername();
- PDFBinaryUtil.base64StringToPDF(one.getReport(), FileUtil.mkdir(value).getPath() + "\\" + userId + tjNumber + tjCustomer.getCusName() + "_浣撴鎶ュ憡.pdf");
+ PDFBinaryUtil.base64StringToPDF(one.getReport(), FileUtil.mkdir(value).getPath() + File.separator + userId + tjNumber + tjCustomer.getCusName() + "_浣撴鎶ュ憡.pdf");
//String filePath = one.getPath();
- String filePath = value + "\\" + userId + tjNumber + tjCustomer.getCusName() + "_浣撴鎶ュ憡.pdf";
+ String filePath = value + File.separator + userId + tjNumber + tjCustomer.getCusName() + "_浣撴鎶ュ憡.pdf";
File f = new File(filePath);
if (filePath.isEmpty()) {
System.out.println("鏂囦欢涓嶅瓨鍦紒");
@@ -1655,9 +1785,242 @@
@PostMapping("/preview/batch")
@ApiOperation(value = "鎵归噺浣撴鎶ュ憡")
- public AjaxResult preview(@RequestBody String data){
+ @Transactional
+ 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());
- return tjReportService.makeBatchReport(tjNumbers);
+ if ("true".equals(is_batch_report_use_sql)) {
+ return tjReportService.makeBatchReport(tjNumbers);
+ } else {
+ return makeReport(tjNumbers);
+ }
+ }
+
+ /**
+ * 閫氳繃sql 閲嶆暣鏁版嵁妯℃澘 鍏ㄩ儴閲嶆柊鐢熸垚
+ *
+ * @param tjNumbers
+ * @return
+ */
+ private AjaxResult makeReport(List<String> tjNumbers) {
+ ArrayList<String> base64Pdfs = new ArrayList<>();
+ for (String tjNumber : tjNumbers) {
+ LambdaQueryWrapper<TjOrder> wq = new LambdaQueryWrapper<>();
+ wq.eq(TjOrder::getTjNumber, tjNumber);
+ TjOrder tjOrder = tjOrderService.getOne(wq);
+ if (null != tjOrder) {
+ LambdaQueryWrapper<TjReportTemplate> tjReportTemplateLambdaQueryWrapper = new LambdaQueryWrapper<>();
+ TjReportTemplate reportTemplate = null;
+ 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);
+ }
+
+ String template = reportTemplate.getTemplate();
+ String userId = null;
+ if (template == null) {
+ // 娌℃湁璇ユā鏉�
+ continue;
+ }
+ // --------浠ヤ笂------- 鏍规嵁鏁版嵁搴撲腑鐨勬ā鏉夸簩杩涘埗鏂囦欢 杞琾df 鍒涘缓鏂囦欢澶� 灏唒df鏀捐繘鏈湴鏂囦欢澶�
+ LambdaQueryWrapper<TjCustomer> wq1 = new LambdaQueryWrapper<>();
+ wq1.eq(TjCustomer::getCusId, tjOrder.getUserId());
+ TjCustomer tjCustomer = tjCustomerService.getOne(wq1);
+ LambdaQueryWrapper<DictComp> wq111 = new LambdaQueryWrapper<>();
+ wq111.eq(DictComp::getDrugManufacturerId, tjOrder.getFirmId());
+ DictComp dictComp = dictCompService.getOne(wq111);
+ LambdaQueryWrapper<TjOrderDetail> wq2 = new LambdaQueryWrapper<>();
+ wq2.eq(TjOrderDetail::getOrderId, tjOrder.getOrderId());
+ wq2.isNotNull(TjOrderDetail::getFlowingWaterId);
+ List<TjOrderDetail> list = tjOrderDetailService.list(wq2);
+ for (TjOrderDetail tjOrderDetail : list) {
+ TjProject tjProject = projectService.selectTjProjectByProId(tjOrderDetail.getProId());
+ tjOrderDetail.setProject(tjProject);
+ }
+ ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+ PdfStamper ps = null;
+ PdfReader reader = null;
+ try {
+ // 璇诲叆pdf琛ㄥ崟
+ reader = new PdfReader(new ByteArrayInputStream(Base64.getDecoder().decode(template)));
+ // 鏍规嵁琛ㄥ崟鐢熸垚涓�涓柊鐨刾df
+ ps = new PdfStamper(reader, byteArrayOutputStream);
+ // 鑾峰彇pdf琛ㄥ崟
+ AcroFields form = ps.getAcroFields();
+ //璇ュ瓧浣撻�犳垚绫诲瀷涓嶅潎鍖�锛屼絾鏄痯df杞浘鐗囦笉涔辩爜
+ BaseFont bf = BaseFont.createFont("STSong-Light", "UniGB-UCS2-H", BaseFont.NOT_EMBEDDED);
+ form.addSubstitutionFont(bf);
+ // 濉厖鏁版嵁缁欒〃鏍�
+ Map<String, Object> data = new HashMap<>();
+ // 璁剧疆鐢ㄦ埛淇℃伅
+ setUserInfo(tjNumber, tjOrder, tjCustomer, dictComp, list, data);
+ //灏侀潰椤典笅闈㈢殑鎬绘寤鸿鏄剧ず
+ if (tjOrder.getCheckAdvice() == null) {
+ data.put("remark", "鏃�");
+ } else {
+ data.put("remark", tjOrder.getCheckAdvice());
+ }
+ //灏侀潰椤典笅闈㈢殑鎬绘寤鸿鏄剧ず
+ if (tjOrder.getCheckDoctor() == null) {
+ data.put("docname", "鏃�");
+ } else {
+ data.put("docname", tjOrder.getCheckDoctor());
+ }
+ //寮傚父椤圭洰
+ //鎷兼帴閲嶅ぇ闃虫�х粨鏋�
+ StringBuffer str = new StringBuffer();
+ str.append("銆愰噸澶ч槼鎬ч」鐩�慭n");
+ LambdaQueryWrapper<TjBigPositive> bigPositiveLambdaQueryWrapper = new LambdaQueryWrapper<>();
+ bigPositiveLambdaQueryWrapper.eq(TjBigPositive::getTjNumber, tjNumber);
+ final List<TjBigPositive> list1 = tjBigPositiveService.list(bigPositiveLambdaQueryWrapper);
+ if (list1 != null && list1.size() > 0) {
+ for (int i = 0; i < list1.size(); i++) {
+ str.append(i + 1).append("銆�").append(list1.get(i).getProName()).append(";\n");
+ }
+ } else {
+ str.append(" 鏃狅紱\n");
+ }
+ //鎷兼帴寮傚父椤圭洰
+ str.append("銆愬紓甯告儏鍐甸」鐩�慭n");
+ if (list.size() > 0) {
+ int[] index = {0};
+ List<TjOrderDetail> collect = list.stream()
+ .filter(item -> item.getExceptionDesc() == 1).collect(Collectors.toList());
+ if (collect.isEmpty()) {
+ str.append(" 鏃狅紱\n");
+ } else {
+ collect.forEach(item -> str.append(index[0]++ + 1).append("銆�").append(projectService.getById(item.getProId()).getProName()).append(";\n"));
+ }
+ } else {
+ str.append(" 鏃狅紱\n");
+ }
+ //寮傚父椤圭洰
+ data.put("yichang", str.toString());
+ // 閬嶅巻data 缁檖df琛ㄥ崟琛ㄦ牸璧嬪��
+ for (String key : data.keySet()) {
+ form.setField(key, data.get(key).toString());
+ }
+ //璁剧疆涓烘棤娉曠紪杈�
+ ps.setFormFlattening(true);
+ ps.close();
+ reader.close();
+ // 灏嗕慨鏀瑰悗鐨凱DF鍐呭鍐欏叆
+ byte[] bytes = byteArrayOutputStream.toByteArray();
+ // 鍒涘缓鏂扮殑PDF鏂囨。
+ Document document = new Document(PageSize.A4);
+ ByteArrayOutputStream finalOutPut = new ByteArrayOutputStream();
+ PdfCopy copy = new PdfCopy(document, finalOutPut);
+ document.open();
+ reader = new PdfReader(bytes);
+ int numberOfPages = reader.getNumberOfPages();
+ for (int i = 1; i <= numberOfPages; i++) {
+ PdfImportedPage page = copy.getImportedPage(reader, i);
+ copy.addPage(page);
+ }
+ // 娣诲姞璇︽儏椤�
+ document.newPage();
+ reader.close();
+ ByteArrayOutputStream infoByteArrayOutputStream = setInfoPage(userId, tjNumber);
+ reader = new PdfReader(infoByteArrayOutputStream.toByteArray());
+ int numberOfPages1 = reader.getNumberOfPages();
+ for (int i = 1; i <= numberOfPages1; i++) {
+ PdfImportedPage page = copy.getImportedPage(reader, i);
+ copy.addPage(page);
+ }
+ infoByteArrayOutputStream.close();
+ // 蹇冪數鍥句互鍙婇檮浠�
+ // 鍥犳暟鎹簱琛ㄥ瓨鏀綽ase64瀵艰嚧鏌ヨ缂撴參 杩欓噷鎵ц缂撴參
+ // 鍦ㄨ繖閲屽鍔犱竴鏉℃煡璇ount 瀵逛簬娌℃湁杩藉姞闄勪欢鐨� 鎻愬崌閫熷害
+ LambdaQueryWrapper<TjReport> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(TjReport::getTjNumber, tjNumber)
+ .and(item -> item.eq(TjReport::getType, "闄勪欢").or().eq(TjReport::getType, "蹇冪數鍥�"));
+ Integer selectCount = tjReportService.getSelectCount(queryWrapper);
+ if (selectCount > 0) {
+ String base64XinDianTu = null;
+ String base64FuJian = null;
+ List<TjReport> reportList = tjReportService.list(queryWrapper);
+ TjReport xinDianTu = null;
+ TjReport fuJian = null;
+ if (!reportList.isEmpty()) {
+ for (TjReport tjReport : reportList) {
+ if ("闄勪欢".equals(tjReport.getType())) {
+ fuJian = tjReport;
+ base64FuJian = fuJian.getReport();
+ } else {
+ xinDianTu = tjReport;
+ base64XinDianTu = xinDianTu.getReport();
+ }
+ }
+ }
+ if (xinDianTu != null) {
+ if (fuJian != null) {
+ addPageByPDFBase64(copy, base64FuJian);
+ document.newPage();
+ addPageByPDFBase64(copy, base64XinDianTu);
+ } else {
+ addPageByPDFBase64(copy, base64XinDianTu);
+ }
+ } else {
+ if (fuJian != null) {
+ addPageByPDFBase64(copy, base64FuJian);
+ }
+ }
+ }
+ copy.close();
+ base64Pdfs.add(Base64.getEncoder().encodeToString(finalOutPut.toByteArray()));
+ document.close();
+ finalOutPut.close();
+ reader.close();
+ //淇敼order琛ㄤ腑鐨勬墦鍗版姤鍛婃椂闂翠负褰撳墠鏃堕棿
+ 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);
+ } catch (Exception e) {
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ e.printStackTrace();
+ }
+ }
+ }
+ try {
+ byte[] mergePDFs = PDFDocumentUtil.mergePDFs(base64Pdfs);
+ // 鏈湴鐢熸垚娴嬭瘯
+// String PDF_FILE = "d:\\Users\\w\\Desktop\\test.pdf";
+// BufferedOutputStream outputStream = new BufferedOutputStream(new FileOutputStream(PDF_FILE));
+// outputStream.write(mergePDFs);
+// outputStream.flush();
+// outputStream.close();
+ String s = Base64.getEncoder().encodeToString(mergePDFs);
+ return AjaxResult.success().put("file", s);
+ } catch (DocumentException | IOException e) {
+ e.printStackTrace();
+ return AjaxResult.error("鎵归噺鐢熸垚澶辫触");
+ }
}
@GetMapping("/revocationReport/{TjNumber}")
@@ -1665,6 +2028,7 @@
public AjaxResult revocationReport(@PathVariable("TjNumber") String tjNumber) {
//閫昏緫鍒犻櫎鏁版嵁搴撻噷鐨勬姤鍛�
QueryWrapper<TjReport> wq1 = new QueryWrapper<>();
+ wq1.select("re_id");
wq1.eq("tj_number", tjNumber);
wq1.eq("type", "浣撴鎶ュ憡");
TjReport tjReport = tjReportService.getOne(wq1);
@@ -1688,6 +2052,7 @@
} else {
one.setStatus(TjConstants.TJ_CONFIRM);
}
+ one.setReportTime(null);
//灏嗙姸鎬佹敼涓烘湭瀹℃牳
// UpdateWrapper updateWrapper=new UpdateWrapper();
// updateWrapper.eq("tj_number",tjNumber);
--
Gitblit v1.8.0