Browse Source

初次推送打包

menglu 3 years ago
parent
commit
8e1f9a4e2a

+ 4 - 1
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/service/websocket/server/WebSocketChannelPool.java

@@ -3,6 +3,9 @@ package com.persagy.ibms.data.sdk.service.websocket.server;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.serializer.SerializerFeature;
+
 import io.netty.channel.Channel;
 import io.netty.channel.group.ChannelGroup;
 import io.netty.channel.group.DefaultChannelGroup;
@@ -21,7 +24,7 @@ public class WebSocketChannelPool {
 		try {
 			Channel channel = id2Channel.get(id);
 			if (channel != null) {
-				String sendString = content.toString();
+				String sendString = JSONObject.toJSONString(content, SerializerFeature.WriteMapNullValue);
 				channel.writeAndFlush(new TextWebSocketFrame(sendString));
 			}
 		} catch (Exception e) {

+ 4 - 2
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/service/websocket/server/WebSocketUtil.java

@@ -306,8 +306,10 @@ public class WebSocketUtil {
 	}
 
 	private static void SendAndClear(String id, JSONArray sendArray) {
-		WebSocketChannelPool.Send(id, sendArray);
-		sendArray.clear();
+		if (sendArray.size() > 16) {
+			WebSocketChannelPool.Send(id, sendArray);
+			sendArray.clear();
+		}
 	}
 
 	private static boolean pathMatch(List<JSONArray> pathList, JSONArray pathArray) {