lxy/meta-kit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

.

Browse Source
This commit is contained in:
lxyer
2019-06-14 11:24:31 +08:00
parent b47023713b
commit 2ea2f5129e
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/net/tccn/service/_FileService.java
View File

@@ -65,20 +65,24 @@ public class _FileService extends BaseService {
Kv<String, MetaTable> data = Kv.of();
map.forEach((k, v) -> {
if (v.size() > 2) {
data.put(k.replace(" ", ""), toCols(v));
data.put(k.replace(" ", ""), toMetaTable(v));
}
});
StringBuffer buf = new StringBuffer();
String[] tableArr = data.keySet().toArray(new String[data.size()]);
/*StringBuffer buf = new StringBuffer();
buf.append("for d in MetaTable\n" +
" filter d.name in [");
data.values().forEach(x -> {
buf.append("'").append(x.getName()).append("',");
});
// 此处有bug
buf.deleteCharAt(buf.length() - 1);
buf.append("] and d.sysPlatId=='" + platId(token) + "'\n" +
" return d.name");
List<String> hv = MetaTable.dao.find(buf.toString(), String.class);
List<String> hv = MetaTable.dao.find(buf.toString(), String.class);*/
List<String> hv = MetaKit.tableExist(tableArr, token);
Kv res = Kv.of();
data.forEach((k, v) -> {
@@ -105,7 +109,7 @@ public class _FileService extends BaseService {
File file = new File(webroot, filePath);
try {
List<Map> list = ExcelKit.readExcel(file, FIELDS, sheetName);
MetaTable metaTable = toCols(list);
MetaTable metaTable = toMetaTable(list);
jBean.setBody(metaTable);
} catch (IOException e) {
@@ -118,8 +122,8 @@ public class _FileService extends BaseService {
@RestMapping(ignore = true, comment = "导入excel数据到metatable")
public JBean saveSheet(@RestParam(name = "sheetArr", comment = "sheet名") String[] sheetArr,
@RestParam(name = "filePath", comment = "文件路径") String filePath,
@RestParam(name = "platToken") String token) {
@RestParam(name = "filePath", comment = "文件路径") String filePath,
@RestParam(name = "platToken") String token) {
JBean jBean = new JBean();
File file = new File(webroot, filePath);
@@ -137,7 +141,7 @@ public class _FileService extends BaseService {
bean.setName(x);
return MetaTable.dao.findFirst(bean) == null;
}).map(x -> {
MetaTable metaTable = toCols(map.get(x));
MetaTable metaTable = toMetaTable(map.get(x));
metaTable.setSysPlatId(platId(token));
metaTable.setAlias(MetaKit.nextAlias());
return metaTable;
@@ -153,7 +157,7 @@ public class _FileService extends BaseService {
/**
* 组装元数据
*/
private MetaTable toCols(List<Map> list) {
private MetaTable toMetaTable(List<Map> list) {
//Kv col = Kv.of();
MetaTable metaTable = new MetaTable();