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

Merge remote-tracking branch 'origin/feature-BOX一期' into feature-BOX一期

Browse Source
This commit is contained in:
weiyachao 2023-10-18 17:48:24 +08:00
commit 3ad5a7da6c
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,6 +42,7 @@ import org.hswebframework.web.api.crud.entity.PagerResult;
import org.slf4j.MDC; import org.slf4j.MDC;
import org.springframework.amqp.core.Message; import org.springframework.amqp.core.Message;
import org.springframework.amqp.rabbit.annotation.RabbitListener; import org.springframework.amqp.rabbit.annotation.RabbitListener;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.reactive.socket.WebSocketSession; import org.springframework.web.reactive.socket.WebSocketSession;
import reactor.core.publisher.Mono; import reactor.core.publisher.Mono;
@ -713,8 +714,10 @@ public class BaseWebSocketProcess {
if(this instanceof BoxWebSocketHandler){ if(this instanceof BoxWebSocketHandler){
audioService.getAudioUrl(baseMessageResp.getText()).map(s ->{ audioService.getAudioUrl(baseMessageResp.getText()).map(s ->{
log.info("音频地址：{}", s); log.info("音频地址：{}", s);
((BoxMessageResp)baseMessageResp).setAudio(s); BoxMessageResp boxMessageResp = new BoxMessageResp();
baseSession.getSink().next(baseSession.getSession().textMessage(JSONObject.toJSONString(baseMessageResp))); BeanUtils.copyProperties(baseMessageResp, boxMessageResp);
boxMessageResp.setAudio(s);
baseSession.getSink().next(baseSession.getSession().textMessage(JSONObject.toJSONString(boxMessageResp)));
return s; return s;
}).subscribe(); }).subscribe();
}else{ }else{