|
@@ -538,29 +538,25 @@ public class RWDAlarmUtil {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- public static synchronized void ProcessOrderDesc(String id, String orderId, String orderStateDesc) {
|
|
|
+ public static synchronized void ProcessOrderDesc(String id, JSONObject alarm_order) {
|
|
|
for (SceneDataObject sdo : RepositoryContainer.RepositoryBase.alarmArray.set) {
|
|
|
String idInner = (String) sdo.get("id").value_prim.value;
|
|
|
if (idInner.equals(id)) {
|
|
|
- SceneDataValue orderIdInner = sdo.get("orderId");
|
|
|
- if (orderIdInner != null) {
|
|
|
- orderIdInner.value_prim.value = orderId;
|
|
|
- } else {
|
|
|
- SceneDataValue svInner = new SceneDataValue(null, null, null, null);
|
|
|
- svInner.finish = true;
|
|
|
- svInner.value_prim = new SceneDataPrimitive();
|
|
|
- svInner.value_prim.value = orderId;
|
|
|
- sdo.put("orderId", svInner);
|
|
|
- }
|
|
|
- SceneDataValue orderStateDescInner = sdo.get("orderStateDesc");
|
|
|
- if (orderStateDescInner != null) {
|
|
|
- orderStateDescInner.value_prim.value = orderStateDesc;
|
|
|
- } else {
|
|
|
- SceneDataValue svInner = new SceneDataValue(null, null, null, null);
|
|
|
- svInner.finish = true;
|
|
|
- svInner.value_prim = new SceneDataPrimitive();
|
|
|
- svInner.value_prim.value = orderStateDesc;
|
|
|
- sdo.put("orderStateDesc", svInner);
|
|
|
+ for (String key : alarm_order.keySet()) {
|
|
|
+ if (key.equals("alarmId") || key.equals("pushType")) {
|
|
|
+ continue;
|
|
|
+ }
|
|
|
+ Object value = alarm_order.get(key);
|
|
|
+ SceneDataValue orderIdInner = sdo.get(key);
|
|
|
+ if (orderIdInner != null) {
|
|
|
+ orderIdInner.value_prim.value = value;
|
|
|
+ } else {
|
|
|
+ SceneDataValue svInner = new SceneDataValue(null, null, null, null);
|
|
|
+ svInner.finish = true;
|
|
|
+ svInner.value_prim = new SceneDataPrimitive();
|
|
|
+ svInner.value_prim.value = value;
|
|
|
+ sdo.put(key, svInner);
|
|
|
+ }
|
|
|
}
|
|
|
break;
|
|
|
}
|