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:
648540858
2021-12-07 17:43:55 +08:00
parent 381b3d15ca
commit a2f0854138
14 changed files with 190 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRunner.java
View File

@@ -49,8 +49,13 @@ public class ZLMRunner implements CommandLineRunner {
@Override
public void run(String... strings) throws Exception {
mediaServerService.clearMediaServerForOnline();
if (mediaServerService.getDefaultMediaServer() == null) {
MediaServerItem defaultMediaServer = mediaServerService.getDefaultMediaServer();
if (defaultMediaServer == null) {
mediaServerService.addToDatabase(mediaConfig.getMediaSerItem());
}else {
MediaServerItem mediaSerItem = mediaConfig.getMediaSerItem();
mediaSerItem.setId(defaultMediaServer.getId());
mediaServerService.updateToDatabase(mediaSerItem);
}
// 订阅 zlm启动事件, 新的zlm也会从这里进入系统
@@ -61,7 +66,7 @@ public class ZLMRunner implements CommandLineRunner {
if (startGetMedia != null) {
startGetMedia.remove(zlmServerConfig.getGeneralMediaServerId());
}
mediaServerService.handLeZLMServerConfig(zlmServerConfig);
mediaServerService.zlmServerOnline(zlmServerConfig);
}
});
@@ -107,7 +112,7 @@ public class ZLMRunner implements CommandLineRunner {
zlmServerConfig.setIp(mediaServerItem.getIp());
zlmServerConfig.setHttpPort(mediaServerItem.getHttpPort());
startGetMedia.remove(mediaServerItem.getId());
mediaServerService.handLeZLMServerConfig(zlmServerConfig);
mediaServerService.zlmServerOnline(zlmServerConfig);
}
}

6
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMServerConfig.java
View File

@@ -32,7 +32,7 @@ public class ZLMServerConfig {
private String generalMaxStreamWaitMS;
@JSONField(name = "general.streamNoneReaderDelayMS")
private String generalStreamNoneReaderDelayMS;
private int generalStreamNoneReaderDelayMS;
@JSONField(name = "ip")
private String ip;
@@ -296,11 +296,11 @@ public class ZLMServerConfig {
this.generalMaxStreamWaitMS = generalMaxStreamWaitMS;
}
public String getGeneralStreamNoneReaderDelayMS() {
public int getGeneralStreamNoneReaderDelayMS() {
return generalStreamNoneReaderDelayMS;
}
public void setGeneralStreamNoneReaderDelayMS(String generalStreamNoneReaderDelayMS) {
public void setGeneralStreamNoneReaderDelayMS(int generalStreamNoneReaderDelayMS) {
this.generalStreamNoneReaderDelayMS = generalStreamNoneReaderDelayMS;
}

6
src/main/java/com/genersoft/iot/vmp/media/zlm/dto/MediaServerItem.java
View File

@@ -37,7 +37,7 @@ public class MediaServerItem{
private String secret;
private String streamNoneReaderDelayMS;
private int streamNoneReaderDelayMS;
private boolean rtpEnable;
@@ -206,11 +206,11 @@ public class MediaServerItem{
this.secret = secret;
}
public String getStreamNoneReaderDelayMS() {
public int getStreamNoneReaderDelayMS() {
return streamNoneReaderDelayMS;
}
public void setStreamNoneReaderDelayMS(String streamNoneReaderDelayMS) {
public void setStreamNoneReaderDelayMS(int streamNoneReaderDelayMS) {
this.streamNoneReaderDelayMS = streamNoneReaderDelayMS;
}