From fcf785b50f1f64d8646ef033c858823301cad265 Mon Sep 17 00:00:00 2001 From: wulin Date: Fri, 27 Oct 2023 15:33:35 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=B6=E9=97=B4=E8=AF=A2=E9=97=AE=E6=AC=A1?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E6=97=B6=E5=8C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iot/base/utils/ChineseDateTimeUtils.java | 2 +- .../com/qiuguo/iot/base/utils/DateTimeUtils.java | 16 ++++++++++++++++ .../qiuguo/iot/third/nlp/action/ActionTime.java | 5 ++++- .../api/controller/device/DeviceController.java | 3 ++- .../api/controller/DeviceController.java | 3 ++- 5 files changed, 25 insertions(+), 4 deletions(-) create mode 100644 iot-common/iot-base/src/main/java/com/qiuguo/iot/base/utils/DateTimeUtils.java diff --git a/iot-common/iot-base/src/main/java/com/qiuguo/iot/base/utils/ChineseDateTimeUtils.java b/iot-common/iot-base/src/main/java/com/qiuguo/iot/base/utils/ChineseDateTimeUtils.java index 3f6f7a2..241c165 100644 --- a/iot-common/iot-base/src/main/java/com/qiuguo/iot/base/utils/ChineseDateTimeUtils.java +++ b/iot-common/iot-base/src/main/java/com/qiuguo/iot/base/utils/ChineseDateTimeUtils.java @@ -11,7 +11,7 @@ public class ChineseDateTimeUtils { * @return */ public static LocalDateTime getDateWithString(String c){ - return getDateTime(c.replace("的", ""), LocalDateTime.now(), 0, 0); + return getDateTime(c.replace("的", ""), DateTimeUtils.getNowLocalDateTime(), 0, 0); } private static int checkDayOfMonth(LocalDateTime localDateTime, int i){ diff --git a/iot-common/iot-base/src/main/java/com/qiuguo/iot/base/utils/DateTimeUtils.java b/iot-common/iot-base/src/main/java/com/qiuguo/iot/base/utils/DateTimeUtils.java new file mode 100644 index 0000000..4dc5f06 --- /dev/null +++ b/iot-common/iot-base/src/main/java/com/qiuguo/iot/base/utils/DateTimeUtils.java @@ -0,0 +1,16 @@ +package com.qiuguo.iot.base.utils; + +import java.time.LocalDateTime; +import java.time.ZoneId; + +public class DateTimeUtils { + public static LocalDateTime getNowLocalDateTime() { + + return getNowLocalDateTime("Asia/Shanghai"); + } + + public static LocalDateTime getNowLocalDateTime(String zoneId) { + ZoneId id = ZoneId.of(zoneId); + return LocalDateTime.now().atZone(id).toLocalDateTime(); + } +} diff --git a/iot-common/iot-third/src/main/java/com/qiuguo/iot/third/nlp/action/ActionTime.java b/iot-common/iot-third/src/main/java/com/qiuguo/iot/third/nlp/action/ActionTime.java index 5754fce..17d6c57 100644 --- a/iot-common/iot-third/src/main/java/com/qiuguo/iot/third/nlp/action/ActionTime.java +++ b/iot-common/iot-third/src/main/java/com/qiuguo/iot/third/nlp/action/ActionTime.java @@ -1,11 +1,14 @@ package com.qiuguo.iot.third.nlp.action; import com.qiuguo.iot.base.utils.ChineseDateTimeUtils; +import com.qiuguo.iot.base.utils.DateTimeUtils; import com.qiuguo.iot.base.utils.StringUtils; import lombok.Data; import java.time.LocalDateTime; +import java.time.ZoneId; import java.time.format.DateTimeFormatter; +import java.util.TimeZone; @Data public class ActionTime { @@ -34,7 +37,7 @@ public class ActionTime { localDateTime = LocalDateTime.parse(dateDetailTime);//time转 }else{ time = t; - localDateTime = LocalDateTime.now(); + localDateTime = DateTimeUtils.getNowLocalDateTime(); } //解析生成其他时间 //现在，今天，明天，后天，昨天，前天，*天后，*天， 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 a80ae51..09a4ad6 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 @@ -7,6 +7,7 @@ import com.qiuguo.iot.base.constans.RedisConstans; 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.utils.DateTimeUtils; import com.qiuguo.iot.base.utils.StringUtils; import com.qiuguo.iot.data.entity.device.DeviceInfoEntity; import com.qiuguo.iot.data.entity.device.DeviceUserBindEntity; @@ -115,7 +116,7 @@ public class DeviceController { entity.setDeviceType(type); entity.setKey( com.qiuguo.iot.base.utils.StringUtils.getRandomStr(10));//生成key DateTimeFormatter df = DateTimeFormatter.ofPattern("yyMMddHHmmss"); - entity.setSn("QG" + entryTypeEnum.getSn() +df.format(LocalDateTime.now()) + StringUtils.getRandomStr(3)); + entity.setSn("QG" + entryTypeEnum.getSn() +df.format(DateTimeUtils.getNowLocalDateTime()) + StringUtils.getRandomStr(3)); mono1 = deviceInfoService.insertDeviceInfo(entity); }else{ entity.setKey( com.qiuguo.iot.base.utils.StringUtils.getRandomStr(10));//重新生成Key diff --git a/iot-modules/iot-box-websocket-api/src/main/java/com/qiuguo/iot/box/websocket/api/controller/DeviceController.java b/iot-modules/iot-box-websocket-api/src/main/java/com/qiuguo/iot/box/websocket/api/controller/DeviceController.java index 0bd4184..6d61d8b 100644 --- a/iot-modules/iot-box-websocket-api/src/main/java/com/qiuguo/iot/box/websocket/api/controller/DeviceController.java +++ b/iot-modules/iot-box-websocket-api/src/main/java/com/qiuguo/iot/box/websocket/api/controller/DeviceController.java @@ -7,6 +7,7 @@ import com.qiuguo.iot.base.constans.RedisConstans; 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.utils.DateTimeUtils; import com.qiuguo.iot.base.utils.StringUtils; import com.qiuguo.iot.data.entity.device.DeviceInfoEntity; import com.qiuguo.iot.data.entity.device.DeviceUserBindEntity; @@ -104,7 +105,7 @@ public class DeviceController { entity.setDeviceType(type); entity.setKey( StringUtils.getRandomStr(10));//生成key DateTimeFormatter df = DateTimeFormatter.ofPattern("yyMMddHHmmss"); - entity.setSn("QG" + entryTypeEnum.getSn() +df.format(LocalDateTime.now()) + StringUtils.getRandomStr(3)); + entity.setSn("QG" + entryTypeEnum.getSn() +df.format(DateTimeUtils.getNowLocalDateTime()) + StringUtils.getRandomStr(3)); mono1 = deviceInfoService.insertDeviceInfo(entity); }else{ entity.setKey( StringUtils.getRandomStr(10));//重新生成Key