打码上传接口修改

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

@@ -82,27 +82,36 @@ public class ArchiveAutoPdfServiceImpl implements IArchiveAutoPdfService {
 //        List<String> files = new ArrayList<>();
 //        files.add(file2);
 //        BladeFile bladeFile = newIOSSClient.uploadFile1(file2,"123");
+        String urls1 = "https://bladex-chongqing-info.oss-cn-hangzhou.aliyuncs.com/upload/20230427/ed4305eb971b062046c1ffd4e2da3c32.pdf";
+        String urls2 = "https://bladex-chongqing-info.oss-cn-hangzhou.aliyuncs.com/upload/20230427/f1ddb3bd25c076824ef366a9e242ff23.pdf";
+        List<String> urls = new ArrayList<>();
+        String localPath = ParamCache.getValue(CommonConstant.SYS_LOCAL_URL);
+        urls.add(urls1);
+        urls.add(urls2);
+        List<String> pageUrls = FileUtils.doForPageNumberUseItextpdf(urls,localPath,newIOSSClient,1578599210897772545L);
+        System.out.println();
 
-        String file_path = ParamCache.getValue(CommonConstant.SYS_LOCAL_URL);
-        boolean flag = FileUtils.LocalPath.equals(file_path);
-        String excelUrl = file_path +  "\\备考表.xlsx";
-
-        Map<String, Object> DataInfo = new HashMap<>();
-
-        DataVO dataVO = FormulaUtil.convertCellToIndex("C2");
-        String key =  "1__"+ dataVO.getY() + "_" + dataVO.getX();
-        DataInfo.put(key,"档号123456");
-
-        DataVO dataVO1 = FormulaUtil.convertCellToIndex("A9");
-        String key1 =  "2__"+ dataVO1.getY() + "_" + dataVO1.getX();
-        DataInfo.put(key1,"hahahahaa");
-        try {
-            String url = getBussPdfInfo(pkeyId.toString(),DataInfo,excelUrl,file_path,null,null);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
 
-        System.out.println();
+//        String file_path = ParamCache.getValue(CommonConstant.SYS_LOCAL_URL);
+//        boolean flag = FileUtils.LocalPath.equals(file_path);
+//        String excelUrl = file_path +  "\\备考表.xlsx";
+//
+//        Map<String, Object> DataInfo = new HashMap<>();
+//
+//        DataVO dataVO = FormulaUtil.convertCellToIndex("C2");
+//        String key =  "1__"+ dataVO.getY() + "_" + dataVO.getX();
+//        DataInfo.put(key,"档号123456");
+//
+//        DataVO dataVO1 = FormulaUtil.convertCellToIndex("A9");
+//        String key1 =  "2__"+ dataVO1.getY() + "_" + dataVO1.getX();
+//        DataInfo.put(key1,"hahahahaa");
+//        try {
+//            String url = getBussPdfInfo(pkeyId.toString(),DataInfo,excelUrl,file_path,null,null);
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//
+//        System.out.println();
 
 
     }
@@ -269,7 +278,7 @@ public class ArchiveAutoPdfServiceImpl implements IArchiveAutoPdfService {
             urls.add(url);
         }
         String localPath = ParamCache.getValue(CommonConstant.SYS_LOCAL_URL);
-        List<String> pageUrls = FileUtils.doForPageNumberUseItextpdf(urls,localPath,newIOSSClient);
+        List<String> pageUrls = FileUtils.doForPageNumberUseItextpdf(urls,localPath,newIOSSClient, archivesAuto.getProjectId());
         for(int i=0;i<waitArchiveFiles.size();i++){
             waitArchiveFiles.get(i).setPdfPageUrl(pageUrls.get(i));
         }

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

@@ -426,7 +426,7 @@ public class FileUtils {
      * @Author yangyj
      * @Date 2021.12.17 14:21
      **/
-    public static List<String> doForPageNumberUseItextpdf(List<String> uris, String localPath ,NewIOSSClient newIOSSClient)  {
+    public static List<String> doForPageNumberUseItextpdf(List<String> uris, String localPath ,NewIOSSClient newIOSSClient,Long projectId)  {
         List<String> result = new ArrayList<>();
         if(uris!= null && uris.size() > 0){
             int cursor=0;
@@ -489,11 +489,18 @@ public class FileUtils {
                     String fileName = fileNameWithoutExtension +  "-" +  page;
                     String filePath = localPath + fileName;
                     if (newIOSSClient!= null ) {
-                        BladeFile bladeFile  = newIOSSClient.updateFile(out.toByteArray(),fileName);
+
+                        fos = new FileOutputStream(filePath);
+                        fos.write(out.toByteArray()); // 将数据写入到指定文件路径中
+                        fos.close();
+                        //BladeFile bladeFile  = newIOSSClient.updateFile(out.toByteArray(),fileName);
+
+                        BladeFile bladeFile  = newIOSSClient.uploadFile(fileName,filePath,OssConstant.ARCHIVE_DIRECTORY,projectId);
                         result.add(bladeFile.getLink());
                     }else {
                         fos = new FileOutputStream(filePath);
                         fos.write(out.toByteArray()); // 将数据写入到指定文件路径中
+                        fos.close();
                         result.add(filePath);
                     }