|
@@ -227,7 +227,7 @@ public class RWDLoadUtil {
|
|
|
pointMap.putIfAbsent(Key, point);
|
|
|
// 表号功能号改为null
|
|
|
{
|
|
|
- SceneDataValue sdv = new SceneDataValue(Repository, obj, Key, null);
|
|
|
+ SceneDataValue sdv = new SceneDataValue(null, null, null, null);
|
|
|
sdv.value_prim = new SceneDataPrimitive();
|
|
|
sdv.value_prim.change = true;
|
|
|
SceneDataValue exist_sdv = RepositoryBase.point2sdv.putIfAbsent(point, sdv);
|
|
@@ -250,7 +250,7 @@ public class RWDLoadUtil {
|
|
|
if (RWDLoadUtil.infoValue_is_point(point)) {
|
|
|
// 表号功能号改为null
|
|
|
{
|
|
|
- SceneDataValue sdv = new SceneDataValue(Repository, obj, Key, null);
|
|
|
+ SceneDataValue sdv = new SceneDataValue(null, null, null, null);
|
|
|
sdv.value_prim = new SceneDataPrimitive();
|
|
|
sdv.value_prim.change = true;
|
|
|
SceneDataValue exist_sdv = RepositoryBase.set2sdv.putIfAbsent(point, sdv);
|
|
@@ -448,7 +448,7 @@ public class RWDLoadUtil {
|
|
|
SceneDataObject objectItem = objectArray.set.get(i);
|
|
|
String objId = (String) objectItem.get("id").value_prim.value;
|
|
|
{
|
|
|
- SceneDataValue sv_alarmList = new SceneDataValue(null, objectItem, "报警列表", null);
|
|
|
+ SceneDataValue sv_alarmList = new SceneDataValue(null, null, "报警列表", null);
|
|
|
sv_alarmList.value_array = new SceneDataSet(false);
|
|
|
sv_alarmList.value_array.set = new ArrayList<SceneDataObject>();
|
|
|
sv_alarmList.value_array.setRowChange(true);
|
|
@@ -457,7 +457,7 @@ public class RWDLoadUtil {
|
|
|
SceneDataValue alarmList = RepositoryBase.id2alarmList.get(objId);
|
|
|
objectItem.put("报警列表", alarmList);
|
|
|
{
|
|
|
- SceneDataValue sv_alarmCount = new SceneDataValue(null, objectItem, "报警数量", null);
|
|
|
+ SceneDataValue sv_alarmCount = new SceneDataValue(null, null, "报警数量", null);
|
|
|
sv_alarmCount.value_prim = new SceneDataPrimitive();
|
|
|
sv_alarmCount.value_prim.value = 0;
|
|
|
sv_alarmCount.value_prim.change = true;
|