diff --git a/iot-common/iot-third/src/main/java/com/qiuguo/iot/third/nlp/action/Actions.java b/iot-common/iot-third/src/main/java/com/qiuguo/iot/third/nlp/action/Actions.java index 1e53b1f..e70653b 100644 --- a/iot-common/iot-third/src/main/java/com/qiuguo/iot/third/nlp/action/Actions.java +++ b/iot-common/iot-third/src/main/java/com/qiuguo/iot/third/nlp/action/Actions.java @@ -1,5 +1,6 @@ package com.qiuguo.iot.third.nlp.action; +import com.qiuguo.iot.base.enums.AskTypeEnum; import com.qiuguo.iot.base.utils.StringUtils; import com.qiuguo.iot.data.entity.device.DeviceUserBindEntity; import com.qiuguo.iot.data.entity.system.SystemTalkAnswerConfigEntity; @@ -58,6 +59,11 @@ public class Actions { && StringUtils.isNotEmpty(action.getName())){ action.setSystemTalkAnswerConfigEntity(systemTalkAnswerConfigEntity); action.setAction(systemTalkAnswerConfigEntity.getAskKey()); + }else if(systemTalkAnswerConfigEntity.getAnswerType().equals(AskTypeEnum.QIU_GUO.getCode()) && + action.getSystemTalkAnswerConfigEntity().getAnswerType().equals(AskTypeEnum.QIU_GUO.getCode()) && + systemTalkAnswerConfigEntity.getKeyOrder() < action.getSystemTalkAnswerConfigEntity().getKeyOrder()){ + //秋果专有名称按照优先级排序,优先回答优先级高(排序数字小的) + action.setSystemTalkAnswerConfigEntity(systemTalkAnswerConfigEntity); } }