|
@@ -4,9 +4,6 @@ import java.net.URI;
|
|
|
import java.nio.ByteBuffer;
|
|
|
import java.util.Map;
|
|
|
|
|
|
-import com.huashe.park.common.consts.BDConst;
|
|
|
-import com.huashe.park.domain.dto.UWBAuth;
|
|
|
-import com.huashe.park.infrastructure.cfg.forest.UWBForestCfg;
|
|
|
import org.java_websocket.drafts.Draft;
|
|
|
import org.java_websocket.handshake.ServerHandshake;
|
|
|
import org.slf4j.Logger;
|
|
@@ -15,6 +12,9 @@ import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
|
|
import com.alibaba.fastjson2.JSON;
|
|
|
import com.alibaba.fastjson2.JSONObject;
|
|
|
+import com.huashe.park.common.consts.BDConst;
|
|
|
+import com.huashe.park.domain.dto.UWBAuth;
|
|
|
+import com.huashe.park.infrastructure.cfg.forest.UWBForestCfg;
|
|
|
|
|
|
import net.dreamlu.iot.mqtt.spring.client.MqttClientTemplate;
|
|
|
|
|
@@ -61,9 +61,8 @@ public class UWBSocketClient extends org.java_websocket.client.WebSocketClient {
|
|
|
log.debug("[websocket] 收到消息={}", message);
|
|
|
JSONObject data = JSON.parseObject(message);
|
|
|
if (!"handshake".equals(data.getString("message"))) {
|
|
|
- client.publish(String.format(BDConst.MQTT_TOPIC.UWB_VIDEO_TRACE_POINT, uwbForestCfg.getTestTag()), JSON.toJSONBytes(data));
|
|
|
- // TODO 推送轨迹
|
|
|
- // client.publish(String.format(BDConst.MQTT_TOPIC.UWB_VIDEO_TRACE, "847F3"), JSON.toJSONBytes(data));
|
|
|
+ client.publish(String.format(BDConst.MQTT_TOPIC.UWB_VIDEO_TRACE_POINT, uwbForestCfg.getTestTag()),
|
|
|
+ JSON.toJSONBytes(data));
|
|
|
return;
|
|
|
}
|
|
|
this.authToken.setTagId(uwbForestCfg.getTestTag());
|
|
@@ -75,7 +74,6 @@ public class UWBSocketClient extends org.java_websocket.client.WebSocketClient {
|
|
|
@Override
|
|
|
public void onMessage(ByteBuffer bytes) {
|
|
|
log.debug("[websocket] 收到消息={}", JSON.parseObject(bytes.array()));
|
|
|
-
|
|
|
}
|
|
|
|
|
|
@Override
|