Browse Source

Merge branch 'master' of http://39.106.8.246:3003/IBMS/ibms-sdk

luoguangyi 3 năm trước cách đây
mục cha
commit
aa275d6b05

+ 19 - 0
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/util/RWDLoadUtil.java

@@ -537,6 +537,7 @@ public class RWDLoadUtil {
 				String ibmsSceneCode = (String) classItem.get("ibmsSceneCode");
 				String ibmsClassCode = (String) classItem.get("ibmsClassCode");
 				String code = (String) classItem.get("code");
+				String flag = (String) classItem.get("flag");
 				if (!objectArrayDicZKT.containsKey(ibmsSceneCode)) {
 					objectArrayDicZKT.put(ibmsSceneCode, new HashMap<String, SceneDataSet>());
 				}
@@ -557,6 +558,24 @@ public class RWDLoadUtil {
 					JSONObject arrayItem = array.getJSONObject(ii);
 					String id = (String) arrayItem.get("id");
 					SceneDataObject sdo = Repository.id2sdv.get(id);
+					if (flag != null && flag.equals("reference")) {
+
+					} else {
+						{
+							SceneDataValue svInner = new SceneDataValue(null, null, null, null);
+							svInner.value_prim = new SceneDataPrimitive();
+							svInner.value_prim.value = ibmsSceneCode;
+							svInner.finish = true;
+							sdo.put("ibmsSceneCode", svInner);
+						}
+						{
+							SceneDataValue svInner = new SceneDataValue(null, null, null, null);
+							svInner.value_prim = new SceneDataPrimitive();
+							svInner.value_prim.value = ibmsClassCode;
+							svInner.finish = true;
+							sdo.put("ibmsClassCode", svInner);
+						}
+					}
 					SceneDataSet.set.add(sdo);
 				}
 				mapInner.put(ibmsClassCode, SceneDataSet);

+ 2 - 1
ibms-data-sdk/src/main/resources/config.xml

@@ -23,8 +23,9 @@
 	<iot_project url="http://192.168.100.33:9909/iot-project/" />
 	<!-- 报警的websocket地址和服务地址 -->
 	<!--
-	-->
 	<alarm enable="true" websocket="ws://192.168.100.33:9909/webSocketServer" rest="http://192.168.100.33:9909/zkt-alarm/" rest_get="false" />
+	-->
+	<alarm enable="true" websocket="ws://192.168.100.33:8835/webSocketServer" rest="http://192.168.100.33:9909/ibms-alarm/" rest_get="true" />
 	<!--
 	<alarm enable="true" websocket="http://39.102.43.179:9993/webSocketServer" rest="http://39.102.43.179:9993/" rest_get="true" />
 	-->