From cb46d12cfa363610d245721eeefe314f0c84e28c Mon Sep 17 00:00:00 2001 From: 16337 <1633794139@qq.com> Date: Thu, 22 Jan 2026 16:44:26 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E5=9B=A0=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=93=E7=BC=BA=E5=B0=91=20working=5Fhours=20?= =?UTF-8?q?=E5=88=97=E5=AF=BC=E8=87=B4=20ROI=20=E9=85=8D=E7=BD=AE=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 手动执行 SQL：ALTER TABLE rois ADD COLUMN working_hours TEXT - 确保现有 SQLite 数据库（security_monitor.db）结构与模型定义一致 - 避免因字段缺失引发 API 或算法读取异常 --- api/roi.py | 26 +++++++++-- db/crud.py | 6 +++ db/models.py | 1 + frontend/src/pages/CameraManagement.tsx | 44 ++++++++++++++++--- frontend/src/pages/ROIEditor.tsx | 56 +++++++++++++++++++++++- inference/pipeline.py | 1 + inference/rules/algorithms.py | 3 +- security_monitor.db | Bin 24576 -> 32768 bytes 8 files changed, 127 insertions(+), 10 deletions(-) diff --git a/api/roi.py b/api/roi.py index 589cffb..f5eff0d 100644 --- a/api/roi.py +++ b/api/roi.py @@ -29,9 +29,10 @@ class CreateROIRequest(BaseModel): rule_type: str direction: Optional[str] = None stay_time: Optional[int] = None - threshold_sec: int = 360 - confirm_sec: int = 30 - return_sec: int = 5 + threshold_sec: int = 300 + confirm_sec: int = 10 + return_sec: int = 30 + working_hours: Optional[List[dict]] = None class UpdateROIRequest(BaseModel): @@ -45,6 +46,7 @@ class UpdateROIRequest(BaseModel): threshold_sec: Optional[int] = None confirm_sec: Optional[int] = None return_sec: Optional[int] = None + working_hours: Optional[List[dict]] = None def _invalidate_roi_cache(camera_id: int): @@ -70,6 +72,7 @@ def list_rois(camera_id: int, db: Session = Depends(get_db)): "threshold_sec": roi.threshold_sec, "confirm_sec": roi.confirm_sec, "return_sec": roi.return_sec, + "working_hours": json.loads(roi.working_hours) if roi.working_hours else None, } for roi in roi_configs ] @@ -93,6 +96,7 @@ def get_roi(camera_id: int, roi_id: int, db: Session = Depends(get_db)): "threshold_sec": roi.threshold_sec, "confirm_sec": roi.confirm_sec, "return_sec": roi.return_sec, + "working_hours": json.loads(roi.working_hours) if roi.working_hours else None, } @@ -102,6 +106,10 @@ def add_roi( request: CreateROIRequest, db: Session = Depends(get_db), ): + import json + + working_hours_json = json.dumps(request.working_hours) if request.working_hours else None + roi = create_roi( db, camera_id=camera_id, @@ -115,6 +123,7 @@ def add_roi( threshold_sec=request.threshold_sec, confirm_sec=request.confirm_sec, return_sec=request.return_sec, + working_hours=working_hours_json, ) _invalidate_roi_cache(camera_id) @@ -126,7 +135,13 @@ def add_roi( "type": roi.roi_type, "points": request.points, "rule": roi.rule_type, + "direction": roi.direction, + "stay_time": roi.stay_time, "enabled": roi.enabled, + "threshold_sec": roi.threshold_sec, + "confirm_sec": roi.confirm_sec, + "return_sec": roi.return_sec, + "working_hours": request.working_hours, } @@ -137,6 +152,9 @@ def modify_roi( request: UpdateROIRequest, db: Session = Depends(get_db), ): + import json + working_hours_json = json.dumps(request.working_hours) if request.working_hours else None + roi = update_roi( db, roi_id=roi_id, @@ -149,6 +167,7 @@ def modify_roi( threshold_sec=request.threshold_sec, confirm_sec=request.confirm_sec, return_sec=request.return_sec, + working_hours=working_hours_json, ) if not roi: raise HTTPException(status_code=404, detail="ROI不存在") @@ -163,6 +182,7 @@ def modify_roi( "points": json.loads(roi.points), "rule": roi.rule_type, "enabled": roi.enabled, + "working_hours": json.loads(roi.working_hours) if roi.working_hours else None, } diff --git a/db/crud.py b/db/crud.py index 7ff9cae..5638379 100644 --- a/db/crud.py +++ b/db/crud.py @@ -139,6 +139,7 @@ def create_roi( threshold_sec: int = 300, confirm_sec: int = 10, return_sec: int = 30, + working_hours: Optional[str] = None, ) -> ROI: import json @@ -154,6 +155,7 @@ def create_roi( threshold_sec=threshold_sec, confirm_sec=confirm_sec, return_sec=return_sec, + working_hours=working_hours, ) db.add(roi) db.commit() @@ -173,6 +175,7 @@ def update_roi( threshold_sec: Optional[int] = None, confirm_sec: Optional[int] = None, return_sec: Optional[int] = None, + working_hours: Optional[str] = None, ) -> Optional[ROI]: import json @@ -198,6 +201,8 @@ def update_roi( roi.confirm_sec = confirm_sec if return_sec is not None: roi.return_sec = return_sec + if working_hours is not None: + roi.working_hours = working_hours db.commit() db.refresh(roi) @@ -232,6 +237,7 @@ def get_roi_points(db: Session, camera_id: int) -> List[dict]: "threshold_sec": roi.threshold_sec, "confirm_sec": roi.confirm_sec, "return_sec": roi.return_sec, + "working_hours": json.loads(roi.working_hours) if roi.working_hours else None, } for roi in rois ] diff --git a/db/models.py b/db/models.py index 2734629..f4630fc 100644 --- a/db/models.py +++ b/db/models.py @@ -93,6 +93,7 @@ class ROI(Base): threshold_sec: Mapped[int] = mapped_column(Integer, default=300) confirm_sec: Mapped[int] = mapped_column(Integer, default=10) return_sec: Mapped[int] = mapped_column(Integer, default=30) + working_hours: Mapped[Optional[str]] = mapped_column(Text, nullable=True) pending_sync: Mapped[bool] = mapped_column(Boolean, default=False) sync_version: Mapped[int] = mapped_column(Integer, default=0) created_at: Mapped[datetime] = mapped_column(DateTime, default=datetime.utcnow) diff --git a/frontend/src/pages/CameraManagement.tsx b/frontend/src/pages/CameraManagement.tsx index 65d7ddf..84d79b3 100644 --- a/frontend/src/pages/CameraManagement.tsx +++ b/frontend/src/pages/CameraManagement.tsx @@ -38,14 +38,48 @@ const CameraManagement: React.FC = () => { const fetchCameras = async () => { setLoading(true); try { - const [camerasRes, statusRes] = await Promise.all([ + const [camerasRes, statusRes, pipelineRes] = await Promise.all([ axios.get('/api/cameras?enabled_only=false'), + axios.get('/api/camera/status/all'), axios.get('/api/pipeline/status') ]); setCameras(camerasRes.data); - setCameraStatus(statusRes.data.cameras || {}); + + const statusMap: Record = {}; + + for (const cam of camerasRes.data) { + const camId = cam.id; + + let status: CameraStatus = { + is_running: false, + fps: 0, + error_message: null, + last_check_time: null, + }; + + const pipelineStatus = pipelineRes.data.cameras?.[String(camId)]; + if (pipelineStatus) { + status.is_running = pipelineStatus.is_running || false; + status.fps = pipelineStatus.fps || 0; + status.last_check_time = pipelineStatus.last_check_time; + } + + const dbStatus = statusRes.data.find((s: any) => s.camera_id === camId); + if (dbStatus) { + if (!status.is_running) { + status.is_running = dbStatus.is_running || false; + } + status.fps = dbStatus.fps || status.fps; + status.error_message = dbStatus.error_message; + status.last_check_time = status.last_check_time || dbStatus.last_check_time; + } + + statusMap[camId] = status; + } + + setCameraStatus(statusMap); } catch (err) { - message.error('获取摄像头列表失败'); + console.error('获取摄像头状态失败', err); } finally { setLoading(false); } @@ -59,8 +93,8 @@ const CameraManagement: React.FC = () => { const extractIP = (url: string): string => { try { - const match = url.match(/:\/\/([^:]+):?(\d+)?\//); - return match ? match[1] : '未知'; + const ipMatch = url.match(/(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})/); + return ipMatch ? ipMatch[1] : '未知'; } catch { return '未知'; } diff --git a/frontend/src/pages/ROIEditor.tsx b/frontend/src/pages/ROIEditor.tsx index 190cb9d..5213d45 100644 --- a/frontend/src/pages/ROIEditor.tsx +++ b/frontend/src/pages/ROIEditor.tsx @@ -1,7 +1,14 @@ import React, { useEffect, useState, useRef } from 'react'; -import { Card, Button, Space, Select, message, Drawer, Form, Input, InputNumber, Switch } from 'antd'; +import { Card, Button, Space, Select, message, Drawer, Form, Input, InputNumber, Switch, TimePicker, Divider } from 'antd'; import { Stage, Layer, Rect, Line, Circle, Text as KonvaText } from 'react-konva'; +import { RangePickerProps } from 'antd/es/date-picker'; import axios from 'axios'; +import dayjs from 'dayjs'; + +interface WorkingHours { + start: number[]; + end: number[]; +} interface ROI { id: number; @@ -13,6 +20,7 @@ interface ROI { threshold_sec: number; confirm_sec: number; return_sec: number; + working_hours: WorkingHours[] | null; } interface Camera { @@ -95,12 +103,18 @@ const ROIEditor: React.FC = () => { const handleSaveROI = async (values: any) => { if (!selectedCamera || !selectedROI) return; try { + const workingHours = values.working_hours?.map((item: any) => ({ + start: [item.start.hour(), item.start.minute()], + end: [item.end.hour(), item.end.minute()], + })); + await axios.put(`/api/camera/${selectedCamera}/roi/${selectedROI.id}`, { name: values.name, roi_type: values.roi_type, rule_type: values.rule_type, threshold_sec: values.threshold_sec, confirm_sec: values.confirm_sec, + working_hours: workingHours, enabled: values.enabled, }); message.success('保存成功'); @@ -150,6 +164,7 @@ const ROIEditor: React.FC = () => { threshold_sec: 60, confirm_sec: 5, return_sec: 5, + working_hours: [], }) .then(() => { message.success('ROI添加成功'); @@ -211,6 +226,10 @@ const ROIEditor: React.FC = () => { threshold_sec: roi.threshold_sec, confirm_sec: roi.confirm_sec, enabled: roi.enabled, + working_hours: roi.working_hours?.map((wh: WorkingHours) => ({ + start: dayjs().hour(wh.start[0]).minute(wh.start[1]), + end: dayjs().hour(wh.end[0]).minute(wh.end[1]), + })), }); setDrawerVisible(true); }} @@ -368,6 +387,10 @@ const ROIEditor: React.FC = () => { threshold_sec: roi.threshold_sec, confirm_sec: roi.confirm_sec, enabled: roi.enabled, + working_hours: roi.working_hours?.map((wh: WorkingHours) => ({ + start: dayjs().hour(wh.start[0]).minute(wh.start[1]), + end: dayjs().hour(wh.end[0]).minute(wh.end[1]), + })), }); setDrawerVisible(true); }} @@ -434,6 +457,37 @@ const ROIEditor: React.FC = () => { + 工作时间配置（可选） + + {(fields, { add, remove }) => ( +
+ {fields.map((field, index) => ( + + + + + + + ))} + +
+ )} + + + 不配置工作时间则使用系统全局设置 + )} diff --git a/inference/pipeline.py b/inference/pipeline.py index b4046de..a1e6d00 100644 --- a/inference/pipeline.py +++ b/inference/pipeline.py @@ -190,6 +190,7 @@ class InferencePipeline: "threshold_sec": roi_config.get("threshold_sec", 300), "confirm_sec": roi_config.get("confirm_sec", 10), "return_sec": roi_config.get("return_sec", 30), + "working_hours": roi_config.get("working_hours"), }, ) diff --git a/inference/rules/algorithms.py b/inference/rules/algorithms.py index c59c70e..46b574d 100644 --- a/inference/rules/algorithms.py +++ b/inference/rules/algorithms.py @@ -293,11 +293,12 @@ class AlgorithmManager: algo_params.update(params) if algorithm_type == "leave_post": + roi_working_hours = algo_params.get("working_hours") or self.working_hours self.algorithms[roi_id]["leave_post"] = LeavePostAlgorithm( threshold_sec=algo_params.get("threshold_sec", 300), confirm_sec=algo_params.get("confirm_sec", 10), return_sec=algo_params.get("return_sec", 30), - working_hours=self.working_hours, + working_hours=roi_working_hours, ) elif algorithm_type == "intrusion": self.algorithms[roi_id]["intrusion"] = IntrusionAlgorithm( diff --git a/security_monitor.db b/security_monitor.db index a12356b6e1cdea6b907d915cbe8974f6bf709fa2..8c51b6cc5d5eb58f8aa3b56ffb10bfc38b86acbe 100644 GIT binary patch literal 32768 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 SBZQDLwFJ41K>*_D3DN)rhL8#X