增加IEC61850客户端自动发现功能

Author: 600888

src/device/core/device.py

@@ -173,6 +173,12 @@ def initProtocol(self) -> None:
         self.protocol_handler = self._create_protocol_handler()
         self.protocol_handler.initialize(self._build_protocol_config())
 
+        # IEC61850 客户端: 注册测点发现回调
+        if self.protocol_type == ProtocolType.Iec61850Client:
+            self.protocol_handler.set_on_points_discovered(
+                self._on_iec61850_points_discovered
+            )
+
         # 添加测点
         all_points = self.point_manager.get_all_points()
         self.protocol_handler.add_points(all_points)
@@ -228,6 +234,95 @@ def initIec61850Client(self) -> None:
         self.protocol_type = ProtocolType.Iec61850Client
         self.initProtocol()
 
+    def _on_iec61850_points_discovered(self, discovered_points: list) -> None:
+        """处理 IEC61850 客户端发现的测点，自动注册到系统
+
+        Args:
+            discovered_points: 发现的测点列表，
+                每个元素为 {"address": int, "frame_type": int, "ref": str}
+        """
+        frame_type_names = {0: "遥测", 1: "遥信", 2: "遥控", 3: "遥调"}
+        added_count = 0
+        slave_id = 1  # IEC61850 默认使用从机地址 1
+
+        for dp in discovered_points:
+            addr = dp["address"]
+            ft = dp["frame_type"]
+            ref = dp["ref"]
+
+            # 检查是否已存在（根据 address + frame_type 去重）
+            existing = self.point_manager.find_point_by_address_and_type(addr, ft)
+            if existing:
+                continue
+
+            # 根据 frame_type 创建对应的 BasePoint 对象
+            auto_code = str(addr)
+            ft_label = frame_type_names.get(ft, str(ft))
+            auto_name = str(addr)
+
+            point = None
+            if ft == 0:  # 遥测
+                point = Yc(
+                    rtu_addr=str(slave_id),
+                    address=str(addr),
+                    func_code=3,
+                    name=auto_name,
+                    code=auto_code,
+                    value=0,
+                    frame_type=0,
+                )
+            elif ft == 1:  # 遥信
+                point = Yx(
+                    rtu_addr=str(slave_id),
+                    address=str(addr),
+                    func_code=1,
+                    name=auto_name,
+                    code=auto_code,
+                    value=0,
+                    frame_type=1,
+                )
+            elif ft == 2:  # 遥控
+                point = Yk(
+                    rtu_addr=str(slave_id),
+                    address=str(addr),
+                    func_code=5,
+                    name=auto_name,
+                    code=auto_code,
+                    value=0,
+                    frame_type=2,
+                )
+            elif ft == 3:  # 遥调
+                point = Yt(
+                    rtu_addr=str(slave_id),
+                    address=str(addr),
+                    func_code=6,
+                    name=auto_name,
+                    code=auto_code,
+                    value=0,
+                    frame_type=3,
+                )
+
+            if point:
+                # 添加到测点管理器
+                self.point_manager.add_point(slave_id, point)
+
+                # 添加到模拟控制器
+                self.simulation_controller.add_point(
+                    point, SimulateMethod.Random, 1
+                )
+                self.simulation_controller.set_point_status(point, True)
+
+                added_count += 1
+                self.log.info(
+                    f"IEC61850 自动添加测点: {auto_code} ({auto_name}), "
+                    f"address={addr}, frame_type={ft}, ref={ref}"
+                )
+
+        if added_count > 0:
+            self.log.info(f"IEC61850 自动发现并添加了 {added_count} 个测点")
+        else:
+            self.log.info("IEC61850 未发现需要新增的测点（所有测点已存在）")
+
     # ===== 设备启停 =====
 
     async def start(self) -> bool:

src/device/core/point/point_manager.py

@@ -99,6 +99,22 @@ def get_points_by_type(self, frame_type: int) -> List[BasePoint]:
                 result.extend(points)
         return result
 
+    def find_point_by_address_and_type(self, address: int, frame_type: int) -> Optional[BasePoint]:
+        """根据地址和帧类型查找测点
+
+        Args:
+            address: 测点地址
+            frame_type: 帧类型 (0=遥测, 1=遥信, 2=遥控, 3=遥调)
+
+        Returns:
+            匹配的测点对象，未找到返回 None
+        """
+        points = self.get_points_by_type(frame_type)
+        for point in points:
+            if point.address == address:
+                return point
+        return None
+
     def get_all_points(self) -> List[BasePoint]:
         """获取所有测点"""
         result: List[BasePoint] = []

src/device/protocol/iec61850_handler.py

@@ -151,6 +151,16 @@ def __init__(self, log=None):
         super().__init__()
         self._client = None
         self._log = log
