From 103160279885c466e835420564dc17fc5aba99f4 Mon Sep 17 00:00:00 2001
From: longyvfengyun <496960745@qq.com>
Date: 星期五, 22 七月 2022 11:33:31 +0800
Subject: [PATCH] Merge branch 'master' of http://118.89.139.230:10101/r/~whyclxw/CadDrawManager
---
src/main/java/com/whyc/service/ProductBomApprovingService.java | 19 +++++++++----------
1 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/whyc/service/ProductBomApprovingService.java b/src/main/java/com/whyc/service/ProductBomApprovingService.java
index 53054fa..63a6f6d 100644
--- a/src/main/java/com/whyc/service/ProductBomApprovingService.java
+++ b/src/main/java/com/whyc/service/ProductBomApprovingService.java
@@ -6,10 +6,7 @@
import com.whyc.pojo.DocUser;
import com.whyc.pojo.ProductBomApproving;
import com.whyc.pojo.WorksheetMain;
-import com.whyc.util.ActionUtil;
-import com.whyc.util.CommonUtil;
-import com.whyc.util.FileUtil;
-import com.whyc.util.Zip4jUtil;
+import com.whyc.util.*;
import io.swagger.models.auth.In;
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
import org.apache.poi.ss.usermodel.*;
@@ -258,12 +255,14 @@
return list;
}
- public static void main(String[] args) throws IOException, InvalidFormatException {
- String a = "C:\\Users\\29550\\Desktop\\褰撳墠椤圭洰\\202207娉板窞骞冲彴\\49娉板窞鏁版嵁搴撳浠�-鏈嶅姟鍣ㄤ粠windows鍒囨崲鍒癠buntu鏃剁殑鏁版嵁搴撳浠絓\db_alarm.sql";
- String substring = a.substring(a.lastIndexOf(File.separator)+1);
- String s2 = (a.substring(a.lastIndexOf("褰撳墠椤圭洰"+File.separator+"202207娉板窞骞冲彴")));
+ public Response dwgReview(String dwgUrl) throws IOException {
+ //缁濆璺緞xxx/doc_file
+ String rootFile = CommonUtil.getRootFile();
+ String dwgSubFilePath = dwgUrl.substring(dwgUrl.indexOf("doc_file")+8);
+ String dwgSubFileDirPath = dwgSubFilePath.substring(0,dwgSubFilePath.lastIndexOf(File.separator));
+ File dwgFile = new File(rootFile + dwgSubFilePath);
+ String pdfFileName = DwgToPdfUtil.dwg2Pdf(dwgFile);
- System.out.println(substring);
- System.out.println(s2);
+ return new Response().set(1,"doc_file"+dwgSubFileDirPath+File.separator+pdfFileName);
}
}
--
Gitblit v1.9.1