zhangding 2 years ago
parent
commit
f99fec1c8c

+ 4 - 10
master/src/main/java/com/ruoyi/project/officeConvert/officeConvertController.java

@@ -1,4 +1,3 @@
-/*
 package com.ruoyi.project.officeConvert;
 
 import com.google.common.primitives.Bytes;
@@ -34,14 +33,12 @@ import static com.ruoyi.project.officeConvert.pptPreview.pptxToImage;
 @RestController
 @RequestMapping(value="/office",method = RequestMethod.POST)
 public class officeConvertController {
-    */
-/**
+    /**
      office类型的文件
      先远程服务端获取文件
      然后转换
      然后读写缓冲区返回前台
-     *//*
-
+     */
     // 第一步:转换器直接注入
     @Resource
     DocumentConverter documentConverter;
@@ -97,11 +94,9 @@ public class officeConvertController {
                 //直接返回源文件路径
                 return new AjaxResult(HttpStatus.SUCCESS,failMsg,Constants.RESOURCE_PREFIX+ "/" + newFilePath);
                 //原本是将其他格式转换为.mp4
-            */
-/* String codcFilePath=   exchangeToMp4("D:\\ffmpeg\\ffmpeg-2022-06-12-git-4d45f5acbd-essentials_build\\ffmpeg-2022-06-12-git-4d45f5acbd-essentials_build\\bin\\ffmpeg.exe",
+            /* String codcFilePath=   exchangeToMp4("D:\\ffmpeg\\ffmpeg-2022-06-12-git-4d45f5acbd-essentials_build\\ffmpeg-2022-06-12-git-4d45f5acbd-essentials_build\\bin\\ffmpeg.exe",
                      profile+newFilePath,profile + "\\"  +converterPdf);
-                documentConverter.convert(new File((codcFilePath))).to(new File(profile + "\\"  +converterPdf)).execute();*//*
-
+                documentConverter.convert(new File((codcFilePath))).to(new File(profile + "\\"  +converterPdf)).execute();*/
             }else {
                 converterPdf =  newName+".html";
             }
@@ -154,4 +149,3 @@ public class officeConvertController {
     }
 
 }
-*/