fix：修复IEC61850客户端无法解析服务端主动报告的bug

Author: 600888

src/proto/iec61850/plugins/reports/__init__.py

@@ -494,14 +494,43 @@ def _enable_report(
         # 回调不会被触发, 导致报告数据缓存为空。
         rpt_id = ""
         data_set_ref = ""
+
+        # 优先通过 getRCBValues 直接读取 RptId（比 get_rcb_detail 更直接可靠）
         try:
-            detail = self.get_rcb_detail(rcb_ref)
-            if detail:
-                rpt_id = str(detail.get("rpt_id", "") or "")
-                data_set_ref = str(detail.get("data_set_ref", "") or "")
-                log.info(f"_enable_report: 读取 RptId: {rcb_ref}, rpt_id={rpt_id!r}")
+            if rcb_type == "BRCB":
+                rcb_info = BrcbHandler.get_rcb_values(self._connection, rcb_ref)
+            else:
+                rcb_info = UrcbHandler.get_rcb_values(self._connection, rcb_ref)
+            if rcb_info and hasattr(rcb_info, "rpt_id") and rcb_info.rpt_id:
+                rpt_id = str(rcb_info.rpt_id)
+                data_set_ref = str(rcb_info.data_set_ref or "")
+                log.info(f"_enable_report: 直接读取 RptId 成功: {rcb_ref}, rpt_id={rpt_id!r}")
+            elif rcb_info:
+                data_set_ref = str(rcb_info.data_set_ref or "")
+                log.info(f"_enable_report: 直接读取 RptId 为空: {rcb_ref}, data_set_ref={data_set_ref!r}")
         except Exception as e:
-            log.warning(f"_enable_report: 读取 RptId 失败: {rcb_ref}, {e}")
+            log.warning(f"_enable_report: 直接读取 RptId 失败: {rcb_ref}, {e}, 尝试从缓存读取")
+
+        # 备用：从缓存中读取
+        if not rpt_id:
+            try:
+                detail = self.get_rcb_detail(rcb_ref)
+                if detail:
+                    rpt_id = str(detail.get("rpt_id", "") or "")
+                    if not data_set_ref:
+                        data_set_ref = str(detail.get("data_set_ref", "") or "")
+                    log.info(f"_enable_report: 从缓存读取 RptId: {rcb_ref}, rpt_id={rpt_id!r}")
+            except Exception as e:
+                log.warning(f"_enable_report: 从缓存读取 RptId 失败: {rcb_ref}, {e}")
+
+        # 如果 RptId 仍为空，记录严重警告
+        if not rpt_id:
+            log.warning(
+                f"_enable_report: RptId 为空！"
+                f"部分 libIEC61850 版本中空 RptId 会导致报告回调无法被触发。"
+                f"请检查 IED 的 RCB ({rcb_ref}) 是否配置了 RptId。"
+                f"rcb_type={rcb_type}"
+            )
 
         # 查询数据集成员引用列表，用于报告数据解析时将 data[i] 映射为具体引用
         dataset_members: list[str] = []

src/proto/iec61850/plugins/reports/callback.py

@@ -235,21 +235,40 @@ def install(
 
             try:
                 nref = _normalize_ref(rcb_ref, rcb_type)
+                log.info(f"安装报告回调: rcb_ref={rcb_ref}, mms_ref={nref}, rpt_id={rpt_id!r}, rcb_type={rcb_type}")
+
+                # 警告：RptId 为空时，部分版本的 libIEC61850 RCBSubscriber
+                # 无法匹配服务器推送的报告，导致 RCBHandler.trigger 永远不会被调用
+                effective_rpt_id = rpt_id or ""
+                if not effective_rpt_id:
+                    log.warning(
+                        f"RptId 为空，报告回调可能无法匹配服务器推送的报告！"
+                        f"请检查 IED 的 RCB 配置中是否设置了 RptId。rcb_ref={rcb_ref}"
+                    )
+
                 handler = _PyRCBHandler(rcb_ref)
                 subscriber = iec61850.RCBSubscriber()
                 subscriber.setIedConnection(conn)
                 subscriber.setRcbReference(nref)
-                subscriber.setRcbRptId(rpt_id or "")
+                subscriber.setRcbRptId(effective_rpt_id)
                 subscriber.setEventHandler(handler)
-                if not subscriber.subscribe():
-                    log.warning(f"订阅报告失败: ref={nref}")
+
+                log.debug(f"RCBSubscriber.subscribe() 调用: ref={nref}, rpt_id={effective_rpt_id!r}")
+                subscribe_ok = subscriber.subscribe()
+                if not subscribe_ok:
+                    log.warning(
+                        f"RCBSubscriber.subscribe() 返回失败: ref={nref}, rpt_id={effective_rpt_id!r}, "
+                        f"rcb_ref={rcb_ref}"
+                    )
                     with contextlib.suppress(Exception):
                         subscriber.deleteEventHandler()
                     if hasattr(handler, "thisown"):
                         with contextlib.suppress(Exception):
                             handler.thisown = 0
                     return False
 
+                log.info(f"RCBSubscriber.subscribe() 成功: ref={nref}, rpt_id={effective_rpt_id!r}")
+
                 _CALLBACK_REGISTRY[rcb_ref] = _CallbackInfo(
                     rcb_ref=rcb_ref,
                     handler=handler,
@@ -258,13 +277,13 @@ def install(
                     max_cache=max_cache,
                     enabled_at=datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S"),
                     mms_ref=nref,
-                    rpt_id=rpt_id or "",
+                    rpt_id=effective_rpt_id,
                     dataset_members=dataset_members or [],
                 )
-                log.info(f"报告回调已安装: {rcb_ref} (mms_ref={nref})")
+                log.info(f"报告回调已安装: {rcb_ref} (mms_ref={nref}, rpt_id={effective_rpt_id!r})")
                 return True
             except Exception as e:
-                log.error(f"安装报告回调异常: {rcb_ref}, {e}")
+                log.error(f"安装报告回调异常: {rcb_ref}, {e}", exc_info=True)
                 return False
 
     @staticmethod