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-27 15:33:35 +08:00
parent dae5686777
commit fcf785b50f
5 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
iot-common/iot-base/src/main/java/com/qiuguo/iot/base/utils/ChineseDateTimeUtils.java
View File

@ -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){

16
iot-common/iot-base/src/main/java/com/qiuguo/iot/base/utils/DateTimeUtils.java Normal file
View File

@ -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();
}
}

5
iot-common/iot-third/src/main/java/com/qiuguo/iot/third/nlp/action/ActionTime.java
View File

@ -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();
}
//解析生成其他时间
//现在，今天，明天，后天，昨天，前天，*天后，*天，

3
iot-modules/iot-box-user-api/src/main/java/com/qiuguo/iot/user/api/controller/device/DeviceController.java
View File

@ -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

3
iot-modules/iot-box-websocket-api/src/main/java/com/qiuguo/iot/box/websocket/api/controller/DeviceController.java
View File

@ -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