Browse Source

增加text

menglu 3 years ago
parent
commit
a6cc6b150f

+ 9 - 7
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/websocket/IOTWebSocketClient.java

@@ -49,7 +49,7 @@ public class IOTWebSocketClient extends WebSocketClient {
 		try {
 			JSONObject json = (JSONObject) JSON.parse(arg0);
 			String type = json.getString("type");
-			if (type.equals("iot")) {
+			if (type.equals("iot") || type.equals("text")) {
 				String message = json.getString("data");
 				// String message = GZIPCompressUtil.uncompress(arg0);
 				// log.info(message);
@@ -69,13 +69,15 @@ public class IOTWebSocketClient extends WebSocketClient {
 							RepositoryBase.sdv2point.putIfAbsent(sdvInner, meter + "-" + funcid);
 						}
 						SceneDataValue data = RepositoryBase.point2sdv.get(meter + "-" + funcid);
-						Object dataObject;
-						try {
-							dataObject = Double.parseDouble(value);
-						} catch (Exception e) {
-							dataObject = value;
+						if (type.equals("iot")) {
+							try {
+								data.value_prim.value = Double.parseDouble(value);
+							} catch (Exception e) {
+								// e.printStackTrace();
+							}
+						} else if (type.equals("text")) {
+							data.value_prim.value = value;
 						}
-						data.value_prim.value = dataObject;
 					} catch (Exception e) {
 						// log.info("onMessage" + "\t" + meter + "-" + funcid + "\t" + value);
 					}