监狱2测试通过

biz/prison/trajectory02_biz.py

@@ -482,11 +482,14 @@ class FrameProcessorWorker(threading.Thread):
     def __init__(self,
                  raw_frame_queue: "queue.Queue[Dict[str, Any]]",
                  ws_send_queue: "queue.Queue[Dict[str, Any]]",
-                 stop_event: threading.Event):
+                 stop_event: threading.Event,
+                 cameras=None):
         super().__init__(daemon=True)
         self.raw_queue = raw_frame_queue
         self.ws_queue = ws_send_queue
         self.stop_event = stop_event
+        # 将摄像头列表转换为字典，key为id，方便通过camera_id快速查找
+        self.cameras = {cam.id: cam for cam in cameras} if cameras is not None else {}
 
         self.last_ts: Dict[int, float] = {}
 

hls_service_ws_kadian.py

@@ -13,8 +13,9 @@ import sys
 
 from dataclasses import dataclass
 
-from biz.checkpoint.checkpoint_biz import FrameProcessorWorker
+# from biz.checkpoint.checkpoint_biz import FrameProcessorWorker
 # from biz.prison.prison_biz import FrameProcessorWorker
+from biz.prison.trajectory02_biz import FrameProcessorWorker
 from common.camera_config import CameraConfig, parse_cameras_from_json, parse_cameras_from_yaml
 from common.contants import init_config
 from utils.web_socket_sender import WebSocketSender