|
@@ -3,7 +3,6 @@ package com.persagy.ibms.data.sdk.util;
|
|
import java.io.File;
|
|
import java.io.File;
|
|
import java.io.FileFilter;
|
|
import java.io.FileFilter;
|
|
import java.text.SimpleDateFormat;
|
|
import java.text.SimpleDateFormat;
|
|
-import java.util.ArrayList;
|
|
|
|
import java.util.Calendar;
|
|
import java.util.Calendar;
|
|
import java.util.Date;
|
|
import java.util.Date;
|
|
import java.util.List;
|
|
import java.util.List;
|
|
@@ -395,7 +394,7 @@ public class RWDLoadUtil {
|
|
SceneDataValue sdvInner = new SceneDataValue(Repository, sdv, ConfigRelation.nameInFrom, null);
|
|
SceneDataValue sdvInner = new SceneDataValue(Repository, sdv, ConfigRelation.nameInFrom, null);
|
|
sdvInner.finish = true;
|
|
sdvInner.finish = true;
|
|
sdvInner.value_array = new SceneDataSet(false);
|
|
sdvInner.value_array = new SceneDataSet(false);
|
|
- sdvInner.value_array.set = new ArrayList<SceneDataObject>();
|
|
|
|
|
|
+ sdvInner.value_array.set = new CopyOnWriteArrayList<SceneDataObject>();
|
|
sdv.value_object.put(ConfigRelation.nameInFrom, sdvInner);
|
|
sdv.value_object.put(ConfigRelation.nameInFrom, sdvInner);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -407,7 +406,7 @@ public class RWDLoadUtil {
|
|
SceneDataValue sdvInner = new SceneDataValue(Repository, sdv, ConfigRelation.nameInTo, null);
|
|
SceneDataValue sdvInner = new SceneDataValue(Repository, sdv, ConfigRelation.nameInTo, null);
|
|
sdvInner.finish = true;
|
|
sdvInner.finish = true;
|
|
sdvInner.value_array = new SceneDataSet(false);
|
|
sdvInner.value_array = new SceneDataSet(false);
|
|
- sdvInner.value_array.set = new ArrayList<SceneDataObject>();
|
|
|
|
|
|
+ sdvInner.value_array.set = new CopyOnWriteArrayList<SceneDataObject>();
|
|
sdv.value_object.put(ConfigRelation.nameInTo, sdvInner);
|
|
sdv.value_object.put(ConfigRelation.nameInTo, sdvInner);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -492,7 +491,7 @@ public class RWDLoadUtil {
|
|
SceneDataValue sdvInner = new SceneDataValue(Repository, FromObject, ConfigRelation.nameInFrom + "-id清单", null);
|
|
SceneDataValue sdvInner = new SceneDataValue(Repository, FromObject, ConfigRelation.nameInFrom + "-id清单", null);
|
|
sdvInner.finish = true;
|
|
sdvInner.finish = true;
|
|
sdvInner.value_array = new SceneDataSet(true);
|
|
sdvInner.value_array = new SceneDataSet(true);
|
|
- sdvInner.value_array.singleValueSet = new ArrayList<SceneDataValue>();
|
|
|
|
|
|
+ sdvInner.value_array.singleValueSet = new CopyOnWriteArrayList<SceneDataValue>();
|
|
for (SceneDataObject sdbInner : sdvFromItem.value_array.set) {
|
|
for (SceneDataObject sdbInner : sdvFromItem.value_array.set) {
|
|
SceneDataObject sdoInner = (SceneDataObject) sdbInner;
|
|
SceneDataObject sdoInner = (SceneDataObject) sdbInner;
|
|
SceneDataValue sdvOne = new SceneDataValue(Repository, null, null, null);
|
|
SceneDataValue sdvOne = new SceneDataValue(Repository, null, null, null);
|
|
@@ -545,7 +544,7 @@ public class RWDLoadUtil {
|
|
SceneDataValue sdvInner = new SceneDataValue(Repository, ToObject, ConfigRelation.nameInTo + "-id清单", null);
|
|
SceneDataValue sdvInner = new SceneDataValue(Repository, ToObject, ConfigRelation.nameInTo + "-id清单", null);
|
|
sdvInner.finish = true;
|
|
sdvInner.finish = true;
|
|
sdvInner.value_array = new SceneDataSet(true);
|
|
sdvInner.value_array = new SceneDataSet(true);
|
|
- sdvInner.value_array.singleValueSet = new ArrayList<SceneDataValue>();
|
|
|
|
|
|
+ sdvInner.value_array.singleValueSet = new CopyOnWriteArrayList<SceneDataValue>();
|
|
for (SceneDataObject sdbInner : sdvToItem.value_array.set) {
|
|
for (SceneDataObject sdbInner : sdvToItem.value_array.set) {
|
|
SceneDataObject sdoInner = (SceneDataObject) sdbInner;
|
|
SceneDataObject sdoInner = (SceneDataObject) sdbInner;
|
|
SceneDataValue sdvOne = new SceneDataValue(Repository, null, null, null);
|
|
SceneDataValue sdvOne = new SceneDataValue(Repository, null, null, null);
|
|
@@ -582,7 +581,7 @@ public class RWDLoadUtil {
|
|
SceneDataValue sv_alarmList = new SceneDataValue(null, null, "报警列表", null);
|
|
SceneDataValue sv_alarmList = new SceneDataValue(null, null, "报警列表", null);
|
|
sv_alarmList.finish = true;
|
|
sv_alarmList.finish = true;
|
|
sv_alarmList.value_array = new SceneDataSet(false);
|
|
sv_alarmList.value_array = new SceneDataSet(false);
|
|
- sv_alarmList.value_array.set = new ArrayList<SceneDataObject>();
|
|
|
|
|
|
+ sv_alarmList.value_array.set = new CopyOnWriteArrayList<SceneDataObject>();
|
|
sv_alarmList.value_array.setRowChange(true);
|
|
sv_alarmList.value_array.setRowChange(true);
|
|
RepositoryContainer.RepositoryProject.id2alarmList.putIfAbsent(objId, sv_alarmList);
|
|
RepositoryContainer.RepositoryProject.id2alarmList.putIfAbsent(objId, sv_alarmList);
|
|
for (String col : RWDAlarmUtil.alarmColChange) {
|
|
for (String col : RWDAlarmUtil.alarmColChange) {
|
|
@@ -975,16 +974,20 @@ public class RWDLoadUtil {
|
|
String id = (String) sdo.get("回路编号").value_prim.value;
|
|
String id = (String) sdo.get("回路编号").value_prim.value;
|
|
if (Repository.id2sdv.containsKey(id)) {
|
|
if (Repository.id2sdv.containsKey(id)) {
|
|
SceneDataObject equipment = Repository.id2sdv.get(id);
|
|
SceneDataObject equipment = Repository.id2sdv.get(id);
|
|
- equipment.put("模块名称", sdo.get("模块名称"));
|
|
|
|
- equipment.put("配电箱名称", sdo.get("配电箱名称"));
|
|
|
|
- equipment.put("配电箱编号", sdo.get("配电箱编号"));
|
|
|
|
- equipment.put("电井名称", sdo.get("电井名称"));
|
|
|
|
- equipment.put("电井编号", sdo.get("电井编号"));
|
|
|
|
- equipment.put("一级编组名称", sdo.get("一级编组名称"));
|
|
|
|
- equipment.put("二级编组名称", sdo.get("二级编组名称"));
|
|
|
|
- equipment.put("编组类型", sdo.get("编组类型"));
|
|
|
|
|
|
+ SceneDataValue sdv_null=new SceneDataValue(null,null,null,null);
|
|
|
|
+ sdv_null.value_prim=new SceneDataPrimitive();
|
|
|
|
+ sdv_null.value_prim.change=false;
|
|
|
|
+ equipment.put("模块名称", sdo.containsKey("模块名称")? sdo.get("模块名称"):sdv_null);
|
|
|
|
+ equipment.put("配电箱名称", sdo.containsKey("配电箱名称")?sdo.get("配电箱名称"):sdv_null);
|
|
|
|
+ equipment.put("配电箱编号", sdo.containsKey("配电箱编号")?sdo.get("配电箱编号"):sdv_null);
|
|
|
|
+ equipment.put("电井名称", sdo.containsKey("电井名称")?sdo.get("电井名称"):sdv_null);
|
|
|
|
+ equipment.put("电井编号", sdo.containsKey("电井编号")?sdo.get("电井编号"):sdv_null);
|
|
|
|
+ equipment.put("一级编组名称", sdo.containsKey("一级编组名称")?sdo.get("一级编组名称"):sdv_null);
|
|
|
|
+ equipment.put("二级编组名称", sdo.containsKey("二级编组名称")?sdo.get("二级编组名称"):sdv_null);
|
|
|
|
+ equipment.put("编组类型", sdo.containsKey("编组类型")?sdo.get("编组类型"):sdv_null);
|
|
if (product.equals("ggzm")) {
|
|
if (product.equals("ggzm")) {
|
|
- equipment.put("楼层名称", sdo.get("楼层名称"));
|
|
|
|
|
|
+ equipment.put("楼层编号", sdo.containsKey("楼层编号")?sdo.get("楼层编号"):sdv_null);
|
|
|
|
+ equipment.put("楼层名称", sdo.containsKey("楼层名称")?sdo.get("楼层名称"):sdv_null);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|