From 60e9fb3daaa64de74e86d7bcf3040575486a70e9 Mon Sep 17 00:00:00 2001 From: lin <648540858@qq.com> Date: Thu, 5 Jun 2025 09:40:43 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8E=A8=E6=B5=81=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E5=92=8C=E6=8B=89=E6=B5=81=E4=BB=A3=E7=90=86=E7=9A=84?= =?UTF-8?q?=E4=BA=91=E7=AB=AF=E5=BD=95=E5=83=8F=E8=B7=B3=E8=BD=AC=E9=94=99?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java | 1 - .../java/com/genersoft/iot/vmp/utils/DateUtil.java | 11 ++--------- web/src/views/streamProxy/index.vue | 2 +- web/src/views/streamPush/index.vue | 2 +- 4 files changed, 4 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java index 9808cf65e..a4774d973 100755 --- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java +++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java @@ -446,7 +446,6 @@ public class ZLMRESTfulUtils { BigDecimal bigDecimal = new BigDecimal(stamp); param.put("stamp", bigDecimal); param.put("schema", schema); - System.out.println(bigDecimal); return sendPost(mediaServer, "seekRecordStamp",param, null); } } 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 860348114..565dec1f4 100755 --- a/src/main/java/com/genersoft/iot/vmp/utils/DateUtil.java +++ b/src/main/java/com/genersoft/iot/vmp/utils/DateUtil.java @@ -15,7 +15,7 @@ import java.time.temporal.TemporalAccessor; import java.util.Locale; -/** +/** * 全局时间工具类 * @author lin */ @@ -70,7 +70,7 @@ public class DateUtil { public static String yyyy_MM_dd_HH_mm_ssToISO8601(@NotNull String formatTime) { return formatterISO8601.format(formatter.parse(formatTime)); } - + public static String ISO8601Toyyyy_MM_dd_HH_mm_ss(String formatTime) { // 三种日期格式都尝试,为了兼容不同厂家的日期格式 if (verification(formatTime, formatterCompatibleISO8601)) { @@ -198,11 +198,4 @@ public class DateUtil { return ChronoUnit.MILLIS.between(startInstant, endInstant); } - - - public static void main(String[] args) { - long difference = getDifference("2025-05-21 13:00:00", "2025-05-21 13:30:00")/1000; - System.out.println(difference); - } - } diff --git a/web/src/views/streamProxy/index.vue b/web/src/views/streamProxy/index.vue index 17aeb930c..9888aab09 100755 --- a/web/src/views/streamProxy/index.vue +++ b/web/src/views/streamProxy/index.vue @@ -259,7 +259,7 @@ export default { }) }, queryCloudRecords: function(row) { - this.$router.push(`/cloudRecordDetail/${row.app}/${row.stream}`) + this.$router.push(`/cloudRecord/detail/${row.app}/${row.stream}`) }, deleteStreamProxy: function(row) { this.$confirm('确定删除此代理吗?', '提示', { diff --git a/web/src/views/streamPush/index.vue b/web/src/views/streamPush/index.vue index 8b1ea2946..342fafd65 100755 --- a/web/src/views/streamPush/index.vue +++ b/web/src/views/streamPush/index.vue @@ -255,7 +255,7 @@ export default { this.getPushList() }, queryCloudRecords: function(row) { - this.$router.push(`/cloudRecordDetail/${row.app}/${row.stream}`) + this.$router.push(`/cloudRecord/detail/${row.app}/${row.stream}`) }, importChannel: function() { this.$refs.importChannel.openDialog(() => {})