From 85b91c753100332e16959dd36646bf92f3c42a71 Mon Sep 17 00:00:00 2001 From: wulin Date: Sat, 18 Nov 2023 09:45:34 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8B=A6=E6=88=AAbox=E5=92=8C=E7=89=A9?= =?UTF-8?q?=E8=81=94=E7=BD=91=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../qiuguo/iot/third/command/ActionCommand.java | 8 ++------ .../iot/third/command/QianWenActionCommand.java | 5 ++++- .../iot/third/command/QiuGuoActionCommand.java | 2 +- .../iot/third/command/TtsActionCommand.java | 5 ++++- .../third/command/UserConfigActionCommand.java | 4 ++-- .../api/controller/device/DeviceController.java | 15 ++++++++++----- 6 files changed, 23 insertions(+), 16 deletions(-) diff --git a/iot-common/iot-third/src/main/java/com/qiuguo/iot/third/command/ActionCommand.java b/iot-common/iot-third/src/main/java/com/qiuguo/iot/third/command/ActionCommand.java index f6553f5..581797e 100644 --- a/iot-common/iot-third/src/main/java/com/qiuguo/iot/third/command/ActionCommand.java +++ b/iot-common/iot-third/src/main/java/com/qiuguo/iot/third/command/ActionCommand.java @@ -191,13 +191,9 @@ public abstract class ActionCommand { if(data.getCode() == 200){ log.info("千问正常结束"); //保存记录 - return actionSendMessage.sendMsgFinished(action, baseSession, data.getResut()).flatMap(b -> { - return Mono.just(false); - }); + return actionSendMessage.sendMsgFinished(action, baseSession, data.getResut()); }else{ - return sendMessage(action, baseSession, "很抱歉，我无法回答您的问题，请换一个问题。", AskTypeEnum.NONE.getCode(), actionSendMessage).flatMap(b ->{ - return Mono.just(false); - }); + return sendMessage(action, baseSession, "很抱歉，我无法回答您的问题，请换一个问题。", AskTypeEnum.NONE.getCode(), actionSendMessage); } }); } diff --git a/iot-common/iot-third/src/main/java/com/qiuguo/iot/third/command/QianWenActionCommand.java b/iot-common/iot-third/src/main/java/com/qiuguo/iot/third/command/QianWenActionCommand.java index 4427e55..640ac87 100644 --- a/iot-common/iot-third/src/main/java/com/qiuguo/iot/third/command/QianWenActionCommand.java +++ b/iot-common/iot-third/src/main/java/com/qiuguo/iot/third/command/QianWenActionCommand.java @@ -17,6 +17,9 @@ public class QianWenActionCommand extends ActionCommand implements IActionComma return toTongYi(action, baseSession, action.getSystemTalkAnswerConfigEntity() == null ? AskTypeEnum.TTS.getCode() : action.getSystemTalkAnswerConfigEntity().getAnswerType(), - actionSendMessage); + actionSendMessage).flatMap(vo ->{ + //千问只调一次 + return Mono.empty(); + }); } } diff --git a/iot-common/iot-third/src/main/java/com/qiuguo/iot/third/command/QiuGuoActionCommand.java b/iot-common/iot-third/src/main/java/com/qiuguo/iot/third/command/QiuGuoActionCommand.java index 1f0fc8a..9dac071 100644 --- a/iot-common/iot-third/src/main/java/com/qiuguo/iot/third/command/QiuGuoActionCommand.java +++ b/iot-common/iot-third/src/main/java/com/qiuguo/iot/third/command/QiuGuoActionCommand.java @@ -19,7 +19,7 @@ public class QiuGuoActionCommand extends ActionCommand implements IActionComman AskTypeEnum.TTS.getCode(), actionSendMessage).flatMap(m ->{ //自定义只能到这里截止 - return Mono.just(false); + return Mono.empty(); }); } } diff --git a/iot-common/iot-third/src/main/java/com/qiuguo/iot/third/command/TtsActionCommand.java b/iot-common/iot-third/src/main/java/com/qiuguo/iot/third/command/TtsActionCommand.java index 442e7e6..61af5d5 100644 --- a/iot-common/iot-third/src/main/java/com/qiuguo/iot/third/command/TtsActionCommand.java +++ b/iot-common/iot-third/src/main/java/com/qiuguo/iot/third/command/TtsActionCommand.java @@ -20,7 +20,10 @@ public class TtsActionCommand extends ActionCommand implements IActionCommand{ baseSession, AskTypeEnum.TTS.getCode(), actionSendMessage - ); + ).flatMap(vo ->{ + //千问只调一次 + return Mono.empty(); + }); }else{ return sendMessage(action, baseSession, diff --git a/iot-common/iot-third/src/main/java/com/qiuguo/iot/third/command/UserConfigActionCommand.java b/iot-common/iot-third/src/main/java/com/qiuguo/iot/third/command/UserConfigActionCommand.java index ef40348..ac9176e 100644 --- a/iot-common/iot-third/src/main/java/com/qiuguo/iot/third/command/UserConfigActionCommand.java +++ b/iot-common/iot-third/src/main/java/com/qiuguo/iot/third/command/UserConfigActionCommand.java @@ -37,7 +37,7 @@ public class UserConfigActionCommand extends ActionCommand implements IActionCo AskTypeEnum.TTS.getCode(), actionSendMessage).flatMap(m ->{ //自定义只能到这里截止 - return Mono.just(false); + return Mono.empty(); }); }else{ log.info("调用用户匹配的回答"); @@ -47,7 +47,7 @@ public class UserConfigActionCommand extends ActionCommand implements IActionCo AskTypeEnum.TTS.getCode(), actionSendMessage).flatMap(m ->{ //自定义只能到这里截止 - return Mono.just(false); + return Mono.empty(); }); } }); diff --git a/iot-modules/iot-box-user-api/src/main/java/com/qiuguo/iot/user/api/controller/device/DeviceController.java b/iot-modules/iot-box-user-api/src/main/java/com/qiuguo/iot/user/api/controller/device/DeviceController.java index 37e90bb..f7f6188 100644 --- a/iot-modules/iot-box-user-api/src/main/java/com/qiuguo/iot/user/api/controller/device/DeviceController.java +++ b/iot-modules/iot-box-user-api/src/main/java/com/qiuguo/iot/user/api/controller/device/DeviceController.java @@ -1,10 +1,7 @@ package com.qiuguo.iot.user.api.controller.device; import com.alibaba.fastjson.JSONArray; -import com.qiuguo.iot.base.enums.DeviceCodeEnum; -import com.qiuguo.iot.base.enums.DeviceTypeEnum; -import com.qiuguo.iot.base.enums.OrderByEnum; -import com.qiuguo.iot.base.enums.YesNo; +import com.qiuguo.iot.base.enums.*; import com.qiuguo.iot.base.utils.StringUtils; import com.qiuguo.iot.data.domain.BaseMessageResp; import com.qiuguo.iot.data.domain.BaseSession; @@ -89,6 +86,14 @@ public class DeviceController { return ActionCommand.processAction(actions, session, new IActionSendMessage() { @Override public Mono sendMessage(Action action, BaseSession baseSession, BaseMessageResp resp) { + int type = resp.getType(); + if(type == AskTypeEnum.ALARM_CLOCK.getCode().intValue() + || type == AskTypeEnum.MUSIC.getCode().intValue() + || type == AskTypeEnum.U3D.getCode().intValue()){ + resp.setText("需要购买秋果Box才具备该功能！"); + }else if(type == AskTypeEnum.IOT.getCode().intValue()){ + resp.setText("需要购买秋果Box和秋果物联网设备才具备该功能！"); + } BeanUtils.copyProperties(resp, baseMessageResp); return Mono.just(true); } @@ -128,7 +133,7 @@ public class DeviceController { //调用远端 return null; } - }).flatMap(fm -> { + }).defaultIfEmpty(false).flatMap(fm -> { return Mono.just(baseMessageResp); });