XW-AIOT/wvp-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复推流列表和拉流代理的云端录像跳转错误

Browse Source
This commit is contained in:
lin
2025-06-05 09:40:43 +08:00
parent 227239f7f7
commit 60e9fb3daa
4 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java
View File

@@ -446,7 +446,6 @@ public class ZLMRESTfulUtils {
BigDecimal bigDecimal = new BigDecimal(stamp); BigDecimal bigDecimal = new BigDecimal(stamp);
param.put("stamp", bigDecimal); param.put("stamp", bigDecimal);
param.put("schema", schema); param.put("schema", schema);
System.out.println(bigDecimal);
return sendPost(mediaServer, "seekRecordStamp",param, null); return sendPost(mediaServer, "seekRecordStamp",param, null);
} }
} }

11
src/main/java/com/genersoft/iot/vmp/utils/DateUtil.java
View File

@@ -15,7 +15,7 @@ import java.time.temporal.TemporalAccessor;
import java.util.Locale; import java.util.Locale;
/** /**
* 全局时间工具类 * 全局时间工具类
* @author lin * @author lin
*/ */
@@ -70,7 +70,7 @@ public class DateUtil {
public static String yyyy_MM_dd_HH_mm_ssToISO8601(@NotNull String formatTime) { public static String yyyy_MM_dd_HH_mm_ssToISO8601(@NotNull String formatTime) {
return formatterISO8601.format(formatter.parse(formatTime)); return formatterISO8601.format(formatter.parse(formatTime));
} }
public static String ISO8601Toyyyy_MM_dd_HH_mm_ss(String formatTime) { public static String ISO8601Toyyyy_MM_dd_HH_mm_ss(String formatTime) {
// 三种日期格式都尝试，为了兼容不同厂家的日期格式 // 三种日期格式都尝试，为了兼容不同厂家的日期格式
if (verification(formatTime, formatterCompatibleISO8601)) { if (verification(formatTime, formatterCompatibleISO8601)) {
@@ -198,11 +198,4 @@ public class DateUtil {
return ChronoUnit.MILLIS.between(startInstant, endInstant); 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);
}
} }

2
web/src/views/streamProxy/index.vue
View File

@@ -259,7 +259,7 @@ export default {
}) })
}, },
queryCloudRecords: function(row) { queryCloudRecords: function(row) {
this.$router.push(`/cloudRecordDetail/${row.app}/${row.stream}`) this.$router.push(`/cloudRecord/detail/${row.app}/${row.stream}`)
}, },
deleteStreamProxy: function(row) { deleteStreamProxy: function(row) {
this.$confirm('确定删除此代理吗？', '提示', { this.$confirm('确定删除此代理吗？', '提示', {

2
web/src/views/streamPush/index.vue
View File

@@ -255,7 +255,7 @@ export default {
this.getPushList() this.getPushList()
}, },
queryCloudRecords: function(row) { queryCloudRecords: function(row) {
this.$router.push(`/cloudRecordDetail/${row.app}/${row.stream}`) this.$router.push(`/cloudRecord/detail/${row.app}/${row.stream}`)
}, },
importChannel: function() { importChannel: function() {
this.$refs.importChannel.openDialog(() => {}) this.$refs.importChannel.openDialog(() => {})