|
@@ -501,9 +501,9 @@ public class ExcelTabController extends BladeController {
|
|
|
if(wbsTreeContract.getHtmlUrl()==null){
|
|
|
return R.fail("请上传清表!");
|
|
|
}
|
|
|
-// File file1 = ResourceUtil.getFile(wbsTreeContract.getHtmlUrl());
|
|
|
-// FileInputStream fileInputStream = new FileInputStream(file1);
|
|
|
- FileInputStream fileInputStream = new FileInputStream(new File("D:\\project" + wbsTreeContract.getHtmlUrl()));
|
|
|
+ File file1 = ResourceUtil.getFile(wbsTreeContract.getHtmlUrl());
|
|
|
+ FileInputStream fileInputStream = new FileInputStream(file1);
|
|
|
+
|
|
|
String htmlString = IoUtil.readToString(fileInputStream);
|
|
|
htmlString = htmlString.replaceAll("placeholder","placeholderxx");
|
|
|
// 解析 style
|
|
@@ -621,8 +621,8 @@ public class ExcelTabController extends BladeController {
|
|
|
String tabName = wbsTreeContract.getInitTableName();
|
|
|
|
|
|
String sqlInfo = "INSERT INTO "+tabName+" ( ";
|
|
|
- String keyStr = "id,";
|
|
|
- String valStr = SnowFlakeUtil.getId() + ",";
|
|
|
+ String keyStr = "";
|
|
|
+ String valStr = "";
|
|
|
for (String keys : dataMap2.keySet()){
|
|
|
keyStr += keys+",";
|
|
|
valStr += "'"+dataMap2.get(keys)+"',";
|