Compare commits

..

4 Commits

Author SHA1 Message Date
阿斌
9cba4ab5e7
Pre Merge pull request !36 from 阿斌/N/A 2026-06-02 08:15:37 +00:00
lin
a9ad7cf5a8 SSRC管理-优化重建时的异常处理,避免异常导致的定时任务崩溃 2026-06-02 16:15:21 +08:00
648540858
b760458e4e
Merge pull request #2162 from ym6009/master
修复录制计划-编辑时的回显加载问题
2026-05-28 21:59:33 +08:00
ym
fd3dc4dada 修复录制计划-编辑时的回显加载问题 2026-05-28 16:42:38 +08:00
2 changed files with 53 additions and 37 deletions

View File

@ -95,8 +95,10 @@ public class SSRCFactory {
} }
void rebuild() { void rebuild() {
try {
List<MediaServer> servers = mediaServerService.getAll(); List<MediaServer> servers = mediaServerService.getAll();
for (MediaServer server : servers) { for (MediaServer server : servers) {
try {
if (server.isRtpEnable() && userSetting.getSsrcRandom()) { if (server.isRtpEnable() && userSetting.getSsrcRandom()) {
continue; continue;
} }
@ -120,10 +122,6 @@ public class SSRCFactory {
} catch (NumberFormatException ignored) { } catch (NumberFormatException ignored) {
} }
} }
}
} catch (Exception e) {
log.warn("[SSRC重建] 查询媒体节点 {} 失败: {}", server.getId(), e.getMessage());
}
usedMap.put(server.getId(), bits); usedMap.put(server.getId(), bits);
if (count > 8000) { if (count > 8000) {
log.info("[SSRC重建] 媒体节点 {} 的SSRC使用率已超过80%,请注意扩展服务提升性能", server.getId()); log.info("[SSRC重建] 媒体节点 {} 的SSRC使用率已超过80%,请注意扩展服务提升性能", server.getId());
@ -132,6 +130,17 @@ public class SSRCFactory {
log.debug("[SSRC重建] 节点 {} 已占用 {} 个SSRC", server.getId(), count); log.debug("[SSRC重建] 节点 {} 已占用 {} 个SSRC", server.getId(), count);
} }
} }
} catch (Exception e) {
log.warn("[SSRC重建] 查询媒体节点 {} 失败: {}", server.getId(), e.getMessage());
}
}
}catch (Exception e) {
log.warn("[SSRC重建] 处理媒体节点 {} 失败: {}", server.getId(), e.getMessage());
}
}
}catch (Exception e) {
log.error("[SSRC] 重建SSRC失败", e);
} }
} }
} }

View File

@ -148,10 +148,17 @@ export default {
} }
}, },
watch: { watch: {
planArray: function(array) { planArray: {
handler(array) {
if (!array || !array.length) {
return
}
for (let i = 0; i < array.length; i++) { for (let i = 0; i < array.length; i++) {
this.weekData[i].data = array[i].data this.weekData[i].data = array[i].data
} }
},
deep: true,
immediate: true
} }
}, },
created() { created() {