|
@@ -443,7 +443,24 @@ public class DeviceSimServiceImpl extends ServiceImpl<DeviceSimMapper, DeviceSim
|
|
|
Date dd = DateUtils.addDays(calendar.getTime(), Integer.parseInt(date));
|
|
|
return dd.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
|
|
|
} else {
|
|
|
- return LocalDate.parse(date, DateTimeFormatter.ofPattern("yyyy-MM-dd")).atTime(0, 0, 0);
|
|
|
+ LocalDateTime localDateTime = null;
|
|
|
+ List<String> patterns = Arrays.asList(
|
|
|
+ "yyyy-MM-dd", "yyyy-MM-dd HH", "yyyy-MM-dd HH:mm", "yyyy-MM-dd HH:mm:ss",
|
|
|
+ "yyyy-MM-dd H", "yyyy-MM-dd H:m", "yyyy-MM-dd H:m:s"
|
|
|
+ );
|
|
|
+ for (String pattern : patterns) {
|
|
|
+ try {
|
|
|
+ if (pattern.equals("yyyy-MM-dd")) {
|
|
|
+ localDateTime = LocalDate.parse(date.trim(), DateTimeFormatter.ofPattern(pattern)).atTime(0, 0, 0);
|
|
|
+ } else {
|
|
|
+ localDateTime = LocalDateTime.parse(date.trim(), DateTimeFormatter.ofPattern(pattern));
|
|
|
+ }
|
|
|
+ break;
|
|
|
+ } catch (Exception ignored) {
|
|
|
+
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return localDateTime;
|
|
|
}
|
|
|
}
|
|
|
}
|