新增:垃圾检测算法 GarbageDetectionAlgorithm v1.0
Edge 端实现: - algorithms.py 新增 GarbageDetectionAlgorithm 类 状态机:IDLE → CONFIRMING_GARBAGE → ALARMED → CONFIRMING_CLEAR → IDLE 默认参数:confirm_garbage_sec=60, confirm_clear_sec=60, cooldown_sec=1800 target_classes=['garbage'], alarm_level=2(普通) 与 IllegalParking 同构但去掉 PARKED_COUNTDOWN 阶段 - AlgorithmManager 6 处集成: _PARAM_TYPES、default_params、load_bind_from_redis(热更新)、 update_algorithm_params、register_algorithm、get_algorithm_status 测试:test_garbage_algorithm.py 覆盖 8 个场景,全部通过 - 无垃圾保持 IDLE - 持续 60s 有垃圾 → 触发告警 - 冷却期内不重复触发 - 清理后发 resolve → IDLE - 清理期内垃圾再出现 → 回 ALARMED - reset() 清空状态 - 多目标计数 - 非 target_class 忽略 WVP 后端/前端改动方案预留在 docs/garbage_algorithm_backend_frontend_plan.md (后续 ROI 绑定时再实施,本次只改 Edge 端)
This commit is contained in:
303
algorithms.py
303
algorithms.py
@@ -1550,6 +1550,247 @@ class NonMotorVehicleParkingAlgorithm(BaseAlgorithm):
|
||||
return state_info
|
||||
|
||||
|
||||
class GarbageDetectionAlgorithm(BaseAlgorithm):
|
||||
"""
|
||||
垃圾检测算法(状态机版本 v1.0)
|
||||
|
||||
状态机:
|
||||
IDLE → CONFIRMING_GARBAGE → ALARMED → CONFIRMING_CLEAR → IDLE
|
||||
|
||||
业务流程:
|
||||
1. 检测到垃圾 → 垃圾确认期(confirm_garbage_sec,默认60秒,ratio>=0.6)
|
||||
2. 确认有垃圾 → 触发告警(ALARMED 状态)
|
||||
3. 垃圾消失(ratio<0.15)→ 消失确认期(confirm_clear_sec,默认60秒)
|
||||
4. 消失确认期内持续 ratio<0.2 → 发送 resolve 事件 → 回到 IDLE
|
||||
|
||||
与 IllegalParking 的差异:无 PARKED_COUNTDOWN 阶段(垃圾无"临时停留"概念)。
|
||||
使用滑动窗口(10秒)抗抖动,只检测 garbage 类。
|
||||
"""
|
||||
|
||||
# 状态定义
|
||||
STATE_IDLE = "IDLE"
|
||||
STATE_CONFIRMING_GARBAGE = "CONFIRMING_GARBAGE"
|
||||
STATE_ALARMED = "ALARMED"
|
||||
STATE_CONFIRMING_CLEAR = "CONFIRMING_CLEAR"
|
||||
|
||||
# 告警级别常量(默认值,可通过 params 覆盖)
|
||||
DEFAULT_ALARM_LEVEL = 2 # 普通
|
||||
|
||||
# 滑动窗口参数
|
||||
WINDOW_SIZE_SEC = 10
|
||||
|
||||
# 阈值常量
|
||||
RATIO_CONFIRMING_DROP = 0.3 # 确认期内命中率低于此值则回到 IDLE
|
||||
RATIO_CONFIRM_GARBAGE = 0.6 # 确认有垃圾的命中率阈值
|
||||
RATIO_ALARMED_CLEAR = 0.15 # 已告警状态下进入消失确认的阈值
|
||||
RATIO_CLEAR_RETURN = 0.5 # 消失确认期间垃圾再次出现的阈值
|
||||
RATIO_CLEAR_CONFIRM = 0.2 # 消失确认完成的阈值
|
||||
|
||||
def __init__(
|
||||
self,
|
||||
confirm_garbage_sec: int = 60,
|
||||
confirm_clear_sec: int = 60,
|
||||
cooldown_sec: int = 1800,
|
||||
target_classes: Optional[List[str]] = None,
|
||||
alarm_level: Optional[int] = None,
|
||||
):
|
||||
super().__init__()
|
||||
|
||||
self.confirm_garbage_sec = confirm_garbage_sec
|
||||
self.confirm_clear_sec = confirm_clear_sec
|
||||
self.cooldown_sec = cooldown_sec
|
||||
self.target_classes = target_classes or ["garbage"]
|
||||
self._alarm_level = alarm_level if alarm_level is not None else self.DEFAULT_ALARM_LEVEL
|
||||
|
||||
# 状态变量
|
||||
self.state: str = self.STATE_IDLE
|
||||
self.state_start_time: Optional[datetime] = None
|
||||
|
||||
# 滑动窗口:存储 (timestamp, has_garbage: bool)
|
||||
self._detection_window: deque = deque(maxlen=1000)
|
||||
|
||||
# 告警追踪
|
||||
self._garbage_start_time: Optional[datetime] = None
|
||||
|
||||
# 冷却期管理
|
||||
self.alert_cooldowns: Dict[str, datetime] = {}
|
||||
|
||||
def _check_target_classes(self, detection: Dict) -> bool:
|
||||
"""检查检测目标是否属于垃圾类别"""
|
||||
det_class = detection.get("class", "")
|
||||
return det_class in self.target_classes
|
||||
|
||||
def _update_window(self, current_time: datetime, has_garbage: bool):
|
||||
"""更新滑动窗口"""
|
||||
self._detection_window.append((current_time, has_garbage))
|
||||
cutoff = current_time - timedelta(seconds=self.WINDOW_SIZE_SEC)
|
||||
while self._detection_window and self._detection_window[0][0] < cutoff:
|
||||
self._detection_window.popleft()
|
||||
|
||||
def _get_window_ratio(self) -> float:
|
||||
"""获取滑动窗口内的检测命中率"""
|
||||
if not self._detection_window:
|
||||
return 0.0
|
||||
hits = sum(1 for _, has in self._detection_window if has)
|
||||
return hits / len(self._detection_window)
|
||||
|
||||
def _scan_tracks(self, tracks: List[Dict], roi_id: str) -> Tuple[bool, int, List[float], float]:
|
||||
"""
|
||||
一次遍历 tracks,返回 (has_target, count, latest_bbox, max_confidence)。
|
||||
过滤 target_classes。
|
||||
"""
|
||||
has_target = False
|
||||
count = 0
|
||||
latest_bbox: List[float] = []
|
||||
max_confidence = 0.0
|
||||
for det in tracks:
|
||||
if self._check_detection_in_roi(det, roi_id) and self._check_target_classes(det):
|
||||
has_target = True
|
||||
count += 1
|
||||
if not latest_bbox:
|
||||
latest_bbox = det.get("bbox", [])
|
||||
conf = det.get("confidence", 0.0)
|
||||
if conf > max_confidence:
|
||||
max_confidence = conf
|
||||
return has_target, count, latest_bbox, max_confidence
|
||||
|
||||
def process(
|
||||
self,
|
||||
roi_id: str,
|
||||
camera_id: str,
|
||||
tracks: List[Dict],
|
||||
current_time: Optional[datetime] = None,
|
||||
) -> List[Dict]:
|
||||
"""处理单帧检测结果"""
|
||||
current_time = current_time or datetime.now()
|
||||
alerts = []
|
||||
|
||||
# 一次遍历获取所有信息
|
||||
roi_has_garbage, garbage_count, scan_bbox, scan_confidence = self._scan_tracks(tracks, roi_id)
|
||||
|
||||
# 更新滑动窗口
|
||||
self._update_window(current_time, roi_has_garbage)
|
||||
|
||||
# 计算一次比率,后续分支复用
|
||||
ratio = self._get_window_ratio()
|
||||
|
||||
# === 状态机处理 ===
|
||||
|
||||
if self.state == self.STATE_IDLE:
|
||||
if roi_has_garbage:
|
||||
self.state = self.STATE_CONFIRMING_GARBAGE
|
||||
self.state_start_time = current_time
|
||||
logger.debug(f"ROI {roi_id}: IDLE → CONFIRMING_GARBAGE")
|
||||
|
||||
elif self.state == self.STATE_CONFIRMING_GARBAGE:
|
||||
if self.state_start_time is None:
|
||||
self.state = self.STATE_IDLE
|
||||
return alerts
|
||||
|
||||
elapsed = (current_time - self.state_start_time).total_seconds()
|
||||
|
||||
if ratio < self.RATIO_CONFIRMING_DROP:
|
||||
# 命中率过低,可能只是闪现
|
||||
self.state = self.STATE_IDLE
|
||||
self.state_start_time = None
|
||||
logger.debug(
|
||||
f"ROI {roi_id}: CONFIRMING_GARBAGE → IDLE "
|
||||
f"(ratio={ratio:.2f}<{self.RATIO_CONFIRMING_DROP})"
|
||||
)
|
||||
elif elapsed >= self.confirm_garbage_sec and ratio >= self.RATIO_CONFIRM_GARBAGE:
|
||||
# 确认有垃圾持续存在,检查冷却期
|
||||
cooldown_key = f"{camera_id}_{roi_id}"
|
||||
if cooldown_key not in self.alert_cooldowns or \
|
||||
(current_time - self.alert_cooldowns[cooldown_key]).total_seconds() > self.cooldown_sec:
|
||||
|
||||
self._garbage_start_time = self.state_start_time
|
||||
alerts.append({
|
||||
"roi_id": roi_id,
|
||||
"camera_id": camera_id,
|
||||
"bbox": scan_bbox,
|
||||
"alert_type": "garbage",
|
||||
"alarm_level": self._alarm_level,
|
||||
"confidence": scan_confidence,
|
||||
"message": f"检测到垃圾(持续{int(elapsed)}秒,{garbage_count}处)",
|
||||
"first_frame_time": self._garbage_start_time.strftime('%Y-%m-%d %H:%M:%S'),
|
||||
"garbage_count": garbage_count,
|
||||
})
|
||||
|
||||
self.alert_cooldowns[cooldown_key] = current_time
|
||||
self.state = self.STATE_ALARMED
|
||||
logger.warning(f"ROI {roi_id}: CONFIRMING_GARBAGE → ALARMED (垃圾告警触发)")
|
||||
else:
|
||||
self.state = self.STATE_IDLE
|
||||
self.state_start_time = None
|
||||
logger.debug(f"ROI {roi_id}: CONFIRMING_GARBAGE → IDLE (冷却期内)")
|
||||
|
||||
elif self.state == self.STATE_ALARMED:
|
||||
if ratio < self.RATIO_ALARMED_CLEAR:
|
||||
self.state = self.STATE_CONFIRMING_CLEAR
|
||||
self.state_start_time = current_time
|
||||
logger.debug(
|
||||
f"ROI {roi_id}: ALARMED → CONFIRMING_CLEAR "
|
||||
f"(ratio={ratio:.2f}<{self.RATIO_ALARMED_CLEAR})"
|
||||
)
|
||||
|
||||
elif self.state == self.STATE_CONFIRMING_CLEAR:
|
||||
if self.state_start_time is None:
|
||||
self.state = self.STATE_IDLE
|
||||
return alerts
|
||||
|
||||
elapsed = (current_time - self.state_start_time).total_seconds()
|
||||
|
||||
if ratio >= self.RATIO_CLEAR_RETURN:
|
||||
# 垃圾又出现(或清扫者挡住片刻),回到 ALARMED
|
||||
self.state = self.STATE_ALARMED
|
||||
self.state_start_time = None
|
||||
logger.debug(f"ROI {roi_id}: CONFIRMING_CLEAR → ALARMED (垃圾仍在)")
|
||||
elif elapsed >= self.confirm_clear_sec and ratio < self.RATIO_CLEAR_CONFIRM:
|
||||
# 确认垃圾已被清理
|
||||
if self._last_alarm_id and self._garbage_start_time:
|
||||
duration_ms = int((current_time - self._garbage_start_time).total_seconds() * 1000)
|
||||
alerts.append({
|
||||
"alert_type": "alarm_resolve",
|
||||
"resolve_alarm_id": self._last_alarm_id,
|
||||
"duration_ms": duration_ms,
|
||||
"last_frame_time": current_time.strftime('%Y-%m-%d %H:%M:%S'),
|
||||
"resolve_type": "garbage_removed",
|
||||
})
|
||||
logger.info(f"ROI {roi_id}: 垃圾告警已解决(垃圾被清理)")
|
||||
|
||||
self.state = self.STATE_IDLE
|
||||
self.state_start_time = None
|
||||
self._last_alarm_id = None
|
||||
self._garbage_start_time = None
|
||||
self.alert_cooldowns.clear() # 清理后清空冷却,新垃圾可正常告警
|
||||
logger.debug(f"ROI {roi_id}: CONFIRMING_CLEAR → IDLE")
|
||||
|
||||
return alerts
|
||||
|
||||
def reset(self):
|
||||
"""重置算法状态"""
|
||||
self.state = self.STATE_IDLE
|
||||
self.state_start_time = None
|
||||
self._last_alarm_id = None
|
||||
self._garbage_start_time = None
|
||||
self._detection_window.clear()
|
||||
self.alert_cooldowns.clear()
|
||||
|
||||
def get_state(self, current_time: Optional[datetime] = None) -> Dict[str, Any]:
|
||||
"""获取当前状态"""
|
||||
current_time = current_time or datetime.now()
|
||||
window_ratio = self._get_window_ratio()
|
||||
state_info = {
|
||||
"state": self.state,
|
||||
"state_start_time": self.state_start_time.isoformat() if self.state_start_time else None,
|
||||
"window_ratio": window_ratio,
|
||||
}
|
||||
if self.state in (self.STATE_ALARMED,) and self._garbage_start_time:
|
||||
state_info["garbage_duration_sec"] = (current_time - self._garbage_start_time).total_seconds()
|
||||
state_info["alarm_id"] = self._last_alarm_id
|
||||
return state_info
|
||||
|
||||
|
||||
class AlgorithmManager:
|
||||
# 参数类型定义,用于三级合并后的类型强制转换
|
||||
_PARAM_TYPES = {
|
||||
@@ -1573,6 +1814,10 @@ class AlgorithmManager:
|
||||
"confirm_vehicle_sec": int, "parking_countdown_sec": int,
|
||||
"confirm_clear_sec": int, "cooldown_sec": int,
|
||||
},
|
||||
"garbage": {
|
||||
"confirm_garbage_sec": int, "confirm_clear_sec": int,
|
||||
"cooldown_sec": int,
|
||||
},
|
||||
}
|
||||
|
||||
def __init__(self, working_hours: Optional[List[Dict]] = None):
|
||||
@@ -1617,6 +1862,12 @@ class AlgorithmManager:
|
||||
"cooldown_sec": 900,
|
||||
"target_classes": ["bicycle", "motorcycle"],
|
||||
},
|
||||
"garbage": {
|
||||
"confirm_garbage_sec": 60,
|
||||
"confirm_clear_sec": 60,
|
||||
"cooldown_sec": 1800,
|
||||
"target_classes": ["garbage"],
|
||||
},
|
||||
}
|
||||
|
||||
self._pubsub = None
|
||||
@@ -1904,6 +2155,36 @@ class AlgorithmManager:
|
||||
alarm_level=configured_alarm_level,
|
||||
)
|
||||
logger.info(f"已从Redis加载非机动车违停算法: {key}")
|
||||
elif algo_code == "garbage":
|
||||
configured_alarm_level = params.get("alarm_level")
|
||||
algo_params = {
|
||||
"confirm_garbage_sec": params.get("confirm_garbage_sec", 60),
|
||||
"confirm_clear_sec": params.get("confirm_clear_sec", 60),
|
||||
"cooldown_sec": params.get("cooldown_sec", 1800),
|
||||
"target_classes": params.get("target_classes", ["garbage"]),
|
||||
}
|
||||
if key in self.algorithms.get(roi_id, {}) and "garbage" in self.algorithms[roi_id].get(key, {}):
|
||||
algo = self.algorithms[roi_id][key]["garbage"]
|
||||
algo.confirm_garbage_sec = algo_params["confirm_garbage_sec"]
|
||||
algo.confirm_clear_sec = algo_params["confirm_clear_sec"]
|
||||
algo.cooldown_sec = algo_params["cooldown_sec"]
|
||||
algo.target_classes = algo_params["target_classes"]
|
||||
if configured_alarm_level is not None:
|
||||
algo._alarm_level = configured_alarm_level
|
||||
logger.info(f"已热更新垃圾检测算法参数: {key}")
|
||||
else:
|
||||
if roi_id not in self.algorithms:
|
||||
self.algorithms[roi_id] = {}
|
||||
if key not in self.algorithms[roi_id]:
|
||||
self.algorithms[roi_id][key] = {}
|
||||
self.algorithms[roi_id][key]["garbage"] = GarbageDetectionAlgorithm(
|
||||
confirm_garbage_sec=algo_params["confirm_garbage_sec"],
|
||||
confirm_clear_sec=algo_params["confirm_clear_sec"],
|
||||
cooldown_sec=algo_params["cooldown_sec"],
|
||||
target_classes=algo_params["target_classes"],
|
||||
alarm_level=configured_alarm_level,
|
||||
)
|
||||
logger.info(f"已从Redis加载垃圾检测算法: {key}")
|
||||
|
||||
return True
|
||||
except Exception as e:
|
||||
@@ -2044,6 +2325,18 @@ class AlgorithmManager:
|
||||
|
||||
logger.info(f"[{roi_id}_{bind_id}] 更新非机动车违停检测参数")
|
||||
|
||||
elif algo_code == "garbage":
|
||||
existing_algo.confirm_garbage_sec = params.get("confirm_garbage_sec", 60)
|
||||
existing_algo.confirm_clear_sec = params.get("confirm_clear_sec", 60)
|
||||
existing_algo.cooldown_sec = params.get("cooldown_sec", 1800)
|
||||
if "target_classes" in params:
|
||||
existing_algo.target_classes = params["target_classes"]
|
||||
alarm_level = params.get("alarm_level")
|
||||
if alarm_level is not None:
|
||||
existing_algo._alarm_level = alarm_level
|
||||
|
||||
logger.info(f"[{roi_id}_{bind_id}] 更新垃圾检测参数")
|
||||
|
||||
return True
|
||||
|
||||
except Exception as e:
|
||||
@@ -2200,6 +2493,14 @@ class AlgorithmManager:
|
||||
target_classes=algo_params.get("target_classes", ["bicycle", "motorcycle"]),
|
||||
alarm_level=configured_alarm_level,
|
||||
)
|
||||
elif algorithm_type == "garbage":
|
||||
self.algorithms[roi_id][key]["garbage"] = GarbageDetectionAlgorithm(
|
||||
confirm_garbage_sec=algo_params.get("confirm_garbage_sec", 60),
|
||||
confirm_clear_sec=algo_params.get("confirm_clear_sec", 60),
|
||||
cooldown_sec=algo_params.get("cooldown_sec", 1800),
|
||||
target_classes=algo_params.get("target_classes", ["garbage"]),
|
||||
alarm_level=configured_alarm_level,
|
||||
)
|
||||
|
||||
self._registered_keys.add(cache_key)
|
||||
|
||||
@@ -2292,7 +2593,7 @@ class AlgorithmManager:
|
||||
"state": getattr(algo, "state", "WAITING"),
|
||||
"alarm_sent": getattr(algo, "alarm_sent", False),
|
||||
}
|
||||
elif algo_type in ("illegal_parking", "vehicle_congestion", "non_motor_vehicle_parking"):
|
||||
elif algo_type in ("illegal_parking", "vehicle_congestion", "non_motor_vehicle_parking", "garbage"):
|
||||
status[f"{algo_type}_{bind_id}"] = algo.get_state()
|
||||
else:
|
||||
status[f"{algo_type}_{bind_id}"] = {
|
||||
|
||||
194
docs/garbage_algorithm_backend_frontend_plan.md
Normal file
194
docs/garbage_algorithm_backend_frontend_plan.md
Normal file
@@ -0,0 +1,194 @@
|
||||
# 垃圾检测算法 - WVP 后端 / 前端改动方案(未实施,预留参考)
|
||||
|
||||
## 背景
|
||||
|
||||
Edge 端的 `GarbageDetectionAlgorithm` 已实现(commit xxx)。本文档列出 WVP 后端和前端需要做的配套改动,等后续需要在 ROI 编辑器创建垃圾检测绑定时再实施。
|
||||
|
||||
---
|
||||
|
||||
## 一、WVP 后端改动
|
||||
|
||||
### 1.1 算法注册(数据库)
|
||||
|
||||
**文件:** `wvp-platform/数据库/版本号/SQL 脚本`
|
||||
|
||||
**新增算法记录:**
|
||||
```sql
|
||||
INSERT INTO wvp_ai_algorithm (
|
||||
algo_code, algo_name, algo_description,
|
||||
is_active, param_schema, global_params
|
||||
) VALUES (
|
||||
'garbage',
|
||||
'垃圾检测',
|
||||
'检测监控区域内散落垃圾的持续存在,清洁后自动解除告警',
|
||||
1,
|
||||
'{"confirm_garbage_sec": {"type": "int", "default": 60, "min": 10, "max": 600, "label": "垃圾确认时间(秒)"},
|
||||
"confirm_clear_sec": {"type": "int", "default": 60, "min": 10, "max": 600, "label": "清理确认时间(秒)"},
|
||||
"cooldown_sec": {"type": "int", "default": 1800, "min": 300, "max": 7200, "label": "告警冷却时间(秒)"},
|
||||
"alarm_level": {"type": "int", "default": 2, "min": 0, "max": 3, "label": "告警等级"}
|
||||
}',
|
||||
'{}'
|
||||
);
|
||||
```
|
||||
|
||||
### 1.2 Java 算法服务
|
||||
|
||||
**文件:** `wvp-platform/src/main/java/com/genersoft/iot/vmp/aiot/service/impl/AiAlgorithmServiceImpl.java`
|
||||
|
||||
**改动:** 算法代码白名单(约 line 42-54),添加 `"garbage"`:
|
||||
|
||||
```java
|
||||
private static final Set<String> SUPPORTED_ALGO_CODES = Set.of(
|
||||
"leave_post", "intrusion", "illegal_parking",
|
||||
"vehicle_congestion", "non_motor_vehicle_parking",
|
||||
"garbage" // 新增
|
||||
);
|
||||
```
|
||||
|
||||
### 1.3 配置下发
|
||||
|
||||
不需要改动。现有 `AiRedisConfigServiceImpl` 和 `global_params` 机制已通用。
|
||||
|
||||
---
|
||||
|
||||
## 二、iot-device-management-service 改动
|
||||
|
||||
**文件:** `app/constants.py`
|
||||
|
||||
检查 `AlarmType` 枚举是否已有 `GARBAGE`:
|
||||
- 已有 → 无需改动
|
||||
- 未有 → 添加:
|
||||
|
||||
```python
|
||||
class AlarmType(str, Enum):
|
||||
LEAVE_POST = "leave_post"
|
||||
INTRUSION = "intrusion"
|
||||
ILLEGAL_PARKING = "illegal_parking"
|
||||
VEHICLE_CONGESTION = "vehicle_congestion"
|
||||
NON_MOTOR_VEHICLE_PARKING = "non_motor_vehicle_parking"
|
||||
GARBAGE = "garbage" # 新增
|
||||
|
||||
ALARM_TYPE_NAMES: Dict[str, str] = {
|
||||
...
|
||||
AlarmType.GARBAGE: "垃圾检测",
|
||||
}
|
||||
```
|
||||
|
||||
**文件:** `app/services/vlm_service.py`(VLM 复核提示词)
|
||||
|
||||
添加 garbage 的提示词模板:
|
||||
```python
|
||||
"garbage": """你是安防监控AI复核员。算法类型:垃圾检测,监控区域:{roi_name}。
|
||||
截图显示时间:{timestamp}。
|
||||
任务:判断图中是否真的存在散落的垃圾、包装袋、废弃物等需要清理的物品。
|
||||
分析要点:
|
||||
1. 是否存在明显的垃圾(垃圾袋、纸屑、瓶罐、食品包装等)
|
||||
2. 区分垃圾与正常物品(整齐放置的物品、装饰品不算垃圾)
|
||||
3. 垃圾是否在通道/地面等不该出现的位置
|
||||
4. 排除阴影、污渍、地砖花纹等误检
|
||||
仅输出JSON:{{"confirmed":true,"description":"..."}}""",
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 三、前端改动(iot-device-management-frontend)
|
||||
|
||||
### 3.1 告警列表类型筛选
|
||||
|
||||
**文件:** `apps/web-antd/src/views/aiot/alarm/list/data.ts`
|
||||
|
||||
```typescript
|
||||
export const ALERT_TYPE_OPTIONS = [
|
||||
{ label: '人员离岗', value: 'leave_post' },
|
||||
{ label: '周界入侵', value: 'intrusion' },
|
||||
{ label: '车辆违停', value: 'illegal_parking' },
|
||||
{ label: '车辆拥堵', value: 'vehicle_congestion' },
|
||||
{ label: '非机动车违停', value: 'non_motor_vehicle_parking' },
|
||||
{ label: '垃圾检测', value: 'garbage' }, // 新增
|
||||
];
|
||||
```
|
||||
|
||||
### 3.2 告警标签颜色
|
||||
|
||||
**文件:** `apps/web-antd/src/views/aiot/alarm/list/index.vue`
|
||||
|
||||
```typescript
|
||||
const colorMap: Record<string, string> = {
|
||||
leave_post: 'orange',
|
||||
intrusion: 'red',
|
||||
illegal_parking: 'blue',
|
||||
vehicle_congestion: 'geekblue',
|
||||
non_motor_vehicle_parking: 'green',
|
||||
garbage: 'gold', // 新增 — 建议金色表达清洁主题
|
||||
};
|
||||
```
|
||||
|
||||
### 3.3 ROI 编辑器参数配置
|
||||
|
||||
**文件:** `apps/web-antd/src/views/aiot/device/roi/components/AlgorithmParamEditor.vue`
|
||||
|
||||
参数字段已通用(读自 `algo.paramSchema`),无需改动。**但需要添加参数名中文映射:**
|
||||
|
||||
**文件:** `AlgorithmParamEditor.vue` 的 `paramNameMap` 和 `paramDescMap`
|
||||
|
||||
```typescript
|
||||
const paramNameMap: Record<string, string> = {
|
||||
// ... 已有
|
||||
confirm_garbage_sec: '垃圾确认时间(秒)',
|
||||
};
|
||||
|
||||
const paramDescMap: Record<string, string> = {
|
||||
// ... 已有
|
||||
confirm_garbage_sec: '持续检测到垃圾的时间,超过该时间触发告警(建议 60-120 秒)',
|
||||
};
|
||||
```
|
||||
|
||||
### 3.4 全局参数配置页
|
||||
|
||||
**文件:** `apps/web-antd/src/views/aiot/device/algorithm/index.vue`
|
||||
|
||||
`paramNameMap` 和 `paramDescMap` 同样需要添加 `confirm_garbage_sec` 条目(参见 3.3)。
|
||||
|
||||
---
|
||||
|
||||
## 四、验证顺序(将来实施时)
|
||||
|
||||
1. **后端数据库注册算法记录**
|
||||
2. **WVP 后端重启** — 白名单生效
|
||||
3. **Service 端** constants.py 添加(如需要)
|
||||
4. **前端重启** — 下拉选项和颜色生效
|
||||
5. **ROI 编辑器创建一个 garbage 绑定,参数用默认值**
|
||||
6. **前端触发配置推送** — 验证 Edge 端收到并注册算法
|
||||
7. **Edge 日志验证:** 应看到 `已从Redis加载垃圾检测算法: roi_xxx_bind_xxx`
|
||||
8. **模拟测试:** 放个垃圾在摄像头前,60 秒后应触发告警
|
||||
9. **清理测试:** 移除垃圾 30 秒后应收到 resolve 事件
|
||||
10. **企微卡片收到告警 + 创建工单全流程**
|
||||
|
||||
---
|
||||
|
||||
## 五、TensorRT 引擎部署(最后一步)
|
||||
|
||||
当确定用微调模型替换 COCO 预训练模型时:
|
||||
|
||||
1. **导出 engine:**
|
||||
```bash
|
||||
yolo export model=yolo11s_v1_20260417.pt format=engine imgsz=480 half=True device=0
|
||||
```
|
||||
|
||||
2. **替换 Edge 端模型:**
|
||||
```bash
|
||||
cp yolo11s_v1_20260417.engine /opt/edge/models/yolo11n.engine # 注意文件名
|
||||
```
|
||||
|
||||
3. **修改 `config/settings.py` 的 COCO_CLASS_NAMES:**
|
||||
```python
|
||||
COCO_CLASS_NAMES = ['garbage', 'person', 'car', 'bicycle', 'motorcycle']
|
||||
```
|
||||
|
||||
4. **修改 `core/postprocessor.py` 的输出解析:**
|
||||
- YOLO 输出从 `[84, 8400]`(4+80类)变为 `[9, 8400]`(4+5类)
|
||||
- 类别分数范围从 `output[4:84]` 改为 `output[4:9]`
|
||||
|
||||
5. **重启 Edge 服务**
|
||||
|
||||
这一步涉及模型 + 推理管线,需要单独在生产环境测试。
|
||||
314
test_garbage_algorithm.py
Normal file
314
test_garbage_algorithm.py
Normal file
@@ -0,0 +1,314 @@
|
||||
"""
|
||||
GarbageDetectionAlgorithm 单元测试
|
||||
|
||||
覆盖场景:
|
||||
1. 无垃圾时保持 IDLE
|
||||
2. 持续检测到垃圾 → 确认 → 告警
|
||||
3. 冷却期内不重复触发
|
||||
4. 清理后发 resolve → 回到 IDLE
|
||||
5. 清理确认期内垃圾再次出现 → 回到 ALARMED
|
||||
6. reset() 正确清理状态
|
||||
"""
|
||||
import sys
|
||||
import os
|
||||
import logging
|
||||
|
||||
logging.basicConfig(level=logging.INFO, format='%(levelname)s - %(message)s')
|
||||
|
||||
sys.path.insert(0, os.path.dirname(os.path.abspath(__file__)))
|
||||
|
||||
from datetime import datetime, timedelta
|
||||
from algorithms import GarbageDetectionAlgorithm
|
||||
|
||||
|
||||
# ===== 工具函数 =====
|
||||
|
||||
def make_tracks(roi_id: str, classes: list, confidences: list = None):
|
||||
"""生成模拟检测结果"""
|
||||
if confidences is None:
|
||||
confidences = [0.85] * len(classes)
|
||||
tracks = []
|
||||
for i, cls in enumerate(classes):
|
||||
tracks.append({
|
||||
"track_id": f"{roi_id}_{i}",
|
||||
"class": cls,
|
||||
"confidence": confidences[i],
|
||||
"bbox": [100 + i * 50, 100, 200 + i * 50, 300],
|
||||
"matched_rois": [{"roi_id": roi_id}],
|
||||
})
|
||||
return tracks
|
||||
|
||||
|
||||
def simulate(algo, roi_id, camera_id, get_tracks_fn, count, interval=1.0, start_time=None):
|
||||
"""连续模拟帧,返回所有 alerts 和最后时间戳"""
|
||||
t = start_time or datetime(2026, 4, 17, 10, 0, 0)
|
||||
all_alerts = []
|
||||
for i in range(count):
|
||||
tracks = get_tracks_fn(i)
|
||||
alerts = algo.process(roi_id, camera_id, tracks, t)
|
||||
if alerts:
|
||||
all_alerts.extend(alerts)
|
||||
t += timedelta(seconds=interval)
|
||||
return all_alerts, t
|
||||
|
||||
|
||||
# ===== 测试 1:无垃圾时保持 IDLE =====
|
||||
|
||||
def test_idle_when_no_garbage():
|
||||
print("\n" + "=" * 60)
|
||||
print("TEST 1: 无垃圾帧始终保持 IDLE")
|
||||
print("=" * 60)
|
||||
|
||||
algo = GarbageDetectionAlgorithm(confirm_garbage_sec=60)
|
||||
alerts, _ = simulate(
|
||||
algo, "roi_1", "cam_1",
|
||||
lambda i: make_tracks("roi_1", ["person"]), # 只有人,没有垃圾
|
||||
count=100,
|
||||
)
|
||||
|
||||
assert algo.state == "IDLE", f"Expected IDLE, got {algo.state}"
|
||||
assert len(alerts) == 0, f"Expected no alerts, got {len(alerts)}"
|
||||
print(f" 状态: {algo.state},alerts: {len(alerts)} [OK]")
|
||||
|
||||
|
||||
# ===== 测试 2:持续检测到垃圾 → 告警 =====
|
||||
|
||||
def test_garbage_triggers_alarm():
|
||||
print("\n" + "=" * 60)
|
||||
print("TEST 2: 持续 65 秒检测到垃圾 → 告警")
|
||||
print("=" * 60)
|
||||
|
||||
algo = GarbageDetectionAlgorithm(
|
||||
confirm_garbage_sec=60,
|
||||
cooldown_sec=1800,
|
||||
)
|
||||
|
||||
alerts, _ = simulate(
|
||||
algo, "roi_1", "cam_1",
|
||||
lambda i: make_tracks("roi_1", ["garbage"]),
|
||||
count=65, # 65 秒,超过 60 秒确认期
|
||||
)
|
||||
|
||||
# 应该在第 60-61 秒触发 1 个告警
|
||||
assert algo.state == "ALARMED", f"Expected ALARMED, got {algo.state}"
|
||||
assert len(alerts) == 1, f"Expected 1 alert, got {len(alerts)}"
|
||||
alert = alerts[0]
|
||||
assert alert["alert_type"] == "garbage"
|
||||
assert alert["alarm_level"] == 2
|
||||
assert alert["garbage_count"] == 1
|
||||
assert "检测到垃圾" in alert["message"]
|
||||
print(f" 状态: {algo.state},告警: {alert['message']} [OK]")
|
||||
|
||||
|
||||
# ===== 测试 3:冷却期内不重复触发 =====
|
||||
|
||||
def test_cooldown_prevents_duplicate():
|
||||
print("\n" + "=" * 60)
|
||||
print("TEST 3: 告警后冷却期内持续有垃圾,不重复触发")
|
||||
print("=" * 60)
|
||||
|
||||
algo = GarbageDetectionAlgorithm(
|
||||
confirm_garbage_sec=10, # 缩短便于测试
|
||||
confirm_clear_sec=10,
|
||||
cooldown_sec=300, # 5 分钟冷却
|
||||
)
|
||||
|
||||
# 持续 200 秒有垃圾(远超冷却时间但没超过 300 秒)
|
||||
alerts, _ = simulate(
|
||||
algo, "roi_1", "cam_1",
|
||||
lambda i: make_tracks("roi_1", ["garbage"]),
|
||||
count=200,
|
||||
)
|
||||
|
||||
assert len(alerts) == 1, f"Expected 1 alert (cooldown), got {len(alerts)}"
|
||||
assert algo.state == "ALARMED"
|
||||
print(f" 告警次数: {len(alerts)}(冷却期内不重复)[OK]")
|
||||
|
||||
|
||||
# ===== 测试 4:清理后发 resolve → IDLE =====
|
||||
|
||||
def test_resolve_after_cleaning():
|
||||
print("\n" + "=" * 60)
|
||||
print("TEST 4: 告警后清理 → 发 resolve → IDLE")
|
||||
print("=" * 60)
|
||||
|
||||
algo = GarbageDetectionAlgorithm(
|
||||
confirm_garbage_sec=10,
|
||||
confirm_clear_sec=10,
|
||||
cooldown_sec=300,
|
||||
)
|
||||
algo._last_alarm_id = "test_alarm_123" # 模拟 main.py 回填
|
||||
|
||||
t = datetime(2026, 4, 17, 10, 0, 0)
|
||||
all_alerts = []
|
||||
|
||||
# Phase 1: 15 秒有垃圾 → 触发告警
|
||||
for i in range(15):
|
||||
alerts = algo.process(
|
||||
"roi_1", "cam_1",
|
||||
make_tracks("roi_1", ["garbage"]),
|
||||
t + timedelta(seconds=i)
|
||||
)
|
||||
all_alerts.extend(alerts)
|
||||
assert algo.state == "ALARMED"
|
||||
|
||||
# Phase 2: 然后 30 秒无垃圾 → 发 resolve
|
||||
# 需要等滑动窗口(10s)清空 + confirm_clear_sec(10s) = 20+ 秒
|
||||
for i in range(15, 45):
|
||||
alerts = algo.process(
|
||||
"roi_1", "cam_1",
|
||||
make_tracks("roi_1", []), # 空
|
||||
t + timedelta(seconds=i)
|
||||
)
|
||||
all_alerts.extend(alerts)
|
||||
|
||||
assert algo.state == "IDLE", f"Expected IDLE, got {algo.state}"
|
||||
resolves = [a for a in all_alerts if a.get("alert_type") == "alarm_resolve"]
|
||||
assert len(resolves) == 1, f"Expected 1 resolve, got {len(resolves)}"
|
||||
resolve = resolves[0]
|
||||
assert resolve["resolve_alarm_id"] == "test_alarm_123"
|
||||
assert resolve["resolve_type"] == "garbage_removed"
|
||||
assert resolve["duration_ms"] > 0
|
||||
print(f" resolve: {resolve['resolve_type']}, 持续 {resolve['duration_ms']}ms [OK]")
|
||||
|
||||
|
||||
# ===== 测试 5:清理期内垃圾再出现 → 回到 ALARMED =====
|
||||
|
||||
def test_garbage_reappears_during_clearing():
|
||||
print("\n" + "=" * 60)
|
||||
print("TEST 5: 清理确认期内垃圾再出现 → 回到 ALARMED")
|
||||
print("=" * 60)
|
||||
|
||||
algo = GarbageDetectionAlgorithm(
|
||||
confirm_garbage_sec=10,
|
||||
confirm_clear_sec=20, # 较长的清理确认期
|
||||
cooldown_sec=300,
|
||||
)
|
||||
algo._last_alarm_id = "test_alarm_456"
|
||||
|
||||
t = datetime(2026, 4, 17, 10, 0, 0)
|
||||
|
||||
# Phase 1: 15 秒有垃圾 → 告警 → ALARMED
|
||||
for i in range(15):
|
||||
algo.process("roi_1", "cam_1", make_tracks("roi_1", ["garbage"]),
|
||||
t + timedelta(seconds=i))
|
||||
assert algo.state == "ALARMED"
|
||||
|
||||
# Phase 2: 5 秒无垃圾 → CONFIRMING_CLEAR
|
||||
for i in range(15, 25):
|
||||
algo.process("roi_1", "cam_1", make_tracks("roi_1", []),
|
||||
t + timedelta(seconds=i))
|
||||
assert algo.state == "CONFIRMING_CLEAR", f"got {algo.state}"
|
||||
|
||||
# Phase 3: 垃圾又出现 5 秒 → 回到 ALARMED
|
||||
for i in range(25, 40):
|
||||
algo.process("roi_1", "cam_1", make_tracks("roi_1", ["garbage"]),
|
||||
t + timedelta(seconds=i))
|
||||
|
||||
assert algo.state == "ALARMED", f"Expected ALARMED, got {algo.state}"
|
||||
print(f" 状态恢复: CONFIRMING_CLEAR → ALARMED [OK]")
|
||||
|
||||
|
||||
# ===== 测试 6:reset() 清理状态 =====
|
||||
|
||||
def test_reset_clears_state():
|
||||
print("\n" + "=" * 60)
|
||||
print("TEST 6: reset() 正确清理所有状态")
|
||||
print("=" * 60)
|
||||
|
||||
algo = GarbageDetectionAlgorithm(confirm_garbage_sec=5)
|
||||
algo._last_alarm_id = "test"
|
||||
|
||||
# 先让它进入某个状态
|
||||
t = datetime(2026, 4, 17, 10, 0, 0)
|
||||
for i in range(10):
|
||||
algo.process("roi_1", "cam_1", make_tracks("roi_1", ["garbage"]),
|
||||
t + timedelta(seconds=i))
|
||||
assert algo.state == "ALARMED"
|
||||
assert len(algo._detection_window) > 0
|
||||
assert len(algo.alert_cooldowns) > 0
|
||||
|
||||
# Reset
|
||||
algo.reset()
|
||||
|
||||
assert algo.state == "IDLE"
|
||||
assert algo.state_start_time is None
|
||||
assert algo._last_alarm_id is None
|
||||
assert algo._garbage_start_time is None
|
||||
assert len(algo._detection_window) == 0
|
||||
assert len(algo.alert_cooldowns) == 0
|
||||
print(" 所有状态已清空 [OK]")
|
||||
|
||||
|
||||
# ===== 测试 7:多个垃圾目标计数 =====
|
||||
|
||||
def test_multiple_garbage_count():
|
||||
print("\n" + "=" * 60)
|
||||
print("TEST 7: ROI 内多个垃圾目标 → garbage_count 正确")
|
||||
print("=" * 60)
|
||||
|
||||
algo = GarbageDetectionAlgorithm(confirm_garbage_sec=5)
|
||||
|
||||
alerts, _ = simulate(
|
||||
algo, "roi_1", "cam_1",
|
||||
lambda i: make_tracks("roi_1", ["garbage", "garbage", "garbage"]),
|
||||
count=10,
|
||||
)
|
||||
|
||||
assert len(alerts) == 1
|
||||
assert alerts[0]["garbage_count"] == 3
|
||||
print(f" garbage_count: {alerts[0]['garbage_count']} [OK]")
|
||||
|
||||
|
||||
# ===== 测试 8:非 target_class 不计入 =====
|
||||
|
||||
def test_non_target_class_ignored():
|
||||
print("\n" + "=" * 60)
|
||||
print("TEST 8: person/car 类不计入(只看 garbage)")
|
||||
print("=" * 60)
|
||||
|
||||
algo = GarbageDetectionAlgorithm(confirm_garbage_sec=10)
|
||||
|
||||
alerts, _ = simulate(
|
||||
algo, "roi_1", "cam_1",
|
||||
lambda i: make_tracks("roi_1", ["person", "car"]), # 都不是 garbage
|
||||
count=30,
|
||||
)
|
||||
|
||||
assert algo.state == "IDLE", f"Expected IDLE, got {algo.state}"
|
||||
assert len(alerts) == 0
|
||||
print(f" 状态: {algo.state},无告警 [OK]")
|
||||
|
||||
|
||||
# ===== 运行所有测试 =====
|
||||
|
||||
if __name__ == "__main__":
|
||||
tests = [
|
||||
test_idle_when_no_garbage,
|
||||
test_garbage_triggers_alarm,
|
||||
test_cooldown_prevents_duplicate,
|
||||
test_resolve_after_cleaning,
|
||||
test_garbage_reappears_during_clearing,
|
||||
test_reset_clears_state,
|
||||
test_multiple_garbage_count,
|
||||
test_non_target_class_ignored,
|
||||
]
|
||||
passed = 0
|
||||
failed = 0
|
||||
for t in tests:
|
||||
try:
|
||||
t()
|
||||
passed += 1
|
||||
except AssertionError as e:
|
||||
print(f" FAIL: {e}")
|
||||
failed += 1
|
||||
except Exception as e:
|
||||
print(f" ERROR: {e}")
|
||||
import traceback
|
||||
traceback.print_exc()
|
||||
failed += 1
|
||||
|
||||
print("\n" + "=" * 60)
|
||||
print(f"结果: {passed} 通过, {failed} 失败")
|
||||
print("=" * 60)
|
||||
sys.exit(0 if failed == 0 else 1)
|
||||
Reference in New Issue
Block a user