From b7103b4da9d05a5faa3c2eea81eff376380eb7dc Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期二, 10 十二月 2024 01:00:16 +0800
Subject: [PATCH] pdf调整

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java |   72 +++++++++++++++++++++---------------
 1 files changed, 42 insertions(+), 30 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 d5e1209..7874ca1 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
@@ -39,6 +39,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Propagation;
@@ -56,9 +57,10 @@
  * @author ltkj
  * @date 2022-12-06
  */
+@Slf4j
 @RestController
 @RequestMapping("/system/report")
-@Api(tags = "浣撴鎶ュ憡")
+@Api(tags = "AAAA_浣撴鎶ュ憡")
 @Transactional
 public class TjReportController extends BaseController {
     @Resource
@@ -105,13 +107,15 @@
     @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("淇濆瓨鎴愬姛");
@@ -297,9 +301,10 @@
 //            return error;
 //        }
 //        return AjaxResult.success("璇ョ敤鎴蜂綋妫�鏈畬鎴愶紝涓嶈兘鎵撳嵃鎶ュ憡锛侊紒锛�");
-        int num = tjOrderRemarkService.getTjYqOrderRemarkByTjNum(tjNumber);
-        if (num > 0) {
-            return AjaxResult.error("鏈夊欢鏈熼」鐩殏涓嶈兘鐢熸垚鎶ュ憡!!!");
+        String config = configService.selectConfigByKey("sfjcwjhyqxm");
+        if(null != config && config.equalsIgnoreCase("Y")){
+            int num = tjOrderRemarkService.getTjYqOrderRemarkByTjNum(tjNumber);
+            if (num > 0) return AjaxResult.error("瀛樺湪鏈鎴栧欢鏈熼」鐩殏涓嶈兘鐢熸垚鎶ュ憡!!!");
         }
 
 //        String configByKey = configService.selectConfigByKey("sfkqdyhis");
@@ -389,7 +394,7 @@
                     return shengchengbgmoban(tjNumber, tjOrder, tjCustomer, reportTemplate);
                 } catch (Exception e) {
                     TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-                    e.printStackTrace();
+                    log.error(String.valueOf(e));
                     // 璋冪敤鎾ら攢
 //                    tjReportController.backOnlyCheckType(tjNumber);
                     logger.error("鐢熸垚鎶ュ憡寮傚父");
@@ -402,8 +407,14 @@
         return AjaxResult.error();
     }
 
-    public AjaxResult shengchengbgmoban(String tjNumber, TjOrder tjOrder, TjCustomer tjCustomer, TjReportTemplate reportTemplate) throws Exception {
-        AjaxResult ajaxResult = hisPDFUtil.hisPDF(tjOrder, tjCustomer, reportTemplate);
+    public AjaxResult shengchengbgmoban(String tjNumber, TjOrder tjOrder, TjCustomer tjCustomer, TjReportTemplate reportTemplate) {
+        AjaxResult ajaxResult = null;
+        try {
+            ajaxResult = hisPDFUtil.hisPDF(tjOrder, tjCustomer, reportTemplate);
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error(String.valueOf(e));
+        }
         if (!ajaxResult.get("code").toString().equals("200")) {
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
         } else {
@@ -412,7 +423,7 @@
             TjReport tjReport = new TjReport();
             tjReport.setTjNumber(String.valueOf(tjNumber));
             tjReport.setPath(urlValue + outputFileName1);
-            String outputPath1 = value + "\\";
+            String outputPath1 = value + File.separator;
             String pdfBinary = getPDFBinary(outputPath1 + outputFileName1);
             tjReport.setReport(pdfBinary);
             tjReport.setType("浣撴鎶ュ憡");
@@ -696,7 +707,7 @@
                     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));
@@ -1022,7 +1033,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鏀捐繘鏈湴鏂囦欢澶�
 
@@ -1045,8 +1056,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;
@@ -1169,7 +1180,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);
 
@@ -1336,7 +1347,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<>();
@@ -1345,7 +1356,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<>();
@@ -1354,27 +1365,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);
@@ -1393,11 +1404,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琛ㄤ腑鐨勬墦鍗版姤鍛婃椂闂翠负褰撳墠鏃堕棿
@@ -1723,9 +1734,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("鏂囦欢涓嶅瓨鍦紒");
@@ -2049,6 +2060,7 @@
         } else {
             one.setStatus(TjConstants.TJ_CONFIRM);
         }
+        one.setReportTime(null);
         //灏嗙姸鎬佹敼涓烘湭瀹℃牳
 //        UpdateWrapper updateWrapper=new UpdateWrapper();
 //        updateWrapper.eq("tj_number",tjNumber);

--
Gitblit v1.8.0