Browse Source

报警工单信息全部更新

menglu 3 years ago
parent
commit
373f3845f3

+ 4 - 1
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/test/CheckTest.java

@@ -12,6 +12,7 @@ import com.persagy.ibms.core.util.FastJsonReaderUtil;
 import com.persagy.ibms.core.util.FastJsonUtil;
 import com.persagy.ibms.data.sdk.util.Constant;
 import com.persagy.ibms.data.sdk.util.RWDLoadUtil;
+import com.persagy.ibms.data.sdk.util.RWDRepositoryUtil;
 import com.persagy.ibms.data.sdk.util.RepositoryContainer;
 import com.persagy.ibms.data.sdk.util.RepositoryImpl;
 
@@ -22,9 +23,11 @@ public class CheckTest {
 
 	public static void test(String[] args) throws Exception {
 		Constant.debug = false;// 调试模式设为true
-		RepositoryImpl Repository = RepositoryContainer.instance;
+		RepositoryImpl Repository = new RepositoryImpl();
 		Repository.use_thread = !Constant.debug;
 		Repository.RepositoryBase = RepositoryContainer.RepositoryBase;
+		RWDRepositoryUtil.DoRepository(Repository, true);
+		RepositoryContainer.instance = Repository;
 		{
 			Repository.property2SDV_enable = true;
 			Repository.property2SDV.clear();

+ 16 - 20
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/util/RWDAlarmUtil.java

@@ -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;
 			}

+ 1 - 3
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/websocket/AlarmWebSocketClient.java

@@ -59,9 +59,7 @@ public class AlarmWebSocketClient extends WebSocketClient {
 			int pushType = (Integer) alarm.get("pushType");
 			if (pushType == 3) {
 				String alarmId = (String) alarm.get("alarmId");
-				String orderId = (String) alarm.get("orderId");
-				String orderStateDesc = (String) alarm.get("orderStateDesc");
-				RWDAlarmUtil.ProcessOrderDesc(alarmId, orderId,orderStateDesc);
+				RWDAlarmUtil.ProcessOrderDesc(alarmId, alarm);
 			} else {
 				try {
 					RWDAlarmUtil.modify_alarm(alarm);