diff --git a/iot-modules/iot-box-websocket-api/src/main/java/com/qiuguo/iot/box/websocket/api/handler/BaseWebSocketProcess.java b/iot-modules/iot-box-websocket-api/src/main/java/com/qiuguo/iot/box/websocket/api/handler/BaseWebSocketProcess.java index 2617ab4..04faef5 100644 --- a/iot-modules/iot-box-websocket-api/src/main/java/com/qiuguo/iot/box/websocket/api/handler/BaseWebSocketProcess.java +++ b/iot-modules/iot-box-websocket-api/src/main/java/com/qiuguo/iot/box/websocket/api/handler/BaseWebSocketProcess.java @@ -105,11 +105,14 @@ public class BaseWebSocketProcess { if(U3dMsgTypeEnum.IOT.getCode().equals(u3dMsg.getMsgType())){ //物联网操作 DeviceUserBindRequest deviceBindRequest = new DeviceUserBindRequest(); - deviceBindRequest.setU3dId(Long.getLong(u3dMsg.getMetaId())); - deviceBindRequest.setScenceId(Long.getLong(u3dMsg.getScenceId())); + deviceBindRequest.setU3dId(Long.parseLong(u3dMsg.getMetaId())); + if(StringUtils.isNotEmpty(u3dMsg.getScenceId())){ + deviceBindRequest.setScenceId(Long.parseLong(u3dMsg.getScenceId())); + } + deviceUserBindService.selectDeviceUserBindByRequest(deviceBindRequest).map(db ->{ SystemTalkBindDeviceRequest systemTalkBindDeviceRequest = new SystemTalkBindDeviceRequest(); - systemTalkBindDeviceRequest.setU3dStatusId(Long.getLong(u3dMsg.getStatusId())); + systemTalkBindDeviceRequest.setU3dStatusId(Long.parseLong(u3dMsg.getStatusId())); systemTalkBindDeviceRequest.setCategoryCode(db.getCategoryCode()); systemTalkBindDeviceService.selectSystemTalkBindDeviceByRequest(systemTalkBindDeviceRequest).map(sd -> { TuyaQuery query = new TuyaQuery(); @@ -124,8 +127,6 @@ public class BaseWebSocketProcess { }).subscribe(); return db; }).subscribe(); - - } //处理完毕 手动消息确认 配置需开启 acknowledge-mode: manual channel.basicAck(message.getMessageProperties().getDeliveryTag(), false); @@ -173,13 +174,14 @@ public class BaseWebSocketProcess { return; } log.info("已经有新的请求,不在推送到客户端SN:{} userId:{}", baseSession.getSn(), baseSession.getUserId()); - MDC.remove(Log4Constans.PRINT_LOG_ID); + } @Override public void finish() { log.info("千问最后调用finish"); normalSendMsg(baseSession, sb.toString(), type); + MDC.remove(Log4Constans.PRINT_LOG_ID); } }).flatMap(data ->{ if(data.getCode() == 200){