修改标签元数据导入接口

src/main/java/com/keymobile/tagmanager/remote/RepoServiceClient.java

@@ -19,8 +19,8 @@ public interface RepoServiceClient {
 			@RequestParam String tagType);
 	
 	@PostMapping(value = "/rest/metadata/getByNamePathAndClass")
-	public Map<String,Object> getMetaByNamePathAndClass(@RequestParam String namePath,
-			@RequestParam String claz);
+	public Map<String,Object> getMetaByNamePathAndClass(@RequestParam String claz,
+			@RequestParam String namePath);
 	
 	@PostMapping(value = "/rest/tag/addTag")
 	public void addTag(@RequestParam String dimensionType,@RequestParam String idPath,

src/main/java/com/keymobile/tagmanager/service/TagFileService.java

@@ -251,7 +251,6 @@ public class TagFileService {
 				List<String> successIds = new ArrayList<>();
 				List<TagMetadata> tagMetadatas = excelImportResult.getList();
 				for(TagMetadata tagMetadata : tagMetadatas) {
-					successIds.add(tagMetadata.getMetaName());
 					//判断元数据名称是否在repo存在
 					String claz = null;
 					if("TABLE".equals(tagMetadata.getMetaModel().toUpperCase())) {
@@ -260,8 +259,8 @@ public class TagFileService {
 					if("HANAVIEW".equals(tagMetadata.getMetaModel().toUpperCase())) {
 						claz = "Catalog,Database,Schema,HanaView";
 					}
-					Map<String,Object> meta = repoService.getMetaByNamePathAndClass(
-							tagMetadata.getMetaName(), claz);
+					Map<String,Object> meta = repoService.getMetaByNamePathAndClass(claz,
+							tagMetadata.getMetaName());
 					if(meta.isEmpty()) {
 						importLog.appendErrorMsg(String.format("第%s行, 元数据名为[%s]的元数据不存在", 
 								tagMetadata.getRowNum(), tagMetadata.getMetaName()));
@@ -299,22 +298,22 @@ public class TagFileService {
 					!"HANAVIEW".equals(obj.getMetaModel().toUpperCase())) {
 				result.setSuccess(false);
 				result.setMsg(String.format("模型类型错误,不能为[%s]", obj.getMetaModel()));
-				return result;
-			}
-			//判断元数据名称是否在repo存在
-			String claz = null;
-			if("TABLE".equals(obj.getMetaModel().toUpperCase())) {
-				claz = "Catalog,Database,Schema,Table";
-			}
-			if("HANAVIEW".equals(obj.getMetaModel().toUpperCase())) {
-				claz = "Catalog,Database,Schema,HanaView";
-			}
-			Map<String,Object> meta = repoService.getMetaByNamePathAndClass(obj.getMetaName(), claz);
-			if(meta.isEmpty()) {
-				result.setSuccess(false);
-				result.setMsg(String.format("元数据不存在namePath为[%s]的[%s]数据", 
-						obj.getMetaName(),obj.getMetaModel()));
+				//return result;
 			}
+//			//判断元数据名称是否在repo存在
+//			String claz = null;
+//			if("TABLE".equals(obj.getMetaModel().toUpperCase())) {
+//				claz = "Catalog,Database,Schema,Table";
+//			}
+//			if("HANAVIEW".equals(obj.getMetaModel().toUpperCase())) {
+//				claz = "Catalog,Database,Schema,HanaView";
+//			}
+//			Map<String,Object> meta = repoService.getMetaByNamePathAndClass(claz,obj.getMetaName());
+//			if(meta.isEmpty()) {
+//				result.setSuccess(false);
+//				result.setMsg(String.format("元数据不存在namePath为[%s]的[%s]数据", 
+//						obj.getMetaName(),obj.getMetaModel()));
+//			}
 			return result;
 		}
 	}