From e81bb6ce1b5bcc4f4015ee01461c5ec8dcc31a3a Mon Sep 17 00:00:00 2001
From: fanzongzhe <285169773@qq.com>
Date: Fri, 11 Aug 2023 14:22:18 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BA=A4=E8=BD=A6=E7=A1=AE=E8=AE=A4?=
 =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E6=B3=A8=E9=87=8A=20PDF=E6=89=93?=
 =?UTF-8?q?=E5=8D=B0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../biz/bushandover/BusHandoverService.java   | 120 +++++++++---------
 1 file changed, 62 insertions(+), 58 deletions(-)

diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverService.java
index 26ec6d4167..a766a6b032 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverService.java
@@ -1050,37 +1050,37 @@ public class BusHandoverService extends MybatisBaseService<BusHandoverMapper, Bu
             }
         }
         baseMapper.insert(busHandover);
-//        ResultBean<List<String>> pdf = createPdf(busHandover.getSid());
-//        String path = "";
-//        if (pdf.getSuccess()) {
-//            //打印pdf
-//            List<String> filePaths = pdf.getData();
-//            List<File> fileList = new ArrayList<>();
-//            if (!filePaths.isEmpty()) {
-//                for (String filePath : filePaths) {
-//                    File file = new File(filePath);
-//                    fileList.add(file);
-//                }
-//            }
-//            String dateStr = DateUtil.format(new Date(), "yyyyMMdd");
-//            long seconds = System.currentTimeMillis();
-//            String targetPath = docPdfComponent.getUploadTemplateUrl();
-//            File file = WordConvertUtils.mulFile2One(fileList, targetPath + dateStr + seconds + "交车确认.pdf");
-//            if (fileList.size() <= 0) {
-//                path = null;
-//            } else {
-//                for (File fileDelete : fileList) {
-//                    fileDelete.delete();
-//                }
-//                path = dateStr + seconds + "交车确认.pdf";
-//            }
-//        }
-//        BusHandover entity = fetchBySid(busHandover.getSid());
-//        entity.setFilePath(path);
-//        baseMapper.updateById(entity);
-//        String temp = "/template/";
-//        return rb.success().setData(temp + path);
-        return rb.success().setData("");
+        ResultBean<List<String>> pdf = createPdf(busHandover.getSid());
+        String path = "";
+        if (pdf.getSuccess()) {
+            //打印pdf
+            List<String> filePaths = pdf.getData();
+            List<File> fileList = new ArrayList<>();
+            if (!filePaths.isEmpty()) {
+                for (String filePath : filePaths) {
+                    File file = new File(filePath);
+                    fileList.add(file);
+                }
+            }
+            String dateStr = DateUtil.format(new Date(), "yyyyMMdd");
+            long seconds = System.currentTimeMillis();
+            String targetPath = docPdfComponent.getUploadTemplateUrl();
+            File file = WordConvertUtils.mulFile2One(fileList, targetPath + dateStr + seconds + "交车确认.pdf");
+            if (fileList.size() <= 0) {
+                path = null;
+            } else {
+                for (File fileDelete : fileList) {
+                    fileDelete.delete();
+                }
+                path = dateStr + seconds + "交车确认.pdf";
+            }
+        }
+        BusHandover entity = fetchBySid(busHandover.getSid());
+        entity.setFilePath(path);
+        baseMapper.updateById(entity);
+        String temp = "/template/";
+        return rb.success().setData(temp + path);
+        //  return rb.success().setData("");
     }
 
     /**
@@ -1773,31 +1773,33 @@ public class BusHandoverService extends MybatisBaseService<BusHandoverMapper, Bu
             }
         }
         baseMapper.insert(busHandover);
-        ResultBean<List<String>> pdf = createPdf(busHandover.getSid());
-        String path = "";
-        if (pdf.getSuccess()) {
-            //打印pdf
-            List<String> filePaths = pdf.getData();
-            List<File> fileList = new ArrayList<>();
-            if (!filePaths.isEmpty()) {
-                for (String filePath : filePaths) {
-                    File file = new File(filePath);
-                    fileList.add(file);
-                }
-            }
-            String dateStr = DateUtil.format(new Date(), "yyyyMMdd");
-            long seconds = System.currentTimeMillis();
-            String targetPath = docPdfComponent.getUploadTemplateUrl();
-            File file = WordConvertUtils.mulFile2One(fileList, targetPath + dateStr + seconds + "交车确认.pdf");
-            if (fileList.size() <= 0) {
-                path = null;
-            } else {
-                for (File fileDelete : fileList) {
-                    fileDelete.delete();
-                }
-                path = dateStr + seconds + "交车确认.pdf";
-            }
-        }
+        //-------------------------注释移动端生成PDF--------------------------------------
+//        ResultBean<List<String>> pdf = createPdf(busHandover.getSid());
+//        String path = "";
+//        if (pdf.getSuccess()) {
+//            //打印pdf
+//            List<String> filePaths = pdf.getData();
+//            List<File> fileList = new ArrayList<>();
+//            if (!filePaths.isEmpty()) {
+//                for (String filePath : filePaths) {
+//                    File file = new File(filePath);
+//                    fileList.add(file);
+//                }
+//            }
+//            String dateStr = DateUtil.format(new Date(), "yyyyMMdd");
+//            long seconds = System.currentTimeMillis();
+//            String targetPath = docPdfComponent.getUploadTemplateUrl();
+//            File file = WordConvertUtils.mulFile2One(fileList, targetPath + dateStr + seconds + "交车确认.pdf");
+//            if (fileList.size() <= 0) {
+//                path = null;
+//            } else {
+//                for (File fileDelete : fileList) {
+//                    fileDelete.delete();
+//                }
+//                path = dateStr + seconds + "交车确认.pdf";
+//            }
+//        }
+        String path = "temp";
         BusHandover entity = fetchBySid(busHandover.getSid());
         entity.setFilePath(path);
         baseMapper.updateById(entity);
@@ -2600,9 +2602,11 @@ public class BusHandoverService extends MybatisBaseService<BusHandoverMapper, Bu
         pdfVo.setColor("-");
         pdfVo.setListPdfVos(listPdfVos);
         String uploadTemplateUrl = docPdfComponent.getUploadTemplateUrl();
-        String s = receiveVehicleConfirmationCreatePdf(pdfVo);
+        //---------------挂车注释PDF
+        //String s = receiveVehicleConfirmationCreatePdf(pdfVo);
+        //String savePath = s.substring(uploadTemplateUrl.length());
         BusHandover entity = fetchBySid(sid);
-        String savePath = s.substring(uploadTemplateUrl.length());
+        String savePath = "temp";
         entity.setTrailerFilePath(savePath);
         baseMapper.updateById(entity);
         String templateUrl = docPdfComponent.getPrefixTemplateUrl();

From 7430d81cb0adf2541ba38eac536b66be9f25af3e Mon Sep 17 00:00:00 2001
From: fanzongzhe <285169773@qq.com>
Date: Fri, 11 Aug 2023 14:32:27 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BA=A4=E8=BD=A6=E7=A1=AE=E8=AE=A4PC?=
 =?UTF-8?q?=E7=AB=AF=E6=B3=A8=E9=87=8A=20PDF=E6=89=93=E5=8D=B0=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../biz/bushandover/BusHandoverService.java   | 67 ++++++++++---------
 1 file changed, 35 insertions(+), 32 deletions(-)

diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverService.java
index a766a6b032..4e093dec52 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverService.java
@@ -1050,37 +1050,39 @@ public class BusHandoverService extends MybatisBaseService<BusHandoverMapper, Bu
             }
         }
         baseMapper.insert(busHandover);
-        ResultBean<List<String>> pdf = createPdf(busHandover.getSid());
-        String path = "";
-        if (pdf.getSuccess()) {
-            //打印pdf
-            List<String> filePaths = pdf.getData();
-            List<File> fileList = new ArrayList<>();
-            if (!filePaths.isEmpty()) {
-                for (String filePath : filePaths) {
-                    File file = new File(filePath);
-                    fileList.add(file);
-                }
-            }
-            String dateStr = DateUtil.format(new Date(), "yyyyMMdd");
-            long seconds = System.currentTimeMillis();
-            String targetPath = docPdfComponent.getUploadTemplateUrl();
-            File file = WordConvertUtils.mulFile2One(fileList, targetPath + dateStr + seconds + "交车确认.pdf");
-            if (fileList.size() <= 0) {
-                path = null;
-            } else {
-                for (File fileDelete : fileList) {
-                    fileDelete.delete();
-                }
-                path = dateStr + seconds + "交车确认.pdf";
-            }
-        }
+        //-------------------------PC端注释交车PDF
+//        ResultBean<List<String>> pdf = createPdf(busHandover.getSid());
+//        String path = "";
+//        if (pdf.getSuccess()) {
+//            //打印pdf
+//            List<String> filePaths = pdf.getData();
+//            List<File> fileList = new ArrayList<>();
+//            if (!filePaths.isEmpty()) {
+//                for (String filePath : filePaths) {
+//                    File file = new File(filePath);
+//                    fileList.add(file);
+//                }
+//            }
+//            String dateStr = DateUtil.format(new Date(), "yyyyMMdd");
+//            long seconds = System.currentTimeMillis();
+//            String targetPath = docPdfComponent.getUploadTemplateUrl();
+//            File file = WordConvertUtils.mulFile2One(fileList, targetPath + dateStr + seconds + "交车确认.pdf");
+//            if (fileList.size() <= 0) {
+//                path = null;
+//            } else {
+//                for (File fileDelete : fileList) {
+//                    fileDelete.delete();
+//                }
+//                path = dateStr + seconds + "交车确认.pdf";
+//            }
+//        }
+        String path = "temp";
         BusHandover entity = fetchBySid(busHandover.getSid());
         entity.setFilePath(path);
         baseMapper.updateById(entity);
         String temp = "/template/";
         return rb.success().setData(temp + path);
-        //  return rb.success().setData("");
+
     }
 
     /**
@@ -2805,14 +2807,15 @@ public class BusHandoverService extends MybatisBaseService<BusHandoverMapper, Bu
         pdfVo.setColor("-");
         pdfVo.setListPdfVos(listPdfVos);
         String uploadTemplateUrl = docPdfComponent.getUploadTemplateUrl();
+        //-------挂车注释PDF
 //        String s = receiveVehicleConfirmationCreatePdf(pdfVo);
-//        BusHandover entity = fetchBySid(sid);
 //        String savePath = s.substring(uploadTemplateUrl.length());
-//        entity.setTrailerFilePath(savePath);
-//        baseMapper.updateById(entity);
-//        String temp = "/template/";
-//        return rb.success().setData(temp + savePath);
-        return rb.success().setData("");
+        String savePath = "temp";
+        BusHandover entity = fetchBySid(sid);
+        entity.setTrailerFilePath(savePath);
+        baseMapper.updateById(entity);
+        String temp = "/template/";
+        return rb.success().setData(temp + savePath);
     }