Merge branch 'master' into 1078

This commit is contained in:
648540858
2024-04-11 09:39:04 +08:00
152 changed files with 6466 additions and 4197 deletions

View File

@@ -1,11 +1,11 @@
package com.genersoft.iot.vmp.utils;
import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
import com.genersoft.iot.vmp.media.bean.MediaServer;
import com.genersoft.iot.vmp.service.bean.DownloadFileInfo;
public class CloudRecordUtils {
public static DownloadFileInfo getDownloadFilePath(MediaServerItem mediaServerItem, String filePath) {
public static DownloadFileInfo getDownloadFilePath(MediaServer mediaServerItem, String filePath) {
DownloadFileInfo downloadFileInfo = new DownloadFileInfo();
String pathTemplate = "%s://%s:%s/index/api/downloadFile?file_path=" + filePath;