|
@@ -762,8 +762,8 @@ public class ExcelTabController extends BladeController {
|
|
|
return R.fail("请上传清表!");
|
|
|
}
|
|
|
|
|
|
-// File file1 = ResourceUtil.getFile(wbsTreePrivate.getHtmlUrl());
|
|
|
- File file1 = ResourceUtil.getFile("D:\\develop\\1633308933835718656.html");
|
|
|
+ File file1 = ResourceUtil.getFile(wbsTreePrivate.getHtmlUrl());
|
|
|
+// File file1 = ResourceUtil.getFile("D:\\develop\\1633308933835718656.html");
|
|
|
FileInputStream fileInputStream = new FileInputStream(file1);
|
|
|
String htmlString = IoUtil.readToString(fileInputStream);
|
|
|
// 解析 style
|
|
@@ -1696,8 +1696,8 @@ public class ExcelTabController extends BladeController {
|
|
|
Worksheet sheet = wb.getWorksheets().get(0);
|
|
|
// 数据不为空 &&
|
|
|
if (StringUtils.isNotEmpty(tableNode.getHtmlUrl())) {
|
|
|
-// File htmlFile = ResourceUtil.getFile(tableNode.getHtmlUrl());
|
|
|
- File htmlFile = ResourceUtil.getFile("D:\\develop\\1633344465559093248.html");
|
|
|
+ File htmlFile = ResourceUtil.getFile(tableNode.getHtmlUrl());
|
|
|
+// File htmlFile = ResourceUtil.getFile("D:\\develop\\1633344465559093248.html");
|
|
|
if (htmlFile.exists()) {
|
|
|
String htmlString = IoUtil.readToString(new FileInputStream(htmlFile));
|
|
|
Document doc = Jsoup.parse(htmlString);
|