wulin/qiuguo-iot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改U3D MQ

Browse Source
This commit is contained in:
wulin 2023-10-17 20:56:49 +08:00
parent cc208363d6
commit 15e654c897
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
iot-modules/iot-box-websocket-api/src/main/java/com/qiuguo/iot/box/websocket/api/handler/BaseWebSocketProcess.java
View File

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