From f55b07a94aeb3f7622400f04089c6dcf9d6bb7f4 Mon Sep 17 00:00:00 2001 From: zqc <835569504@qq.com> Date: Fri, 27 Feb 2026 13:32:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E8=AD=A6=E6=8A=A5=E9=80=9A=E7=9F=A5ur?= =?UTF-8?q?l=E6=94=BE=E5=88=B0=E9=85=8D=E7=BD=AE=E4=B8=AD=E3=80=82?= =?UTF-8?q?=E5=85=B6=E4=BB=96biz=E8=BF=98=E6=B2=A1=E6=9C=89=E6=8E=A5?= =?UTF-8?q?=E5=85=A5=E8=AD=A6=E6=8A=A5=EF=BC=8C=E4=BC=BC=E4=B9=8E=E4=B8=8D?= =?UTF-8?q?=E6=98=AF=E6=9C=8D=E5=8A=A1=E5=99=A8=E4=B8=8A=E6=9C=80=E6=96=B0?= =?UTF-8?q?=E7=9A=84=E4=BB=A3=E7=A0=81=EF=BC=9F=E5=BE=85=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- biz/prison/prison_biz.py | 5 ++--- config.yaml | 1 + hls_service_ws_kadian.py | 4 ++++ rtsp_service_ws_kadian.py | 4 ++++ 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/biz/prison/prison_biz.py b/biz/prison/prison_biz.py index 3771564..1f79375 100644 --- a/biz/prison/prison_biz.py +++ b/biz/prison/prison_biz.py @@ -9,6 +9,7 @@ import requests # -------------------------- Kadian 检测相关导入 -------------------------- from algorithm.common.npu_yolo_onnx_person_car_phone import YOLOv8_ONNX # 主检测模型（人/车/后备箱/手机） +from common.contants import ALERT_PUSH_URL from yolox.tracker.byte_tracker import BYTETracker @@ -17,8 +18,6 @@ from yolox.tracker.byte_tracker import BYTETracker # Kadian 模型路径与ROI（可根据实际情况修改） detector_model_path = 'YOLO_Weight/prisoner_model.onnx' -ALERT_PUSH_URL = "http://123.57.151.210:10000/picenter/websocket/test/process" - # 输入尺寸 input_size = 1280 @@ -430,7 +429,7 @@ class FrameProcessorWorker(threading.Thread): } try: self.ws_queue.put(msg, timeout=1.0) - #if action_names and len(action_names) > 0: + # # if action_names and len(action_names) > 0: # if push_actions and len(push_actions) > 0: # # 发送POST请求 # post_msg = msg.copy() diff --git a/config.yaml b/config.yaml index 3354169..0ae4856 100644 --- a/config.yaml +++ b/config.yaml @@ -33,6 +33,7 @@ database: # 服务组配置：每个组有独立的 WebSocket 和算法类型 # debug_mode: True=前台运行（适合PyCharm调试），False=后台运行（适合生产部署） debug_mode: true +alert_push_url: "http://123.57.151.210:10000/picenter/websocket/test/process" service_groups: - name: "kadian_group" # 服务组名称 diff --git a/hls_service_ws_kadian.py b/hls_service_ws_kadian.py index ffff1e6..a0af1ef 100644 --- a/hls_service_ws_kadian.py +++ b/hls_service_ws_kadian.py @@ -16,6 +16,7 @@ from dataclasses import dataclass from biz.checkpoint.checkpoint_biz import FrameProcessorWorker # from biz.prison.prison_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 from utils.logger import get_logger @@ -333,6 +334,9 @@ if __name__ == "__main__": parser.add_argument("--algorithm", type=str, default="", help="Algorithm type") args = parser.parse_args() + # 初始化全局配置 + init_config(args.config) + # 优先使用命令行传入的 cameras JSON，否则读取配置文件 if args.cameras: cameras = parse_cameras_from_json(args.cameras) diff --git a/rtsp_service_ws_kadian.py b/rtsp_service_ws_kadian.py index 88965dd..330ea2b 100644 --- a/rtsp_service_ws_kadian.py +++ b/rtsp_service_ws_kadian.py @@ -13,6 +13,7 @@ import queue from biz.checkpoint.checkpoint_biz import FrameProcessorWorker from common.camera_config import CameraConfig, parse_cameras_from_json, parse_cameras_from_yaml +from common.contants import init_config from test_cam import get_camera_preview_url from utils.web_socket_sender import WebSocketSender @@ -209,6 +210,9 @@ if __name__ == "__main__": parser.add_argument("--algorithm", type=str, default="", help="Algorithm type") args = parser.parse_args() + # 初始化全局配置 + init_config(args.config) + # 优先使用命令行传入的 cameras JSON，否则读取配置文件 if args.cameras: cameras = parse_cameras_from_json(args.cameras)