From 7ce50cfd4fb1abdfc23a04a42b87772e6bcbea2d Mon Sep 17 00:00:00 2001 From: zqc <835569504@qq.com> Date: Thu, 26 Feb 2026 11:39:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AE=97=E6=B3=95=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E8=B7=AF=E5=BE=84=E6=94=B9=E4=B8=BAcommon?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- algorithm/{checkpoint => common}/__init__.py | 0 .../{checkpoint => common}/npu_yolo_onnx_person_car_phone.py | 0 algorithm/{checkpoint => common}/npu_yolo_pose_onnx.py | 0 biz/checkpoint/checkpoint_biz.py | 4 ++-- biz/prison/prison_biz.py | 2 +- hls_service_ws_kadian.py | 5 +++-- rtsp_service_ws_0108.py | 2 +- rtsp_service_ws_Zhihuishi.py | 2 +- rtsp_service_ws_Zoulang.py | 2 +- rtsp_service_ws_kadian.py | 2 +- rtsp_service_ws_kanshousuo.py | 2 +- 11 files changed, 11 insertions(+), 10 deletions(-) rename algorithm/{checkpoint => common}/__init__.py (100%) rename algorithm/{checkpoint => common}/npu_yolo_onnx_person_car_phone.py (100%) rename algorithm/{checkpoint => common}/npu_yolo_pose_onnx.py (100%) diff --git a/algorithm/checkpoint/__init__.py b/algorithm/common/__init__.py similarity index 100% rename from algorithm/checkpoint/__init__.py rename to algorithm/common/__init__.py diff --git a/algorithm/checkpoint/npu_yolo_onnx_person_car_phone.py b/algorithm/common/npu_yolo_onnx_person_car_phone.py similarity index 100% rename from algorithm/checkpoint/npu_yolo_onnx_person_car_phone.py rename to algorithm/common/npu_yolo_onnx_person_car_phone.py diff --git a/algorithm/checkpoint/npu_yolo_pose_onnx.py b/algorithm/common/npu_yolo_pose_onnx.py similarity index 100% rename from algorithm/checkpoint/npu_yolo_pose_onnx.py rename to algorithm/common/npu_yolo_pose_onnx.py diff --git a/biz/checkpoint/checkpoint_biz.py b/biz/checkpoint/checkpoint_biz.py index 4e9bf68..8f8dce3 100644 --- a/biz/checkpoint/checkpoint_biz.py +++ b/biz/checkpoint/checkpoint_biz.py @@ -8,8 +8,8 @@ import time import queue # -------------------------- Kadian 检测相关导入 -------------------------- -from algorithm.checkpoint.npu_yolo_onnx_person_car_phone import YOLOv8_ONNX # 主检测模型（人/车/后备箱/手机） -from algorithm.checkpoint.npu_yolo_pose_onnx import YOLOv8_Pose_ONNX # Pose 专用模型 +from algorithm.common.npu_yolo_onnx_person_car_phone import YOLOv8_ONNX # 主检测模型（人/车/后备箱/手机） +from algorithm.common.npu_yolo_pose_onnx import YOLOv8_Pose_ONNX # Pose 专用模型 from yolox.tracker.byte_tracker import BYTETracker from utils.logger import get_logger diff --git a/biz/prison/prison_biz.py b/biz/prison/prison_biz.py index 4319184..3771564 100644 --- a/biz/prison/prison_biz.py +++ b/biz/prison/prison_biz.py @@ -8,7 +8,7 @@ import queue import requests # -------------------------- Kadian 检测相关导入 -------------------------- -from algorithm.checkpoint.npu_yolo_onnx_person_car_phone import YOLOv8_ONNX # 主检测模型（人/车/后备箱/手机） +from algorithm.common.npu_yolo_onnx_person_car_phone import YOLOv8_ONNX # 主检测模型（人/车/后备箱/手机） from yolox.tracker.byte_tracker import BYTETracker diff --git a/hls_service_ws_kadian.py b/hls_service_ws_kadian.py index 0cd67ac..2f663a1 100644 --- a/hls_service_ws_kadian.py +++ b/hls_service_ws_kadian.py @@ -12,7 +12,8 @@ import glob from dataclasses import dataclass -from biz.checkpoint.checkpoint_biz import KadianDetector, RTSP_TARGET_FPS, ALERT_PUSH_INTERVAL, FrameProcessorWorker +# from biz.checkpoint.checkpoint_biz import FrameProcessorWorker +from biz.prison.prison_biz import FrameProcessorWorker from utils.web_socket_sender import WebSocketSender from utils.logger import get_logger @@ -53,7 +54,7 @@ class HLSFrameProcessor(threading.Thread): self.pts_diff = 0 self.should_reset_time = False - + def find_segment_files(self): """查找TS分片文件，返回排序后的文件名列表""" pattern = os.path.join(HLS_SEGMENT_DIR, "segment_*.ts") diff --git a/rtsp_service_ws_0108.py b/rtsp_service_ws_0108.py index 349566d..e67681e 100644 --- a/rtsp_service_ws_0108.py +++ b/rtsp_service_ws_0108.py @@ -31,7 +31,7 @@ except Exception as e: # -------------------------- Kadian 检测相关导入 -------------------------- -from algorithm.checkpoint.npu_yolo_onnx_person_car_phone import YOLOv8_ONNX # 主检测模型（人/车/后备箱/手机） +from algorithm.common.npu_yolo_onnx_person_car_phone import YOLOv8_ONNX # 主检测模型（人/车/后备箱/手机） from yolox.tracker.byte_tracker import BYTETracker diff --git a/rtsp_service_ws_Zhihuishi.py b/rtsp_service_ws_Zhihuishi.py index 8054d8f..2aab8ad 100644 --- a/rtsp_service_ws_Zhihuishi.py +++ b/rtsp_service_ws_Zhihuishi.py @@ -18,7 +18,7 @@ from typing import Dict, Any from test_cam import get_camera_preview_url # -------------------------- Kadian 检测相关导入 -------------------------- -from algorithm.checkpoint.npu_yolo_onnx_person_car_phone import YOLOv8_ONNX # 主检测模型（人/车/后备箱/手机） +from algorithm.common.npu_yolo_onnx_person_car_phone import YOLOv8_ONNX # 主检测模型（人/车/后备箱/手机） from yolox.tracker.byte_tracker import BYTETracker diff --git a/rtsp_service_ws_Zoulang.py b/rtsp_service_ws_Zoulang.py index 3c625f5..bd8987e 100644 --- a/rtsp_service_ws_Zoulang.py +++ b/rtsp_service_ws_Zoulang.py @@ -19,7 +19,7 @@ from typing import Dict, Any from test_cam import get_camera_preview_url # -------------------------- Kadian 检测相关导入 -------------------------- -from algorithm.checkpoint.npu_yolo_onnx_person_car_phone import YOLOv8_ONNX # 主检测模型（人/车/后备箱/手机） +from algorithm.common.npu_yolo_onnx_person_car_phone import YOLOv8_ONNX # 主检测模型（人/车/后备箱/手机） from yolox.tracker.byte_tracker import BYTETracker diff --git a/rtsp_service_ws_kadian.py b/rtsp_service_ws_kadian.py index 8b439bb..21163d3 100644 --- a/rtsp_service_ws_kadian.py +++ b/rtsp_service_ws_kadian.py @@ -12,7 +12,7 @@ import yaml from dataclasses import dataclass -from biz.checkpoint.checkpoint_biz import KadianDetector, RTSP_TARGET_FPS, ALERT_PUSH_INTERVAL, FrameProcessorWorker +from biz.checkpoint.checkpoint_biz import FrameProcessorWorker from test_cam import get_camera_preview_url from utils.web_socket_sender import WebSocketSender diff --git a/rtsp_service_ws_kanshousuo.py b/rtsp_service_ws_kanshousuo.py index 3b0e7f7..350dff0 100644 --- a/rtsp_service_ws_kanshousuo.py +++ b/rtsp_service_ws_kanshousuo.py @@ -16,7 +16,7 @@ from dataclasses import dataclass from typing import Dict, Any # -------------------------- Kadian 检测相关导入 -------------------------- -from algorithm.checkpoint.npu_yolo_onnx_person_car_phone import YOLOv8_ONNX # 主检测模型（人/车/后备箱/手机） +from algorithm.common.npu_yolo_onnx_person_car_phone import YOLOv8_ONNX # 主检测模型（人/车/后备箱/手机） from yolox.tracker.byte_tracker import BYTETracker