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-30 14:56:39 +08:00
parent a063551a56
commit 7d17ebfd98
2 changed files with 32 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -43,12 +43,23 @@ public class U3DActionCommand extends ActionCommand implements IActionCommand{
//数字人的id直接用用户id来代替 //数字人的id直接用用户id来代替
if(U3dMsgTypeEnum.DANCE.getCode().equals(systemTalkBindU3d.getU3dType())){ if(U3dMsgTypeEnum.DANCE.getCode().equals(systemTalkBindU3d.getU3dType())){
//推送客户端跳舞 //推送客户端跳舞
BoxMessageResp resp = new BoxMessageResp(); BoxMessageResp resp = new BoxMessageResp();
if(baseSession.getUserId().equals(1291978L)){
resp.setType(AskTypeEnum.TTS.getCode());
resp.setText("抱歉，我还么学会跳舞");
/*ActionResp actionResp = new ActionResp();
actionResp.setType(7);
resp.setAction(actionResp);*/
}else{
resp.setType(AskTypeEnum.U3D.getCode()); resp.setType(AskTypeEnum.U3D.getCode());
resp.setText("开始跳舞"); resp.setText("开始跳舞");
ActionResp actionResp = new ActionResp(); ActionResp actionResp = new ActionResp();
actionResp.setType(7); actionResp.setType(7);
resp.setAction(actionResp); resp.setAction(actionResp);
}
return baseWebSocketService.sendMessage(action, baseSession, resp); return baseWebSocketService.sendMessage(action, baseSession, resp);
}else{ }else{
//推送MQ换装 //推送MQ换装

16
iot-modules/iot-box-websocket-api/src/main/java/com/qiuguo/iot/box/websocket/api/controller/WebsocketController.java
View File

@ -11,9 +11,11 @@ import com.qiuguo.iot.base.utils.StringUtils;
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.service.BaseWebSocketService; import com.qiuguo.iot.box.websocket.api.service.BaseWebSocketService;
import com.qiuguo.iot.box.websocket.api.service.WebsocketService; import com.qiuguo.iot.box.websocket.api.service.WebsocketService;
import com.qiuguo.iot.data.constants.YunxiRabbitConst;
import com.qiuguo.iot.data.entity.device.DeviceInfoEntity; import com.qiuguo.iot.data.entity.device.DeviceInfoEntity;
import com.qiuguo.iot.data.request.device.DeviceInfoRequest; import com.qiuguo.iot.data.request.device.DeviceInfoRequest;
import com.qiuguo.iot.data.service.device.DeviceInfoService; import com.qiuguo.iot.data.service.device.DeviceInfoService;
import com.qiuguo.iot.data.service.mq.MqService;
import com.qiuguo.iot.data.service.system.SystemTalkAnswerConfigService; import com.qiuguo.iot.data.service.system.SystemTalkAnswerConfigService;
import com.qiuguo.iot.third.nlp.Nlp; import com.qiuguo.iot.third.nlp.Nlp;
import com.qiuguo.iot.third.service.LacNlpService; import com.qiuguo.iot.third.service.LacNlpService;
@ -63,6 +65,9 @@ public class WebsocketController {
@Value("${Ali.accesskeySecret}") @Value("${Ali.accesskeySecret}")
private String aliAccessSecret; private String aliAccessSecret;
@Resource
MqService mqService;
@GetMapping("/push/message") @GetMapping("/push/message")
public Mono<String> pushMessage(@RequestParam String message, @RequestParam String id, @RequestParam Integer type) { public Mono<String> pushMessage(@RequestParam String message, @RequestParam String id, @RequestParam Integer type) {
@ -83,6 +88,17 @@ public class WebsocketController {
} }
@GetMapping("/mq/test")
public Mono<String> sysTalkAnswer(@RequestParam String value) {
return mqService.sendMessageWithConfirmation(YunxiRabbitConst.EXCHANGE_YUNXI_EVENT,
"U3D.TO",
value,
2).flatMap(b -> {
return Mono.just("测试MQ发送" + b);
});
}
@GetMapping("/test/nlp") @GetMapping("/test/nlp")
public Mono<Nlp> nlp(@RequestParam String value, @RequestParam String type) { public Mono<Nlp> nlp(@RequestParam String value, @RequestParam String type) {