From 00bb8d914a5a48bae84f20bf1891b7462605a0dc Mon Sep 17 00:00:00 2001
From: leesam <leesam@leesam.cn>
Date: 星期五, 15 三月 2024 09:42:25 +0800
Subject: [PATCH] [bugfix]修复云端录像查询时间转换错误的问题
---
src/main/java/com/genersoft/iot/vmp/service/impl/CloudRecordServiceImpl.java | 4 ++--
src/main/java/com/genersoft/iot/vmp/utils/DateUtil.java | 20 ++++++++++++++++++++
2 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/CloudRecordServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/CloudRecordServiceImpl.java
index f160aac..a23252f 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/CloudRecordServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/CloudRecordServiceImpl.java
@@ -59,14 +59,14 @@
if (!DateUtil.verification(startTime, DateUtil.formatter)) {
throw new ControllerException(ErrorCode.ERROR100.getCode(), "寮�濮嬫椂闂存牸寮忛敊璇紝姝ｇ‘鏍煎紡涓猴細 " + DateUtil.formatter);
}
- startTimeStamp = DateUtil.yyyy_MM_dd_HH_mm_ssToTimestamp(startTime);
+ startTimeStamp = DateUtil.yyyy_MM_dd_HH_mm_ssToTimestampMs(startTime);
}
if (endTime != null ) {
if (!DateUtil.verification(endTime, DateUtil.formatter)) {
throw new ControllerException(ErrorCode.ERROR100.getCode(), "缁撴潫鏃堕棿鏍煎紡閿欒锛屾纭牸寮忎负锛� " + DateUtil.formatter);
}
- endTimeStamp = DateUtil.yyyy_MM_dd_HH_mm_ssToTimestamp(endTime);
+ endTimeStamp = DateUtil.yyyy_MM_dd_HH_mm_ssToTimestampMs(endTime);
}
PageHelper.startPage(page, count);
diff --git a/src/main/java/com/genersoft/iot/vmp/utils/DateUtil.java b/src/main/java/com/genersoft/iot/vmp/utils/DateUtil.java
index 2bb9bfb..ddcbb21 100755
--- a/src/main/java/com/genersoft/iot/vmp/utils/DateUtil.java
+++ b/src/main/java/com/genersoft/iot/vmp/utils/DateUtil.java
@@ -107,6 +107,26 @@
}
/**
+ * yyyy_MM_dd_HH_mm_ss 杞椂闂存埑锛堟绉掞級
+ *
+ * @param formatTime
+ * @return
+ */
+ public static long yyyy_MM_dd_HH_mm_ssToTimestampMs(String formatTime) {
+ TemporalAccessor temporalAccessor = formatter.parse(formatTime);
+ Instant instant = Instant.from(temporalAccessor);
+ return instant.toEpochMilli();
+ }
+
+ /**
+ * 鏃堕棿鎴筹紙姣锛� 杞� yyyy_MM_dd_HH_mm_ss
+ */
+ public static String timestampMsTo_yyyy_MM_dd_HH_mm_ss(long timestamp) {
+ Instant instant = Instant.ofEpochMilli(timestamp);
+ return formatter.format(LocalDateTime.ofInstant(instant, ZoneId.of(zoneStr)));
+ }
+
+ /**
* 鏃堕棿鎴� 杞� yyyy_MM_dd
*/
public static String timestampTo_yyyy_MM_dd(long timestamp) {
--
Gitblit v1.8.0