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

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

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

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

src/main/resources/civilCode.csv

@@ -861,7 +861,7 @@
 320623,如东县,3206
 320681,启东市,3206
 320682,如皋市,3206
-320684,海门市,3206
+320684,海门区,3206
 320685,海安市,3206
 3207,连云港市,32
 320703,连云区,3207
@@ -918,8 +918,6 @@
 33,浙江省, 
 3301,杭州市,33
 330102,上城区,3301
-330103,下城区,3301
-330104,江干区,3301
 330105,拱墅区,3301
 330106,西湖区,3301
 330108,滨江区,3301
@@ -927,6 +925,8 @@
 330110,余杭区,3301
 330111,富阳区,3301
 330112,临安区,3301
+330113,临平区,3301
+330114,钱塘区,3301
 330122,桐庐县,3301
 330127,淳安县,3301
 330182,建德市,3301

web/src/views/common/weekTimePicker.vue

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