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

修改音乐推送逻辑

Browse Source
This commit is contained in:
wulin 2023-10-28 23:48:34 +08:00
parent 0e1a4d830a
commit d4b58636a8
4 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
iot-modules/iot-box-websocket-api/src/main/java/com/qiuguo/iot/box/websocket/api/command/MusicActionCommand.java
View File

@ -84,13 +84,13 @@ public class MusicActionCommand extends ActionCommand implements IActionCommand
boxSession.setMusic(resp.getMusic()); boxSession.setMusic(resp.getMusic());
baseSession.setMusic(resp.getMusic()); baseSession.setMusic(resp.getMusic());
} }
return Mono.just(true);
}else{ }else{
log.info("设备sn：{}不在线，无法播放", baseSession.getSn()); log.info("设备sn：{}不在线，无法播放", baseSession.getSn());
resp.setText("设备不在线，无法播放"); resp.setText("设备不在线，无法播放");
baseSession.setMusic(null); baseSession.setMusic(null);
resp.setMusic(null); resp.setMusic(null);
resp.setType(AskTypeEnum.TTS.getCode()); resp.setType(AskTypeEnum.TTS.getCode());
} }
}else{//果box的 }else{//果box的
//记录音乐状态 //记录音乐状态

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

@ -13,6 +13,7 @@ import com.qiuguo.iot.box.websocket.api.domain.BaseSession;
import com.qiuguo.iot.box.websocket.api.domain.box.BoxSession; import com.qiuguo.iot.box.websocket.api.domain.box.BoxSession;
import com.qiuguo.iot.box.websocket.api.domain.box.BoxTalkMessage; import com.qiuguo.iot.box.websocket.api.domain.box.BoxTalkMessage;
import com.qiuguo.iot.box.websocket.api.domain.box.resp.BoxMessageResp; import com.qiuguo.iot.box.websocket.api.domain.box.resp.BoxMessageResp;
import com.qiuguo.iot.box.websocket.api.domain.user.UserTalkMessage;
import com.qiuguo.iot.box.websocket.api.filter.LogMdcConfiguration; import com.qiuguo.iot.box.websocket.api.filter.LogMdcConfiguration;
import com.qiuguo.iot.box.websocket.api.filter.LogWebFilter; import com.qiuguo.iot.box.websocket.api.filter.LogWebFilter;
import com.qiuguo.iot.box.websocket.api.service.BaseWebSocketService; import com.qiuguo.iot.box.websocket.api.service.BaseWebSocketService;
@ -145,7 +146,10 @@ public class BoxWebSocketHandler implements WebSocketHandler {
String text = webSocketMessage.getPayloadAsText(); String text = webSocketMessage.getPayloadAsText();
log.info("设备端收到消息：{}", text); log.info("设备端收到消息：{}", text);
BoxTalkMessage boxTalkMessage = JSONObject.parseObject(text, BoxTalkMessage.class); BoxTalkMessage boxTalkMessage = JSONObject.parseObject(text, BoxTalkMessage.class);
boxTalkMessage.setSn(boxSession.getSn()); if(boxTalkMessage.getSn() == null || !boxTalkMessage.getSn().equals(boxSession.getSn())){
log.info("设备信息有误不能为空");
return baseWebSocketService.closeSendMsg(boxSession, "设备信息不全", AskTypeEnum.TIME.getCode());
}
log.info("收到SN:{}，消息：{}", boxTalkMessage.getSn(), boxTalkMessage.getMessage()); log.info("收到SN:{}，消息：{}", boxTalkMessage.getSn(), boxTalkMessage.getMessage());
return nlpService.getActionWithLacSingle( return nlpService.getActionWithLacSingle(
boxSession.getUserId(), boxSession.getUserId(),

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

@ -116,7 +116,10 @@ public class CustomerWebSocketHandler implements WebSocketHandler {
String text = webSocketMessage.getPayloadAsText(); String text = webSocketMessage.getPayloadAsText();
log.info("收到用户消息：{}", text); log.info("收到用户消息：{}", text);
UserTalkMessage userTalkMessage = JSONObject.parseObject(text, UserTalkMessage.class); UserTalkMessage userTalkMessage = JSONObject.parseObject(text, UserTalkMessage.class);
userTalkMessage.setUserId(userSession.getUserId()); if(userTalkMessage.getUserId() == null || !userTalkMessage.getUserId().equals(userSession.getUserId())){
log.info("用户ID不能为空");
return baseWebSocketService.closeSendMsg(userSession, "用户信息有无", AskTypeEnum.TIME.getCode());
}
log.info("收到用户userId:{}，消息：{}", userTalkMessage.getUserId(), userTalkMessage.getMessage()); log.info("收到用户userId:{}，消息：{}", userTalkMessage.getUserId(), userTalkMessage.getMessage());
return nlpService.getActionWithLacSingle( return nlpService.getActionWithLacSingle(
userSession.getUserId(), userSession.getUserId(),

2
iot-modules/iot-box-websocket-api/src/main/java/com/qiuguo/iot/box/websocket/api/service/BaseWebSocketService.java
View File

@ -306,7 +306,7 @@ public class BaseWebSocketService {
}else{ }else{
sendMsg(baseSession, JSONObject.toJSONString(baseMessageResp)); sendMsg(baseSession, JSONObject.toJSONString(baseMessageResp));
} }
} }
/** /**