oss路径

blade-common/src/main/java/org/springblade/common/constant/OssConstant.java

@@ -20,4 +20,6 @@ public interface OssConstant {
      * 分隔符
      */
     String SEPARATOR = "__";
+
+    String SYS_DIRECTORY = "sys";
 }

blade-service/blade-archive/src/main/java/org/springblade/archive/controller/ArchivesAutoController.java

@@ -277,9 +277,9 @@ public class ArchivesAutoController extends BladeController {
 	@ApiOperation(value = "获取归档树同级节点", notes = "传入节点id")
 	public R test1() {
 
-		//archiveAutoPdfService.test1();
-		Long projectId = 1645263362890129410L;
-		List<ArchiveTreeContract> list = archiveTreeContractClient.getListByProjectId(projectId);
+		archiveAutoPdfService.test1();
+//		Long projectId = 1645263362890129410L;
+//		List<ArchiveTreeContract> list = archiveTreeContractClient.getListByProjectId(projectId);
 		//archivesAutoService.refreshFileNumberNoSlipt(list,null);
 		return R.data("");
 	}

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

@@ -82,36 +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 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();
 
 
     }
@@ -572,8 +572,9 @@ public class ArchiveAutoPdfServiceImpl implements IArchiveAutoPdfService {
         FileOutputStream outputStream = new FileOutputStream(excelPath);
         workbook.write(outputStream);
         FileUtils.setExcelScaleToPdf(excelPath, localPdfPath);
+        //String absoluteFileName = "upload/" + 899999 + "/archive/" + fileName;
+        //BladeFile bladeFile = newIOSSClient.uploadFile(absoluteFileName + ".pdf", localPdfPath);
         BladeFile bladeFile = newIOSSClient.uploadFile(fileName + ".pdf", localPdfPath,ossPath, projectId);
-
         String pdfLink = "";
         if (bladeFile!= null ){
             pdfLink = bladeFile.getLink();

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

@@ -642,7 +642,55 @@ public class FileUtils {
         }
     }
 
+    /**
+     * 预览文件  getOssPath(OssConstant.TEMP_DIRECTORY,文件名,随便填)
+     *          /upload/showtmp/xxxx
+     * 归档文件  getOssPath(OssConstant.ARCHIVE_DIRECTORY,文件名,projectId)
+     *         /upload/projectId/archive/20200304/xxxx
+     *  系统级或者不填projectId  getOssPath("","12344555",null)
+     *         upload/sys/20230505/xxxxx
+     * 拼接oss绝对路径
+     * @param filePath
+     * @param fileName
+     * @param projectId
+     * @return
+     */
+    public static String getOssPath(String filePath, String fileName, Long projectId){
+
+        String ossPath = OssConstant.NORMAL_DIRECTORY;
+
+        //如果是临时预览目录，则在 /upload/showtmp/xxxx.pdf
+        if (filePath!=null && filePath.equals(OssConstant.TEMP_DIRECTORY)) {
+            ossPath = ossPath + "/" + filePath + "/" + fileName;
+            return ossPath;
+        }
+
+        //项目的在 /upload/项目id/下   系统的在 /upload/sys下
+        String projectDir = OssConstant.SYS_DIRECTORY;
+        if (projectId != null)
+        {
+            projectDir = projectId.toString();
+        }
+        Date now = new Date();
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+        String formattedDate = sdf.format(now);
+        if (org.springframework.util.StringUtils.isEmpty(filePath)) {
+            filePath = formattedDate;
+        }else {
+            filePath = filePath +  "/" + formattedDate;
+        }
+
+        ossPath = ossPath +  "/" + projectDir +  "/" +  filePath + "/" + fileName;
+
+        return ossPath;
+    }
+
     public static void main(String[] args) {
+
+        System.out.println(getOssPath(null,"12344555",12424445L));
+        System.out.println(getOssPath(OssConstant.TEMP_DIRECTORY,"12344555",12424445L));
+        System.out.println(getOssPath(OssConstant.ARCHIVE_DIRECTORY,"12344555",12424445L));
+        System.out.println(getOssPath("","12344555",null));
         String url = "https://bladex-chongqing-info.oss-cn-hangzhou.aliyuncs.com/1578599210897772545/archive/ed4305eb971b062046c1ffd4e2da3c32-page1-1.pdf";
         String url1 = "https://bladex-chongqing-info.oss-cn-hangzhou.aliyuncs.com/upload/ed4305eb971b062046c1ffd4e2da3c32-page1-1.pdf";