From 206c638c29a678da8c3645279875cd20ca688bed Mon Sep 17 00:00:00 2001 From: wulin Date: Sat, 18 Nov 2023 16:07:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=97=B9=E9=92=9F=E6=92=AD?= =?UTF-8?q?=E6=8A=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../qiuguo/iot/third/command/AlarmClockActionCommand.java | 8 ++++---- .../qiuguo/iot/third/command/WeatherActionCommand.java | 2 +- .../iot/user/api/controller/device/DeviceController.java | 2 ++ .../qiuguo/iot/user/api/filter/LogMdcConfiguration.java | 6 +++++- .../iot-box-user-api/src/main/resources/bootstrap-dev.yml | 2 ++ 5 files changed, 14 insertions(+), 6 deletions(-) diff --git a/iot-common/iot-third/src/main/java/com/qiuguo/iot/third/command/AlarmClockActionCommand.java b/iot-common/iot-third/src/main/java/com/qiuguo/iot/third/command/AlarmClockActionCommand.java index 24fc85a..30bb3d1 100644 --- a/iot-common/iot-third/src/main/java/com/qiuguo/iot/third/command/AlarmClockActionCommand.java +++ b/iot-common/iot-third/src/main/java/com/qiuguo/iot/third/command/AlarmClockActionCommand.java @@ -91,9 +91,7 @@ public class AlarmClockActionCommand extends ActionCommand implements IActionCom //大于1分钟 request = new DeviceAlarmClockRecordRequest(); Date date = Date.from(actionTime.getDetailTime().getLocalDateTime().atZone(ZoneId.systemDefault()).toInstant()); - request.setTimes( - date.getTime() / 1000 - ); + request.setTimes(date.getTime() / 1000 - date.getSeconds()); request.setUserId(baseSession.getUserId()); request.setDeviceId(baseSession.getDeviceId()); request.setRepeat(AlarmRepeatEnum.ONE.getCode()); @@ -122,7 +120,7 @@ public class AlarmClockActionCommand extends ActionCommand implements IActionCom }else{ request.setAlarmType(YesNo.YES.getCode()); request.setActionType(action.getSystemTalkAnswerConfigEntity().getAnswerType()); - action.getSystemTalkAnswerConfigEntity().setAnswerValueFaild("已有相关提醒"); + } Integer rDay = day; @@ -223,6 +221,7 @@ public class AlarmClockActionCommand extends ActionCommand implements IActionCom DeviceAlarmClockRecordRequest request, ActionTime actionTime, IActionSendMessage actionSendMessage){ + action.getSystemTalkAnswerConfigEntity().setAnswerValueFaild("无相关提醒"); //先判断是否去掉文案 if(StringUtils.isNotEmpty(alarmClock.getReadText())){ if(alarmClock.getReadText().contains(action.getNoTimeAsk())){ @@ -256,6 +255,7 @@ public class AlarmClockActionCommand extends ActionCommand implements IActionCom Integer rDay, ActionTime actionTime, IActionSendMessage actionSendMessage){ + action.getSystemTalkAnswerConfigEntity().setAnswerValueFaild("已有相关提醒"); if(alarmClock.getId() == null){ //需要新建 diff --git a/iot-common/iot-third/src/main/java/com/qiuguo/iot/third/command/WeatherActionCommand.java b/iot-common/iot-third/src/main/java/com/qiuguo/iot/third/command/WeatherActionCommand.java index d8082f9..4ca0cd1 100644 --- a/iot-common/iot-third/src/main/java/com/qiuguo/iot/third/command/WeatherActionCommand.java +++ b/iot-common/iot-third/src/main/java/com/qiuguo/iot/third/command/WeatherActionCommand.java @@ -54,7 +54,7 @@ public class WeatherActionCommand extends ActionCommand implements IActionComma return sendMessage(action, baseSession, "该城市不支持天气查询", action.getSystemTalkAnswerConfigEntity().getAnswerType(), actionSendMessage); //return Mono.empty(); } - if(!action.getSystemTalkAnswerConfigEntity().getActionStatus().equals(ActionStatusEnum.START.getCode())){ + if(!action.getSystemTalkAnswerConfigEntity().getActionStatus().equals(ActionStatusEnum.GO.getCode())){ //定时查询天气 log.info("定期查询天气"); return alarmClockActionCommand.process(action, baseSession, actionSendMessage); 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 436ec3f..13250b2 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 @@ -84,6 +84,8 @@ public class DeviceController { session.setNickName(userTalkRequst.getNickName()); session.setRoleId(DeviceCodeEnum.BOX.getName()); session.setRequestId(userTalkRequst.getTimeTemp()); + //当不不使用城市时，默认使用杭州查询 + session.setCustomerIP("115.205.2.137"); BaseMessageResp baseMessageResp = new BaseMessageResp(); return ActionCommand.processAction(actions, session, new IActionSendMessage() { @Override diff --git a/iot-modules/iot-box-user-api/src/main/java/com/qiuguo/iot/user/api/filter/LogMdcConfiguration.java b/iot-modules/iot-box-user-api/src/main/java/com/qiuguo/iot/user/api/filter/LogMdcConfiguration.java index 3d6be64..df4d941 100644 --- a/iot-modules/iot-box-user-api/src/main/java/com/qiuguo/iot/user/api/filter/LogMdcConfiguration.java +++ b/iot-modules/iot-box-user-api/src/main/java/com/qiuguo/iot/user/api/filter/LogMdcConfiguration.java @@ -23,6 +23,7 @@ import javax.annotation.PreDestroy; @Slf4j public class LogMdcConfiguration { public static String PRINT_LOG_ID = Log4Constans.PRINT_LOG_ID; + private int errHashcode; @PostConstruct public void contextOperatorHook() { Hooks.onEachOperator(PRINT_LOG_ID, Operators.lift((r, c) ->{ @@ -52,7 +53,10 @@ public class LogMdcConfiguration { @Override public void onError(Throwable throwable) { - log.info("异常{}", throwable); + if(errHashcode != throwable.hashCode()){ + errHashcode = throwable.hashCode(); + log.info("异常{}", throwable); + } coreSubscriber.onError(throwable); MDC.remove(PRINT_LOG_ID); diff --git a/iot-modules/iot-box-user-api/src/main/resources/bootstrap-dev.yml b/iot-modules/iot-box-user-api/src/main/resources/bootstrap-dev.yml index b2fd29e..91edd5a 100644 --- a/iot-modules/iot-box-user-api/src/main/resources/bootstrap-dev.yml +++ b/iot-modules/iot-box-user-api/src/main/resources/bootstrap-dev.yml @@ -40,6 +40,8 @@ spring: port: 32030 password: 123456 timeout: 5000 +tianqiapi: + url: https://v0.yiketianqi.com/api?unescape=1&version=v91&appid=23293151&appsecret=Lj6ZMcqn&ext=life Ali: qianwen: 'sk-8d64677afaf6404cb83ce1910b5b2558' accesskeId: 'LTAI5t7d1iZb18SvGQhtDnyN'