|
|
@@ -114,14 +114,16 @@ public class SocWebSocketHandler extends AbstractWebSocketHandler {
|
|
|
Object obj = websocketResult.getPayload();
|
|
|
if (ObjectUtil.isNotEmpty(obj)){
|
|
|
Map map = JSON.parseObject(obj.toString(), Map.class);
|
|
|
- String key = (String) map.get(WebSocketConstants.EVENT);
|
|
|
+ //上报事件
|
|
|
+ String event = (String) map.get(WebSocketConstants.EVENT);
|
|
|
+ //上报消息内容
|
|
|
JSONObject args = (JSONObject) map.get(WebSocketConstants.ARGS);
|
|
|
- if (ObjectUtil.isEmpty(key)||args.isEmpty()){
|
|
|
+ if (ObjectUtil.isEmpty(event)||args.isEmpty()){
|
|
|
log.error("消息内容为空:{}",message.getPayload());
|
|
|
return;
|
|
|
}
|
|
|
- RouterService routeService = RouterServiceHandler.getRouteService(key);
|
|
|
- routeService.execute(args);
|
|
|
+ RouterService routeService = RouterServiceHandler.getRouteService(event);
|
|
|
+ routeService.execute(event,args);
|
|
|
//todo 返回iot消息
|
|
|
}
|
|
|
} catch (Exception e) {
|