Browse Source

报警转工单的两个bug修复

menglu 3 years ago
parent
commit
0b47726f2c

+ 13 - 1
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/util/RWDAlarmUtil.java

@@ -545,10 +545,22 @@ public class RWDAlarmUtil {
 				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);
 				}
 				break;
 			}
@@ -701,7 +713,7 @@ public class RWDAlarmUtil {
 					handleJSON.put("appId", "systemId");
 					handleJSON.put("userId", paramJSON.get("userId"));
 					handleJSON.put("id", paramJSON.get("id"));
-					handleJSON.put("alarmDescribe", "null");
+					handleJSON.put("alarmDescribe", paramJSON.get("comment"));
 					log.warn(Constant.alarm_url + "/alarmToWorkOrder/transfer" + "\n" + handleJSON.toJSONString());
 					String post_result = HttpClientUtil.post(Constant.alarm_url + "/alarmToWorkOrder/transfer", handleJSON.toJSONString());
 					result = JSON.parseObject(post_result);