Browse Source

报警和对象都增加了ibmsxianshimingcheng和ibmsxianshibianma

menglu 3 years ago
parent
commit
c1c6264e06

+ 4 - 0
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/util/RWDAlarmUtil.java

@@ -386,6 +386,10 @@ public class RWDAlarmUtil {
 					SceneDataValue sdvInner = sdoInner.get("ibmsxianshimingcheng");
 					alarm.put("ibmsxianshimingcheng", sdvInner.value_prim.value);
 				}
+				if (sdoInner.containsKey("ibmsxianshibianma")) {
+					SceneDataValue sdvInner = sdoInner.get("ibmsxianshibianma");
+					alarm.put("ibmsxianshibianma", sdvInner.value_prim.value);
+				}
 			}
 		}
 	}

+ 8 - 2
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/util/RWDLoadUtil.java

@@ -615,7 +615,6 @@ public class RWDLoadUtil {
 				for (int ii = 0; ii < array.size(); ii++) {
 					JSONObject arrayItem = array.getJSONObject(ii);
 					String id = (String) arrayItem.get("id");
-					String ibmsxianshimingcheng = (String) arrayItem.get("ibmsxianshimingcheng");
 					SceneDataObject sdo = Repository.id2sdv.get(id);
 					if (sdo == null) {
 						continue;
@@ -641,9 +640,16 @@ public class RWDLoadUtil {
 							SceneDataValue svInner = new SceneDataValue(null, null, null, null);
 							svInner.finish = true;
 							svInner.value_prim = new SceneDataPrimitive();
-							svInner.value_prim.value = ibmsxianshimingcheng;
+							svInner.value_prim.value = arrayItem.get("ibmsxianshimingcheng");
 							sdo.put("ibmsxianshimingcheng", svInner);
 						}
+						{
+							SceneDataValue svInner = new SceneDataValue(null, null, null, null);
+							svInner.finish = true;
+							svInner.value_prim = new SceneDataPrimitive();
+							svInner.value_prim.value = arrayItem.get("ibmsxianshibianma");
+							sdo.put("ibmsxianshibianma", svInner);
+						}
 						SceneDataObject sodChild = new SceneDataObject(Repository, null, null, SceneDataValue, null, null, sdo);
 						SceneDataSet.set.add(sodChild);
 					}