Pre Merge pull request !41 from 阿斌/N/A

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

@@ -95,10 +95,8 @@ public class SSRCFactory {
     }
 
     void rebuild() {
-        try {
         List<MediaServer> servers = mediaServerService.getAll();
         for (MediaServer server : servers) {
-                try {
             if (server.isRtpEnable() && userSetting.getSsrcRandom()) {
                 continue;
             }
@@ -122,6 +120,10 @@ public class SSRCFactory {
                             } catch (NumberFormatException ignored) {
                             }
                         }
+                    }
+                } 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());
@@ -130,17 +132,6 @@ public class SSRCFactory {
                     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);
         }
     }
 }

web/src/views/common/weekTimePicker.vue

@@ -148,17 +148,10 @@ export default {
     }
   },
   watch: {
-    planArray: {
+    planArray: function(array) {
-      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() {