|
@@ -697,21 +697,21 @@ public class RWDLoadUtil {
|
|
|
if (SELTCUArray.value_array.set.size() == 1) {
|
|
|
SceneDataObject SELTCU = SELTCUArray.value_array.set.get(0);
|
|
|
String SELTCU_id = (String) SELTCU.get("id").value_prim.value;
|
|
|
- String SELTCU_name = (String) SELTCU.get("localName").value_prim.value;
|
|
|
+ String SELTCU_name = getValidName(SELTCU);
|
|
|
itemInner.put("模块编号", SELTCU_id);
|
|
|
itemInner.put("模块名称", SELTCU_name);
|
|
|
SceneDataValue SETDLSArray = SELTCU.get("被设备供电");
|
|
|
if (SETDLSArray.value_array.set.size() == 1) {
|
|
|
SceneDataObject SETDLS = SETDLSArray.value_array.set.get(0);
|
|
|
String SETDLS_id = (String) SETDLS.get("id").value_prim.value;
|
|
|
- String SETDLS_name = (String) SETDLS.get("localName").value_prim.value;
|
|
|
+ String SETDLS_name = getValidName(SETDLS);
|
|
|
itemInner.put("配电箱编号", SETDLS_id);
|
|
|
itemInner.put("配电箱名称", SETDLS_name);
|
|
|
SceneDataValue GeneralZoneArray = SETDLS.get("所在物业空间");
|
|
|
if (GeneralZoneArray.value_array.set.size() == 1) {
|
|
|
SceneDataObject GeneralZone = GeneralZoneArray.value_array.set.get(0);
|
|
|
String GeneralZone_id = (String) GeneralZone.get("id").value_prim.value;
|
|
|
- String GeneralZone_name = (String) GeneralZone.get("localName").value_prim.value;
|
|
|
+ String GeneralZone_name = getValidName(GeneralZone);
|
|
|
itemInner.put("电井编号", GeneralZone_id);
|
|
|
itemInner.put("电井名称", GeneralZone_name);
|
|
|
}
|
|
@@ -755,6 +755,33 @@ public class RWDLoadUtil {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ private static String getValidName(SceneDataObject sdo) {
|
|
|
+ String result = null;
|
|
|
+ if (sdo.containsKey("localName")) {
|
|
|
+ SceneDataValue sdv = sdo.get("localName");
|
|
|
+ if (sdv.value_prim != null) {
|
|
|
+ result = (String) sdv.value_prim.value;
|
|
|
+ return result;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (sdo.containsKey("localId")) {
|
|
|
+ SceneDataValue sdv = sdo.get("localId");
|
|
|
+ if (sdv.value_prim != null) {
|
|
|
+ result = (String) sdv.value_prim.value;
|
|
|
+ return result;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (sdo.containsKey("name")) {
|
|
|
+ SceneDataValue sdv = sdo.get("name");
|
|
|
+ if (sdv.value_prim != null) {
|
|
|
+ result = (String) sdv.value_prim.value;
|
|
|
+ return result;
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ return result;
|
|
|
+ }
|
|
|
+
|
|
|
public static void LoadZKTAlarmConfig(RepositoryImpl Repository) throws Exception {
|
|
|
String validPath = Constant.zkt_alarm_config;
|
|
|
{
|