From f96250ef45af8d4c8f52fed382da058ab9330bbf Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 21 三月 2024 16:59:14 +0800
Subject: [PATCH] Merge branch 'master' into dev/abl支持
---
src/main/java/com/genersoft/iot/vmp/media/MediaServerConfig.java | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/media/MediaServerConfig.java b/src/main/java/com/genersoft/iot/vmp/media/MediaServerConfig.java
index 3be8e4c..761d970 100755
--- a/src/main/java/com/genersoft/iot/vmp/media/MediaServerConfig.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/MediaServerConfig.java
@@ -38,11 +38,19 @@
// 娓呯悊鎵�鏈夊湪绾胯妭鐐圭殑缂撳瓨淇℃伅
mediaServerService.clearMediaServerForOnline();
MediaServerItem defaultMediaServer = mediaServerService.getDefaultMediaServer();
- if (defaultMediaServer == null) {
- mediaServerService.addToDatabase(mediaConfig.getMediaSerItem());
+ MediaServerItem mediaSerItemInConfig = mediaConfig.getMediaSerItem();
+ if (defaultMediaServer != null && mediaSerItemInConfig.getId().equals(defaultMediaServer.getId())) {
+ mediaServerService.update(mediaSerItemInConfig);
}else {
- MediaServerItem mediaSerItem = mediaConfig.getMediaSerItem();
- mediaServerService.updateToDatabase(mediaSerItem);
+ if (defaultMediaServer != null) {
+ mediaServerService.delete(defaultMediaServer.getId());
+ }
+ MediaServerItem mediaServerItem = mediaServerService.getOneFromDatabase(mediaSerItemInConfig.getId());
+ if (mediaServerItem == null) {
+ mediaServerService.add(mediaSerItemInConfig);
+ }else {
+ mediaServerService.update(mediaSerItemInConfig);
+ }
}
// 鍙戦�佸獟浣撹妭鐐瑰彉鍖栦簨浠�
mediaServerService.syncCatchFromDatabase();
--
Gitblit v1.8.0