+        self._on_points_discovered = None  # 测点发现回调
+
+    def set_on_points_discovered(self, callback):
+        """设置测点发现回调
+
+        Args:
+            callback: 回调函数，签名为 callback(discovered_points: List[Dict])
+                      每个 dict 包含 {"address": int, "frame_type": int, "ref": str}
+        """
+        self._on_points_discovered = callback
 
     def initialize(self, config: Dict[str, Any]) -> None:
         """初始化 IEC 61850 客户端
@@ -192,6 +202,17 @@ async def connect(self) -> bool:
             if self._client:
                 is_connected = await self._client.connect()
                 self._is_running = is_connected
+
+                # 连接成功后，通知上层发现的测点
+                if is_connected and self._on_points_discovered:
+                    discovered = self._client.get_discovered_points()
+                    if discovered:
+                        try:
+                            self._on_points_discovered(discovered)
+                        except Exception as e:
+                            if self._log:
+                                self._log.error(f"处理发现的测点时出错: {e}")
+
                 return is_connected
             return False
         except Exception as e:

src/proto/iec61850/iec61850_client.py

@@ -232,13 +232,18 @@ def _get_list_from_linked_list(self, linked_list) -> List[str]:
         iec61850.LinkedList_destroy(linked_list)
         return items
 
-    def discover_model(self):
-        """动态发现并映射服务端的数据模型"""
+    def discover_model(self) -> List[Dict[str, Any]]:
+        """动态发现并映射服务端的数据模型
+
+        Returns:
+            发现的测点列表，每个元素为 {"address": int, "frame_type": int, "ref": str}
+        """
         if not self._connection or not self._is_connected:
-            return
+            return []
 
         log.info("开始 IEC 61850 动态模型发现...")
         start_time = time.time()
+        discovered_points: List[Dict[str, Any]] = []
 
         # 1. 获取逻辑设备列表
         result = iec61850.IedConnection_getLogicalDeviceList(self._connection)
@@ -247,12 +252,11 @@ def discover_model(self):
 
         if error != iec61850.IED_ERROR_OK:
             log.error(f"发现模型失败: 无法获取逻辑设备列表 (错误码: {error})")
-            return
+            return []
 
         lds = self._get_list_from_linked_list(ld_list)
         log.info(f"发现逻辑设备: {lds}")
 
-        discovered_count = 0
         for ld in lds:
             # 2. 获取逻辑节点列表 (使用 getLogicalDeviceDirectory)
             result = iec61850.IedConnection_getLogicalDeviceDirectory(self._connection, ld)
@@ -269,7 +273,7 @@ def discover_model(self):
                 ln_ref = f"{ld}/{ln}"
 
                 # 3. 获取数据对象列表 (使用 getLogicalNodeDirectory)
-                result = iec61850.IedConnection_getLogicalNodeDirectory(self._connection, ln_ref, 1) # 1 = ACSI_DIR_DO
+                result = iec61850.IedConnection_getLogicalNodeDirectory(self._connection, ln_ref, 0) # 0 = ACSI_CLASS_DATA_OBJECT
                 do_list = result[0] if isinstance(result, (list, tuple)) else result
                 error = result[1] if isinstance(result, (list, tuple)) else 0
 
@@ -284,33 +288,46 @@ def discover_model(self):
 
                     try:
                         if ln == "MMXU1" and do.startswith("MV_"):
-                            addr = int(do[3:])
+                            addr = do[3:]
                             ref = f"{full_do_ref}.mag.f"
                             self._point_refs[(addr, 0)] = ref
-                            discovered_count += 1
+                            discovered_points.append({"address": addr, "frame_type": 0, "ref": ref})
                             log.info(f"映射测点: ({addr}, 0) -> {ref}")
                         elif ln == "GGIO1" and do.startswith("SPS_"):
-                            addr = int(do[4:])
+                            addr = do[4:]
                             ref = f"{full_do_ref}.stVal"
                             self._point_refs[(addr, 1)] = ref
-                            discovered_count += 1
+                            discovered_points.append({"address": addr, "frame_type": 1, "ref": ref})
                             log.info(f"映射测点: ({addr}, 1) -> {ref}")
                         elif ln == "GGIO1" and do.startswith("SPC_"):
-                            addr = int(do[4:])
+                            addr = do[4:]
                             ref = f"{full_do_ref}.ctlVal"
                             self._point_refs[(addr, 2)] = ref
-                            discovered_count += 1
+                            discovered_points.append({"address": addr, "frame_type": 2, "ref": ref})
                             log.info(f"映射测点: ({addr}, 2) -> {ref}")
                         elif ln == "GGIO2" and do.startswith("APC_"):
-                            addr = int(do[4:])
+                            addr = do[4:]
                             ref = f"{full_do_ref}.ctlVal"
                             self._point_refs[(addr, 3)] = ref
-                            discovered_count += 1
+                            discovered_points.append({"address": addr, "frame_type": 3, "ref": ref})
                             log.info(f"映射测点: ({addr}, 3) -> {ref}")
-                    except ValueError:
+                    except Exception as e:
+                        log.error(f"解析测点地址失败: {do}, 错误: {e}")
                         continue
 
-        log.info(f"IEC 61850 动态发现完成, 耗时: {time.time() - start_time:.2f}s, 发现并映射了 {discovered_count} 个测点")
+        log.info(f"IEC 61850 动态发现完成, 耗时: {time.time() - start_time:.2f}s, 发现并映射了 {len(discovered_points)} 个测点")
+        return discovered_points
+
+    def get_discovered_points(self) -> List[Dict[str, Any]]:
+        """获取当前已映射的测点列表
+
+        Returns:
+            测点列表，每个元素为 {"address": int, "frame_type": int, "ref": str}
+        """
+        return [
+            {"address": addr, "frame_type": ft, "ref": ref}
+            for (addr, ft), ref in self._point_refs.items()
+        ]
 
     def browse_logical_devices(self) -> List[str]:
         """浏览远端 IED 的逻辑设备列表"""