|
@@ -266,6 +266,7 @@ public class RWDLoadUtil {
|
|
// 表号功能号改为null
|
|
// 表号功能号改为null
|
|
{
|
|
{
|
|
SceneDataValue sdv = new SceneDataValue(null, null, null, null);
|
|
SceneDataValue sdv = new SceneDataValue(null, null, null, null);
|
|
|
|
+ sdv.finish = true;
|
|
sdv.value_prim = new SceneDataPrimitive();
|
|
sdv.value_prim = new SceneDataPrimitive();
|
|
sdv.value_prim.change = true;
|
|
sdv.value_prim.change = true;
|
|
SceneDataValue exist_sdv = RepositoryContainer.RepositoryBase.point2sdv.putIfAbsent(point, sdv);
|
|
SceneDataValue exist_sdv = RepositoryContainer.RepositoryBase.point2sdv.putIfAbsent(point, sdv);
|
|
@@ -289,6 +290,7 @@ public class RWDLoadUtil {
|
|
// 表号功能号改为null
|
|
// 表号功能号改为null
|
|
{
|
|
{
|
|
SceneDataValue sdv = new SceneDataValue(null, null, null, null);
|
|
SceneDataValue sdv = new SceneDataValue(null, null, null, null);
|
|
|
|
+ sdv.finish = true;
|
|
sdv.value_prim = new SceneDataPrimitive();
|
|
sdv.value_prim = new SceneDataPrimitive();
|
|
sdv.value_prim.change = true;
|
|
sdv.value_prim.change = true;
|
|
SceneDataValue exist_sdv = RepositoryContainer.RepositoryBase.set2sdv.putIfAbsent(point, sdv);
|
|
SceneDataValue exist_sdv = RepositoryContainer.RepositoryBase.set2sdv.putIfAbsent(point, sdv);
|
|
@@ -317,6 +319,7 @@ public class RWDLoadUtil {
|
|
SceneDataObject sdv = fromMap.get(key);
|
|
SceneDataObject sdv = fromMap.get(key);
|
|
if (!sdv.value_object.containsKey(ConfigRelation.nameInFrom)) {
|
|
if (!sdv.value_object.containsKey(ConfigRelation.nameInFrom)) {
|
|
SceneDataValue sdvInner = new SceneDataValue(Repository, sdv, ConfigRelation.nameInFrom, null);
|
|
SceneDataValue sdvInner = new SceneDataValue(Repository, sdv, ConfigRelation.nameInFrom, null);
|
|
|
|
+ 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 ArrayList<SceneDataObject>();
|
|
sdv.value_object.put(ConfigRelation.nameInFrom, sdvInner);
|
|
sdv.value_object.put(ConfigRelation.nameInFrom, sdvInner);
|
|
@@ -328,6 +331,7 @@ public class RWDLoadUtil {
|
|
SceneDataObject sdv = toMap.get(key);
|
|
SceneDataObject sdv = toMap.get(key);
|
|
if (!sdv.value_object.containsKey(ConfigRelation.nameInTo)) {
|
|
if (!sdv.value_object.containsKey(ConfigRelation.nameInTo)) {
|
|
SceneDataValue sdvInner = new SceneDataValue(Repository, sdv, ConfigRelation.nameInTo, null);
|
|
SceneDataValue sdvInner = new SceneDataValue(Repository, sdv, ConfigRelation.nameInTo, null);
|
|
|
|
+ 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 ArrayList<SceneDataObject>();
|
|
sdv.value_object.put(ConfigRelation.nameInTo, sdvInner);
|
|
sdv.value_object.put(ConfigRelation.nameInTo, sdvInner);
|
|
@@ -383,6 +387,7 @@ public class RWDLoadUtil {
|
|
if (sdvFromItem != null && sdvFromItem.value_array != null) {
|
|
if (sdvFromItem != null && sdvFromItem.value_array != null) {
|
|
if (ConfigRelation.multiplicityFrom.equalsIgnoreCase("1")) {
|
|
if (ConfigRelation.multiplicityFrom.equalsIgnoreCase("1")) {
|
|
SceneDataValue sdvInner = new SceneDataValue(Repository, FromObject, ConfigRelation.nameInFrom + "-id", null);
|
|
SceneDataValue sdvInner = new SceneDataValue(Repository, FromObject, ConfigRelation.nameInFrom + "-id", null);
|
|
|
|
+ sdvInner.finish = true;
|
|
sdvInner.value_prim = new SceneDataPrimitive();
|
|
sdvInner.value_prim = new SceneDataPrimitive();
|
|
if (sdvFromItem.value_array.set.size() == 0) {
|
|
if (sdvFromItem.value_array.set.size() == 0) {
|
|
} else if (sdvFromItem.value_array.set.size() == 1) {
|
|
} else if (sdvFromItem.value_array.set.size() == 1) {
|
|
@@ -408,11 +413,13 @@ public class RWDLoadUtil {
|
|
FromObject.value_object.put(ConfigRelation.nameInFrom + "-id", sdvInner);
|
|
FromObject.value_object.put(ConfigRelation.nameInFrom + "-id", sdvInner);
|
|
} else {
|
|
} else {
|
|
SceneDataValue sdvInner = new SceneDataValue(Repository, FromObject, ConfigRelation.nameInFrom + "-id清单", null);
|
|
SceneDataValue sdvInner = new SceneDataValue(Repository, FromObject, ConfigRelation.nameInFrom + "-id清单", null);
|
|
|
|
+ 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 ArrayList<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);
|
|
|
|
+ sdvOne.finish = true;
|
|
sdvOne.value_prim = new SceneDataPrimitive();
|
|
sdvOne.value_prim = new SceneDataPrimitive();
|
|
sdvOne.value_prim.value = sdoInner.get("id").value_prim.value;
|
|
sdvOne.value_prim.value = sdoInner.get("id").value_prim.value;
|
|
sdvInner.value_array.singleValueSet.add(sdvOne);
|
|
sdvInner.value_array.singleValueSet.add(sdvOne);
|
|
@@ -430,6 +437,7 @@ public class RWDLoadUtil {
|
|
if (sdvToItem != null && sdvToItem.value_array != null) {
|
|
if (sdvToItem != null && sdvToItem.value_array != null) {
|
|
if (ConfigRelation.multiplicityTo.equalsIgnoreCase("1")) {
|
|
if (ConfigRelation.multiplicityTo.equalsIgnoreCase("1")) {
|
|
SceneDataValue sdvInner = new SceneDataValue(Repository, ToObject, ConfigRelation.nameInTo + "-id", null);
|
|
SceneDataValue sdvInner = new SceneDataValue(Repository, ToObject, ConfigRelation.nameInTo + "-id", null);
|
|
|
|
+ sdvInner.finish = true;
|
|
sdvInner.value_prim = new SceneDataPrimitive();
|
|
sdvInner.value_prim = new SceneDataPrimitive();
|
|
if (sdvToItem.value_array.set.size() == 0) {
|
|
if (sdvToItem.value_array.set.size() == 0) {
|
|
} else if (sdvToItem.value_array.set.size() == 1) {
|
|
} else if (sdvToItem.value_array.set.size() == 1) {
|
|
@@ -455,11 +463,13 @@ public class RWDLoadUtil {
|
|
ToObject.value_object.put(ConfigRelation.nameInTo + "-id", sdvInner);
|
|
ToObject.value_object.put(ConfigRelation.nameInTo + "-id", sdvInner);
|
|
} else {
|
|
} else {
|
|
SceneDataValue sdvInner = new SceneDataValue(Repository, ToObject, ConfigRelation.nameInTo + "-id清单", null);
|
|
SceneDataValue sdvInner = new SceneDataValue(Repository, ToObject, ConfigRelation.nameInTo + "-id清单", null);
|
|
|
|
+ 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 ArrayList<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);
|
|
|
|
+ sdvOne.finish = true;
|
|
sdvOne.value_prim = new SceneDataPrimitive();
|
|
sdvOne.value_prim = new SceneDataPrimitive();
|
|
sdvOne.value_prim.value = sdoInner.get("id").value_prim.value;
|
|
sdvOne.value_prim.value = sdoInner.get("id").value_prim.value;
|
|
sdvInner.value_array.singleValueSet.add(sdvOne);
|
|
sdvInner.value_array.singleValueSet.add(sdvOne);
|
|
@@ -487,6 +497,7 @@ public class RWDLoadUtil {
|
|
String objId = (String) objectItem.get("id").value_prim.value;
|
|
String objId = (String) objectItem.get("id").value_prim.value;
|
|
{
|
|
{
|
|
SceneDataValue sv_alarmList = new SceneDataValue(null, null, "报警列表", null);
|
|
SceneDataValue sv_alarmList = new SceneDataValue(null, null, "报警列表", null);
|
|
|
|
+ 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 ArrayList<SceneDataObject>();
|
|
sv_alarmList.value_array.setRowChange(true);
|
|
sv_alarmList.value_array.setRowChange(true);
|
|
@@ -496,6 +507,7 @@ public class RWDLoadUtil {
|
|
objectItem.put("报警列表", alarmList);
|
|
objectItem.put("报警列表", alarmList);
|
|
{
|
|
{
|
|
SceneDataValue sv_alarmCount = new SceneDataValue(null, null, "报警数量", null);
|
|
SceneDataValue sv_alarmCount = new SceneDataValue(null, null, "报警数量", null);
|
|
|
|
+ sv_alarmCount.finish = true;
|
|
sv_alarmCount.value_prim = new SceneDataPrimitive();
|
|
sv_alarmCount.value_prim = new SceneDataPrimitive();
|
|
sv_alarmCount.value_prim.value = 0;
|
|
sv_alarmCount.value_prim.value = 0;
|
|
sv_alarmCount.value_prim.change = true;
|
|
sv_alarmCount.value_prim.change = true;
|
|
@@ -563,16 +575,16 @@ public class RWDLoadUtil {
|
|
} else {
|
|
} else {
|
|
{
|
|
{
|
|
SceneDataValue svInner = new SceneDataValue(null, null, null, null);
|
|
SceneDataValue svInner = new SceneDataValue(null, null, null, null);
|
|
|
|
+ svInner.finish = true;
|
|
svInner.value_prim = new SceneDataPrimitive();
|
|
svInner.value_prim = new SceneDataPrimitive();
|
|
svInner.value_prim.value = ibmsSceneCode;
|
|
svInner.value_prim.value = ibmsSceneCode;
|
|
- svInner.finish = true;
|
|
|
|
sdo.put("ibmsSceneCode", svInner);
|
|
sdo.put("ibmsSceneCode", svInner);
|
|
}
|
|
}
|
|
{
|
|
{
|
|
SceneDataValue svInner = new SceneDataValue(null, null, null, null);
|
|
SceneDataValue svInner = new SceneDataValue(null, null, null, null);
|
|
|
|
+ svInner.finish = true;
|
|
svInner.value_prim = new SceneDataPrimitive();
|
|
svInner.value_prim = new SceneDataPrimitive();
|
|
svInner.value_prim.value = ibmsClassCode;
|
|
svInner.value_prim.value = ibmsClassCode;
|
|
- svInner.finish = true;
|
|
|
|
sdo.put("ibmsClassCode", svInner);
|
|
sdo.put("ibmsClassCode", svInner);
|
|
}
|
|
}
|
|
}
|
|
}
|