yaoll 3 years ago
parent
commit
e588b2bd5b

+ 19 - 0
dmp-rwd-datautils/src/main/java/com/persagy/dmp/rwd/datautils/config/GraphMapping.java

@@ -150,6 +150,25 @@ public class GraphMapping {
 		list.add(new Item("PropertyInArch", "Pe2Fl"));
 		list.add(new Item("PropertyInArch", "Pe2Sh"));
 		list.add(new Item("PropertyInArch", "Pe2Sp"));
+
+		list.add(new Item("ArchForArch", "Bd2Bd"));
+		list.add(new Item("ArchForArch", "Bd2Fl"));
+		list.add(new Item("ArchForArch", "Bd2Sh"));
+		list.add(new Item("ArchForArch", "Bd2Sp"));
+		list.add(new Item("ArchForArch", "Fl2Bd"));
+		list.add(new Item("ArchForArch", "Fl2Fl"));
+		list.add(new Item("ArchForArch", "Fl2Sh"));
+		list.add(new Item("ArchForArch", "Fl2Sp"));
+		list.add(new Item("ArchForArch", "Sh2Bd"));
+		list.add(new Item("ArchForArch", "Sh2Fl"));
+		list.add(new Item("ArchForArch", "Sh2Sh"));
+		list.add(new Item("ArchForArch", "Sh2Sp"));
+		list.add(new Item("ArchForArch", "Sp2Bd"));
+		list.add(new Item("ArchForArch", "Sp2Fl"));
+		list.add(new Item("ArchForArch", "Sp2Sh"));
+		list.add(new Item("ArchForArch", "Sp2Sp"));
+
+
 		return list;
 	}
 

+ 2 - 2
dmp-rwd-datautils/src/main/java/com/persagy/dmp/rwd/datautils/service/TransObjInfoService.java

@@ -193,7 +193,7 @@ public class TransObjInfoService {
 
 			String classCode = JacksonMapper.getString(obj, "classCode");
 			Map<String, FuncidDefModel> funcidCache = getFuncidCache(ctx, classDefCache, classCode);
-			FuncidDefModel funcidDefModel = funcidCache.get(infoId);
+			FuncidDefModel funcidDefModel = funcidCache.get(infoId.toLowerCase());
 			if (funcidDefModel == null) {
 				model.error = "funcid def not exists";
 				errorWriter.println(JacksonMapper.toSimpleJson(model));
@@ -315,7 +315,7 @@ public class TransObjInfoService {
 				for (JsonNode datum : data) {
 					ObjectNode funcJson = (ObjectNode) datum;
 					FuncidDefModel funcidDefModel = JacksonMapper.toObject(funcJson.toString(), FuncidDefModel.class);
-					funcidCache.put(funcidDefModel.getOrigCode(), funcidDefModel);
+					funcidCache.put(funcidDefModel.getOrigCode().toLowerCase(), funcidDefModel);
 				}
 			}
 			classDefCache.put(classCode, funcidCache);