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-12 14:12:05 +08:00
parent e062a568ef
commit dc17707b81
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
iot-common/iot-base/src/main/java/com/qiuguo/iot/base/date/DateEnum.java
View File

@ -191,6 +191,14 @@ public enum DateEnum implements IDate{
return localDateTime.minusDays(-2);
}
},
DEFAULT("默认"){
@Override
public LocalDateTime getDateTime(LocalDateTime localDateTime){
return localDateTime;
}
},
;
Date date;
@ -206,6 +214,6 @@ public enum DateEnum implements IDate{
return dateEnum;
}
}
return null;
return DEFAULT;
}
}

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

@ -274,7 +274,16 @@ public class BaseWebSocketProcess {
}
}else if(action.getSystemTalkAnswerConfigEntity().getAnswerType().equals(AskTypeEnum.TTS.getCode())){
sendMessage(action, baseSession, action.getSystemTalkAnswerConfigEntity().getAnswerValue(), AskTypeEnum.TTS.getCode());
if(!action.getAction().equals(action.getAsk())){
if(!isToQianWen){
isToQianWen = true;
toQianWen(action, baseSession);
}
}else{
sendMessage(action, baseSession, action.getSystemTalkAnswerConfigEntity().getAnswerValue(), AskTypeEnum.TTS.getCode());
}
}else if(action.getSystemTalkAnswerConfigEntity().getAnswerType().equals(AskTypeEnum.QIU_GUO.getCode())){
sendMessage(action, baseSession, action.getSystemTalkAnswerConfigEntity().getAnswerValue(), AskTypeEnum.TTS.getCode());
}