修改BUG

blade-service/blade-archive/src/main/java/org/springblade/archive/service/impl/ArchiveAutoPdfServiceImpl.java

@@ -102,6 +102,7 @@ public class ArchiveAutoPdfServiceImpl implements IArchiveAutoPdfService {
         Long projectId = 1578599210897772545L;
 
         ArchivesAuto archivesAuto = new ArchivesAuto();
+        archivesAuto.setId(SnowFlakeUtil.getId());
         archivesAuto.setProjectId(projectId);
         archivesAuto.setName("案卷提名");
         archivesAuto.setFileNumber("档号");
@@ -374,7 +375,7 @@ public class ArchiveAutoPdfServiceImpl implements IArchiveAutoPdfService {
         if (localUrls.size() > 1) {
             ByteArrayOutputStream bos = new ByteArrayOutputStream();
             FileUtils.PdfCopyPublicMethods(bos, localUrls);
-            BladeFile bladeFile = newIOSSClient.updateFile(bos.toByteArray(),fileName);
+            BladeFile bladeFile = newIOSSClient.updateFile(bos.toByteArray(),fileName + ".pdf");
             if (bladeFile!= null ) {
                 urls.add(bladeFile.getLink());
             }
@@ -589,10 +590,12 @@ public class ArchiveAutoPdfServiceImpl implements IArchiveAutoPdfService {
 
         // 将日期赋值给startDate和endDate
         if (!minDate.isEmpty()) {
-            archive.setStartDate(LocalDateTime.parse(minDate, formatter));
+            LocalDateTime localDateTime = FormulaUtil.parseStringToLocalDateTime(minDate,"yyyyMMdd");
+            archive.setStartDate(localDateTime);
         }
         if (!maxDate.isEmpty()) {
-            archive.setEndDate(LocalDateTime.parse(maxDate, formatter));
+            LocalDateTime localDateTime = FormulaUtil.parseStringToLocalDateTime(maxDate,"yyyyMMdd");
+            archive.setEndDate(localDateTime);
         }
 
         Map<String, Object> archivesAutoMap = new ObjectMapper().convertValue(archive, Map.class);

blade-service/blade-archive/src/main/java/org/springblade/archive/utils/FileUtils.java

@@ -32,6 +32,10 @@ import java.awt.*;
 import java.awt.image.BufferedImage;
 import java.io.*;
 import java.net.URLEncoder;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.List;
 import java.util.regex.Matcher;
@@ -556,13 +560,22 @@ public class FileUtils {
     }
 
     public static void main(String[] args) {
-        String  file1 = "https://huazheng2021002.oss-cn-shenzhen.aliyuncs.com/folderFile/54e8a314de8a493d9f08a9d3cf7c/104850dea8ca485cbda677c11f0d0e6c/安康至来凤国家高速公路奉节至巫山（渝鄂界）段K13+690~K19+385ZB1合同段开工令-20230415064429.pdf";
-        String  file2 = "https://huazheng2021002.oss-cn-shenzhen.aliyuncs.com/folderFile/54e8a314de8a493d9f08a9d3cf7c/f596dc71c3264977a2cc2b8e5d348b38/1-20230415063812.pdf";
-        List<String> urls  = new ArrayList<>();
-        urls.add(file1);
-        urls.add(file2);
-
-        doForPageNumberUseItextpdf(urls,null);
+        String str = "20230413";
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMdd");
+        LocalDate date = LocalDate.parse(str, formatter);
+        LocalDateTime dateTime = LocalDateTime.of(date, LocalTime.MIN);
+
+        String result = FormulaUtil.formatLocalDateTime(dateTime,"yyyyMMdd");
+        System.out.println();
+
+
+//        String  file1 = "https://huazheng2021002.oss-cn-shenzhen.aliyuncs.com/folderFile/54e8a314de8a493d9f08a9d3cf7c/104850dea8ca485cbda677c11f0d0e6c/安康至来凤国家高速公路奉节至巫山（渝鄂界）段K13+690~K19+385ZB1合同段开工令-20230415064429.pdf";
+//        String  file2 = "https://huazheng2021002.oss-cn-shenzhen.aliyuncs.com/folderFile/54e8a314de8a493d9f08a9d3cf7c/f596dc71c3264977a2cc2b8e5d348b38/1-20230415063812.pdf";
+//        List<String> urls  = new ArrayList<>();
+//        urls.add(file1);
+//        urls.add(file2);
+//
+//        doForPageNumberUseItextpdf(urls,null);
 
     }
 

blade-service/blade-archive/src/main/java/org/springblade/archive/utils/FormulaUtil.java

@@ -4,7 +4,9 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import org.springblade.common.vo.DataVO;
 import org.springblade.manager.entity.ArchiveTree;
 
+import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.time.LocalTime;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -41,6 +43,18 @@ public class FormulaUtil {
         return dateTime.format(formatter);
     }
 
+    /**
+     *  传入 "20230413", "yyyyMMdd";
+     * @param strDate
+     * @param pattern
+     * @return
+     */
+    public static LocalDateTime parseStringToLocalDateTime(String strDate, String pattern) {
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern(pattern);
+        LocalDate date = LocalDate.parse(strDate, formatter);
+        return LocalDateTime.of(date, LocalTime.MIN);
+    }
+
 
     /**
      *  excel 左边转换成从0开始的x,y