Commit 6196543c by zhangkb

修改批量打元数据标签接口

parent 33a3bfd7
...@@ -366,11 +366,6 @@ public class TagFileService { ...@@ -366,11 +366,6 @@ public class TagFileService {
importExcelMore(inputStream, TagMetadata.class, params); importExcelMore(inputStream, TagMetadata.class, params);
List<String> successIds = new ArrayList<>(); List<String> successIds = new ArrayList<>();
List<TagMetadata> tagMetadatas = excelImportResult.getList(); List<TagMetadata> tagMetadatas = excelImportResult.getList();
//author:zhangkb time:2020-3-16 desc:元数据路径加上领域
for(TagMetadata tagMd:tagMetadatas) {
String metaPath = "0,"+tagMd.getMetaName();
tagMd.setMetaName(metaPath);
}
for(TagMetadata tagMetadata : tagMetadatas) { for(TagMetadata tagMetadata : tagMetadatas) {
//判断元数据名称是否在repo存在 //判断元数据名称是否在repo存在
String claz = null; String claz = null;
...@@ -381,8 +376,8 @@ public class TagFileService { ...@@ -381,8 +376,8 @@ public class TagFileService {
claz = "Catalog,Database,Schema,HanaView"; claz = "Catalog,Database,Schema,HanaView";
} }
Map<String,Object> meta = repoService.getMetaByNamePathAndClass(claz, Map<String,Object> meta = repoService.getMetaByNamePathAndClass(claz,
tagMetadata.getMetaName()); "0,"+tagMetadata.getMetaName());
if(meta.isEmpty()) { if(meta==null) {
importLog.appendErrorMsg(String.format("第%s行, 元数据名为[%s]的元数据不存在", importLog.appendErrorMsg(String.format("第%s行, 元数据名为[%s]的元数据不存在",
tagMetadata.getRowNum(), tagMetadata.getMetaName())); tagMetadata.getRowNum(), tagMetadata.getMetaName()));
hasOtherFail = true; hasOtherFail = true;
...@@ -431,7 +426,7 @@ public class TagFileService { ...@@ -431,7 +426,7 @@ public class TagFileService {
claz = "Catalog,Database,Schema,HanaView"; claz = "Catalog,Database,Schema,HanaView";
} }
Map<String,Object> meta = repoService.getMetaByNamePathAndClass(claz,"0,"+obj.getMetaName()); Map<String,Object> meta = repoService.getMetaByNamePathAndClass(claz,"0,"+obj.getMetaName());
if(meta.isEmpty()) { if(meta==null) {
result.setSuccess(false); result.setSuccess(false);
result.setMsg(String.format("元数据不存在namePath为[%s]的[%s]数据", result.setMsg(String.format("元数据不存在namePath为[%s]的[%s]数据",
obj.getMetaName(),obj.getMetaModel())); obj.getMetaName(),obj.getMetaModel()));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment