|
@@ -159,6 +159,43 @@ public class RWDLoadUtil {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+ // info_replace
|
|
|
+ if (Repository.code2objTypeMap.containsKey(code)) {
|
|
|
+ String objType = Repository.code2objTypeMap.get(code);
|
|
|
+ if (Constant.info_replaceMap.containsKey(objType)) {
|
|
|
+ Map<String, String> info_replace = Constant.info_replaceMap.get(objType);
|
|
|
+ for (int ii = 0; ii < array.size(); ii++) {
|
|
|
+ JSONObject arrayItem = (JSONObject) array.get(ii);
|
|
|
+ for (String info_from : info_replace.keySet()) {
|
|
|
+ String info_to = info_replace.get(info_from);
|
|
|
+ if (arrayItem.containsKey(info_from)) {
|
|
|
+ Object info_fromValue = arrayItem.get(info_from);
|
|
|
+ arrayItem.put(info_to, info_fromValue);
|
|
|
+ } else {
|
|
|
+ arrayItem.put(info_to, null);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (Repository.objTypeMap.containsKey(code)) {
|
|
|
+ String objType = code;
|
|
|
+ if (Constant.info_replaceMap.containsKey(objType)) {
|
|
|
+ Map<String, String> info_replace = Constant.info_replaceMap.get(objType);
|
|
|
+ for (int ii = 0; ii < array.size(); ii++) {
|
|
|
+ JSONObject arrayItem = (JSONObject) array.get(ii);
|
|
|
+ for (String info_from : info_replace.keySet()) {
|
|
|
+ String info_to = info_replace.get(info_from);
|
|
|
+ if (arrayItem.containsKey(info_from)) {
|
|
|
+ Object info_fromValue = arrayItem.get(info_from);
|
|
|
+ arrayItem.put(info_to, info_fromValue);
|
|
|
+ } else {
|
|
|
+ arrayItem.put(info_to, null);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
for (int i = 0; i < array.size(); i++) {
|
|
|
JSONObject arrayItem = array.getJSONObject(i);
|
|
|
String id = (String) arrayItem.get("id");
|
|
@@ -423,27 +460,34 @@ public class RWDLoadUtil {
|
|
|
SceneDataValue sdvFromItem = FromObject.value_object.get(ConfigRelation.nameInFrom);
|
|
|
if (sdvFromItem != null && sdvFromItem.value_array != null) {
|
|
|
if (ConfigRelation.multiplicityFrom.equalsIgnoreCase("1")) {
|
|
|
- SceneDataValue sdvInner = new SceneDataValue(Repository, FromObject, ConfigRelation.nameInFrom + "-id", null);
|
|
|
- sdvInner.finish = true;
|
|
|
- sdvInner.value_prim = new SceneDataPrimitive();
|
|
|
+ SceneDataValue sdvInner_id = new SceneDataValue(Repository, FromObject, ConfigRelation.nameInFrom + "-id", null);
|
|
|
+ sdvInner_id.finish = true;
|
|
|
+ sdvInner_id.value_prim = new SceneDataPrimitive();
|
|
|
+ SceneDataValue sdvInner_name = new SceneDataValue(Repository, FromObject, ConfigRelation.nameInFrom + "名称", null);
|
|
|
+ sdvInner_name.finish = true;
|
|
|
+ sdvInner_name.value_prim = new SceneDataPrimitive();
|
|
|
if (sdvFromItem.value_array.set.size() == 0) {
|
|
|
} else if (sdvFromItem.value_array.set.size() == 1) {
|
|
|
- sdvInner.value_prim.value = ((SceneDataObject) sdvFromItem.value_array.set.get(0)).get("id").value_prim.value;
|
|
|
+ sdvInner_id.value_prim.value = ((SceneDataObject) sdvFromItem.value_array.set.get(0)).get("id").value_prim.value;
|
|
|
+ sdvInner_name.value_prim.value = ((SceneDataObject) sdvFromItem.value_array.set.get(0))
|
|
|
+ .get("ibmsxianshimingcheng").value_prim.value;
|
|
|
} else {
|
|
|
for (SceneDataObject sdbInner : sdvFromItem.value_array.set) {
|
|
|
SceneDataObject sdoInner = (SceneDataObject) sdbInner;
|
|
|
- if (sdvInner.value_prim.value == null) {
|
|
|
- sdvInner.value_prim.value = sdoInner.get("id").value_prim.value;
|
|
|
+ if (sdvInner_id.value_prim.value == null) {
|
|
|
+ sdvInner_id.value_prim.value = sdoInner.get("id").value_prim.value;
|
|
|
+ sdvInner_name.value_prim.value = sdoInner.get("ibmsxianshimingcheng").value_prim.value;
|
|
|
} else {
|
|
|
- if (!sdvInner.value_prim.value.equals(sdoInner.get("id").value_prim.value)) {
|
|
|
+ if (!sdvInner_id.value_prim.value.equals(sdoInner.get("id").value_prim.value)) {
|
|
|
log.error(ConfigRelation.graphCode + "\t" + ConfigRelation.relCode + "\t"
|
|
|
+ FromObject.value_object.get("id") + " " + "有多个" + " " + ConfigRelation.nameInFrom + "\t"
|
|
|
- + sdvInner.value_prim.value + "\t" + sdoInner.get("id").value_prim.value);
|
|
|
+ + sdvInner_id.value_prim.value + "\t" + sdoInner.get("id").value_prim.value);
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- FromObject.value_object.put(ConfigRelation.nameInFrom + "-id", sdvInner);
|
|
|
+ FromObject.value_object.put(ConfigRelation.nameInFrom + "-id", sdvInner_id);
|
|
|
+ FromObject.value_object.put(ConfigRelation.nameInFrom + "名称", sdvInner_name);
|
|
|
} else {
|
|
|
SceneDataValue sdvInner = new SceneDataValue(Repository, FromObject, ConfigRelation.nameInFrom + "-id清单", null);
|
|
|
sdvInner.finish = true;
|
|
@@ -469,27 +513,34 @@ public class RWDLoadUtil {
|
|
|
SceneDataValue sdvToItem = ToObject.value_object.get(ConfigRelation.nameInTo);
|
|
|
if (sdvToItem != null && sdvToItem.value_array != null) {
|
|
|
if (ConfigRelation.multiplicityTo.equalsIgnoreCase("1")) {
|
|
|
- SceneDataValue sdvInner = new SceneDataValue(Repository, ToObject, ConfigRelation.nameInTo + "-id", null);
|
|
|
- sdvInner.finish = true;
|
|
|
- sdvInner.value_prim = new SceneDataPrimitive();
|
|
|
+ SceneDataValue sdvInner_id = new SceneDataValue(Repository, ToObject, ConfigRelation.nameInTo + "-id", null);
|
|
|
+ sdvInner_id.finish = true;
|
|
|
+ sdvInner_id.value_prim = new SceneDataPrimitive();
|
|
|
+ SceneDataValue sdvInner_name = new SceneDataValue(Repository, ToObject, ConfigRelation.nameInTo + "名称", null);
|
|
|
+ sdvInner_name.finish = true;
|
|
|
+ sdvInner_name.value_prim = new SceneDataPrimitive();
|
|
|
if (sdvToItem.value_array.set.size() == 0) {
|
|
|
} else if (sdvToItem.value_array.set.size() == 1) {
|
|
|
- sdvInner.value_prim.value = ((SceneDataObject) sdvToItem.value_array.set.get(0)).get("id").value_prim.value;
|
|
|
+ sdvInner_id.value_prim.value = ((SceneDataObject) sdvToItem.value_array.set.get(0)).get("id").value_prim.value;
|
|
|
+ sdvInner_name.value_prim.value = ((SceneDataObject) sdvToItem.value_array.set.get(0))
|
|
|
+ .get("ibmsxianshimingcheng").value_prim.value;
|
|
|
} else {
|
|
|
for (SceneDataObject sdbInner : sdvToItem.value_array.set) {
|
|
|
SceneDataObject sdoInner = (SceneDataObject) sdbInner;
|
|
|
- if (sdvInner.value_prim.value == null) {
|
|
|
- sdvInner.value_prim.value = sdoInner.get("id").value_prim.value;
|
|
|
+ if (sdvInner_id.value_prim.value == null) {
|
|
|
+ sdvInner_id.value_prim.value = sdoInner.get("id").value_prim.value;
|
|
|
+ sdvInner_name.value_prim.value = sdoInner.get("ibmsxianshimingcheng").value_prim.value;
|
|
|
} else {
|
|
|
- if (!sdvInner.value_prim.value.equals(sdoInner.get("id").value_prim.value)) {
|
|
|
+ if (!sdvInner_id.value_prim.value.equals(sdoInner.get("id").value_prim.value)) {
|
|
|
log.error(ConfigRelation.graphCode + "\t" + ConfigRelation.relCode + "\t"
|
|
|
+ ToObject.value_object.get("id") + " " + "有多个" + " " + ConfigRelation.nameInTo + "\t"
|
|
|
- + sdvInner.value_prim.value + "\t" + sdoInner.get("id").value_prim.value);
|
|
|
+ + sdvInner_id.value_prim.value + "\t" + sdoInner.get("id").value_prim.value);
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- ToObject.value_object.put(ConfigRelation.nameInTo + "-id", sdvInner);
|
|
|
+ ToObject.value_object.put(ConfigRelation.nameInTo + "-id", sdvInner_id);
|
|
|
+ ToObject.value_object.put(ConfigRelation.nameInTo + "名称", sdvInner_name);
|
|
|
} else {
|
|
|
SceneDataValue sdvInner = new SceneDataValue(Repository, ToObject, ConfigRelation.nameInTo + "-id清单", null);
|
|
|
sdvInner.finish = true;
|