Pre Merge pull request !42 from 樊冲/fix-bug-fanchong

修复录制计划-编辑时的回显加载问题

src/main/java/com/genersoft/iot/vmp/gb28181/session/SSRCFactory.java

@@ -95,43 +95,52 @@ public class SSRCFactory {
     }
 
     void rebuild() {
-        List<MediaServer> servers = mediaServerService.getAll();
-        for (MediaServer server : servers) {
-            if (server.isRtpEnable() && userSetting.getSsrcRandom()) {
-                continue;
-            }
-            synchronized (lockMap.computeIfAbsent(server.getId(), k -> new Object())) {
-                BitSet bits = new BitSet(10000);
-                int count = 0;
+        try {
+            List<MediaServer> servers = mediaServerService.getAll();
+            for (MediaServer server : servers) {
                 try {
-                    ZLMResult<?> result = zlmresTfulUtils.getMediaList(server, null, null, "rtsp", null);
-                    if (result != null && result.getCode() == 0 && result.getData() != null) {
-                        List<JSONObject> list = (List<JSONObject>) result.getData();
-                        for (JSONObject obj : list) {
-                            if (obj.getIntValue("originType") != 3) continue;
-                            String originUrl = obj.getString("originUrl");
-                            if (originUrl == null) continue;
-                            int idx = originUrl.lastIndexOf("/rtp/");
-                            if (idx == -1) continue;
-                            try {
-                                int suffix = (int) (Long.parseLong(originUrl.substring(idx + 5), 16) % 10000);
-                                bits.set(suffix);
-                                count++;
-                            } catch (NumberFormatException ignored) {
-                            }
-                        }
+                    if (server.isRtpEnable() && userSetting.getSsrcRandom()) {
+                        continue;
                     }
-                } catch (Exception e) {
-                    log.warn("[SSRC重建] 查询媒体节点 {} 失败: {}", server.getId(), e.getMessage());
-                }
-                usedMap.put(server.getId(), bits);
-                if (count > 8000) {
-                    log.info("[SSRC重建] 媒体节点 {} 的SSRC使用率已超过80%，请注意扩展服务提升性能", server.getId());
-                }
-                if (log.isDebugEnabled()) {
-                    log.debug("[SSRC重建] 节点 {} 已占用 {} 个SSRC", server.getId(), count);
+                    synchronized (lockMap.computeIfAbsent(server.getId(), k -> new Object())) {
+                        BitSet bits = new BitSet(10000);
+                        int count = 0;
+                        try {
+                            ZLMResult<?> result = zlmresTfulUtils.getMediaList(server, null, null, "rtsp", null);
+                            if (result != null && result.getCode() == 0 && result.getData() != null) {
+                                List<JSONObject> list = (List<JSONObject>) result.getData();
+                                for (JSONObject obj : list) {
+                                    if (obj.getIntValue("originType") != 3) continue;
+                                    String originUrl = obj.getString("originUrl");
+                                    if (originUrl == null) continue;
+                                    int idx = originUrl.lastIndexOf("/rtp/");
+                                    if (idx == -1) continue;
+                                    try {
+                                        int suffix = (int) (Long.parseLong(originUrl.substring(idx + 5), 16) % 10000);
+                                        bits.set(suffix);
+                                        count++;
+                                    } catch (NumberFormatException ignored) {
+                                    }
+                                }
+                                usedMap.put(server.getId(), bits);
+                                if (count > 8000) {
+                                    log.info("[SSRC重建] 媒体节点 {} 的SSRC使用率已超过80%，请注意扩展服务提升性能", server.getId());
+                                }
+                                if (log.isDebugEnabled()) {
+                                    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);
         }
     }
 }

src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java

@@ -212,7 +212,7 @@ public class InviteRequestProcessor extends SIPRequestProcessorParent implements
                         if (sendRtpItem.isTcpActive()) {
                             MediaServer mediaServer = mediaServerService.getOne(sendRtpItem.getMediaServerId());
                             try {
-                                mediaServerService.startSendRtpPassive(mediaServer, sendRtpItem, 5);
+                                mediaServerService.startSendRtpPassive(mediaServer, sendRtpItem, 5*1000);
                                 DeviceChannel deviceChannel = deviceChannelService.getOneForSourceById(sendRtpItem.getChannelId());
                                 if (deviceChannel != null) {
                                     redisCatchStorage.sendPlatformStartPlayMsg(sendRtpItem, deviceChannel, platform);

web/src/views/common/weekTimePicker.vue

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