Thirdparty
/
wvp-GB28181-pro
mirror of https://github.com/648540858/wvp-GB28181-pro
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

修复录像路径设置错误

pull/1217/head
chenghong 2023-12-19 10:09:21 +08:00
parent 964d55431f
commit 8965f95365
1 changed files with 69 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
View File

@ -116,7 +116,6 @@ public class MediaServerServiceImpl implements IMediaServerService {
private ThreadPoolTaskExecutor taskExecutor; private ThreadPoolTaskExecutor taskExecutor;
/** /**
* 初始化 * 初始化
*/ */
@ -292,6 +291,7 @@ public class MediaServerServiceImpl implements IMediaServerService {
/** /**
* 获取单个zlm服务器 * 获取单个zlm服务器
*
* @param mediaServerId 服务id * @param mediaServerId 服务id
* @return MediaServerItem * @return MediaServerItem
*/ */
@ -369,6 +369,7 @@ public class MediaServerServiceImpl implements IMediaServerService {
/** /**
* 处理zlm上线 * 处理zlm上线
*
* @param zlmServerConfig zlm上线携带的参数 * @param zlmServerConfig zlm上线携带的参数
*/ */
@Override @Override
@ -515,6 +516,7 @@ public class MediaServerServiceImpl implements IMediaServerService {
/** /**
* 获取负载最低的节点 * 获取负载最低的节点
*
* @return MediaServerItem * @return MediaServerItem
*/ */
@Override @Override
@ -558,6 +560,7 @@ public class MediaServerServiceImpl implements IMediaServerService {
/** /**
* 对zlm服务器进行基础配置 * 对zlm服务器进行基础配置
*
* @param mediaServerItem 服务ID * @param mediaServerItem 服务ID
* @param restart 是否重启zlm * @param restart 是否重启zlm
*/ */
@ -609,8 +612,11 @@ public class MediaServerServiceImpl implements IMediaServerService {
if (userSetting.getRecordPath() != null) { if (userSetting.getRecordPath() != null) {
File recordPathFile = new File(userSetting.getRecordPath()); File recordPathFile = new File(userSetting.getRecordPath());
File mp4SavePathFile = recordPathFile.getParentFile().getAbsoluteFile(); // File mp4SavePathFile = recordPathFile.getParentFile().getAbsoluteFile();
param.put("protocol.mp4_save_path", mp4SavePathFile.getAbsoluteFile()); // param.put("protocol.mp4_save_path", mp4SavePathFile.getAbsoluteFile());
// 如果使用mp4SavePathFile.getAbsoluteFile() 当wvp部署在windows服务器时会添加盘符
// 导致ZLM设置mp4_save_path路径时出错
param.put("protocol.mp4_save_path", userSetting.getRecordPath());
param.put("record.appName", recordPathFile.getName()); param.put("record.appName", recordPathFile.getName());
} }
@ -683,7 +689,8 @@ public class MediaServerServiceImpl implements IMediaServerService {
if (response != null) { if (response != null) {
result = true; result = true;
} }
} catch (Exception e) {} } catch (Exception e) {
}
return result; return result;
} }
@ -694,6 +701,7 @@ public class MediaServerServiceImpl implements IMediaServerService {
String key = VideoManagerConstants.MEDIA_SERVER_PREFIX + userSetting.getServerId() + "_" + id; String key = VideoManagerConstants.MEDIA_SERVER_PREFIX + userSetting.getServerId() + "_" + id;
redisTemplate.delete(key); redisTemplate.delete(key);
} }
@Override @Override
public void deleteDb(String id) { public void deleteDb(String id) {
//同步删除数据库中的数据 //同步删除数据库中的数据