16337
f81cc81ce6
**删除MQTT旧代码：** - 删除 mqtt_service.py（已废弃的空壳） - 从 config.py 删除 MQTTConfig 类和相关配置 - 从 schemas.py 删除 mqtt 字段 - 从 alert_service.py 删除 create_alert_from_mqtt 方法 - 告警上报已改为 HTTP + COS 方案，MQTT机制完全废弃 **修复边缘节点重复显示（方案A）：** - 清理 edge_devices 表历史数据（删除 edge_device_001、edge_inference_device） - 禁用 DeviceService 的 handle_heartbeat 自动创建设备功能 - 边缘端未实现心跳机制，告警数从 alarm_event 表统计 - 运行时长、处理帧数字段设为 null（无心跳机制，不可用） - 添加 count_alarms_by_edge_node 方法统计边缘节点告警数 **影响范围：** - /admin-api/aiot/edge/device/page 接口返回数据调整 - /admin-api/aiot/edge/device/get 接口返回数据调整 - 确保不破坏现有功能（告警上报已改为HTTP）
133 lines
3.8 KiB
Python
133 lines
3.8 KiB
Python
"""
|
|
设备服务
|
|
管理边缘设备状态
|
|
"""
|
|
from datetime import datetime, timezone, timedelta
|
|
from typing import Dict, Any, List, Optional
|
|
|
|
from app.models import EdgeDevice, DeviceStatus, get_session
|
|
from app.utils.logger import logger
|
|
|
|
|
|
class DeviceService:
|
|
"""设备服务"""
|
|
|
|
# 设备离线超时时间（秒）
|
|
OFFLINE_TIMEOUT = 90
|
|
|
|
def __init__(self):
|
|
self._devices: Dict[str, Dict[str, Any]] = {} # 内存缓存
|
|
|
|
def handle_heartbeat(self, heartbeat_data: Dict[str, Any]) -> Optional[EdgeDevice]:
|
|
"""
|
|
处理心跳消息（已废弃 - 边缘端未实现心跳机制）
|
|
|
|
保留此方法以兼容旧代码，实际上不会被调用。
|
|
边缘节点信息应通过手动创建或配置管理。
|
|
"""
|
|
logger.warning("handle_heartbeat 被调用，但心跳机制已废弃，忽略")
|
|
return None
|
|
|
|
def check_offline_devices(self) -> List[EdgeDevice]:
|
|
"""检查离线设备"""
|
|
db = get_session()
|
|
try:
|
|
threshold = datetime.now(timezone.utc) - timedelta(seconds=self.OFFLINE_TIMEOUT)
|
|
|
|
# 查找需要标记为离线的设备
|
|
devices = db.query(EdgeDevice).filter(
|
|
EdgeDevice.status == DeviceStatus.ONLINE,
|
|
EdgeDevice.last_heartbeat < threshold
|
|
).all()
|
|
|
|
offline_devices = []
|
|
for device in devices:
|
|
device.status = DeviceStatus.OFFLINE
|
|
device.updated_at = datetime.now(timezone.utc)
|
|
offline_devices.append(device)
|
|
logger.info(f"设备离线: {device.device_id}")
|
|
|
|
if offline_devices:
|
|
db.commit()
|
|
|
|
return offline_devices
|
|
|
|
except Exception as e:
|
|
db.rollback()
|
|
logger.error(f"检查离线设备失败: {e}")
|
|
return []
|
|
finally:
|
|
db.close()
|
|
|
|
def get_device(self, device_id: str) -> Optional[EdgeDevice]:
|
|
"""获取设备信息"""
|
|
db = get_session()
|
|
try:
|
|
return db.query(EdgeDevice).filter(
|
|
EdgeDevice.device_id == device_id
|
|
).first()
|
|
finally:
|
|
db.close()
|
|
|
|
def get_devices(
|
|
self,
|
|
status: Optional[str] = None,
|
|
page: int = 1,
|
|
page_size: int = 20
|
|
) -> tuple[List[EdgeDevice], int]:
|
|
"""获取设备列表"""
|
|
db = get_session()
|
|
try:
|
|
query = db.query(EdgeDevice)
|
|
|
|
if status:
|
|
query = query.filter(EdgeDevice.status == status)
|
|
|
|
total = query.count()
|
|
devices = (
|
|
query.order_by(EdgeDevice.last_heartbeat.desc())
|
|
.offset((page - 1) * page_size)
|
|
.limit(page_size)
|
|
.all()
|
|
)
|
|
|
|
return devices, total
|
|
finally:
|
|
db.close()
|
|
|
|
def get_statistics(self) -> Dict[str, Any]:
|
|
"""获取设备统计"""
|
|
db = get_session()
|
|
try:
|
|
total = db.query(EdgeDevice).count()
|
|
online = db.query(EdgeDevice).filter(
|
|
EdgeDevice.status == DeviceStatus.ONLINE
|
|
).count()
|
|
offline = db.query(EdgeDevice).filter(
|
|
EdgeDevice.status == DeviceStatus.OFFLINE
|
|
).count()
|
|
error = db.query(EdgeDevice).filter(
|
|
EdgeDevice.status == DeviceStatus.ERROR
|
|
).count()
|
|
|
|
return {
|
|
"total": total,
|
|
"online": online,
|
|
"offline": offline,
|
|
"error": error,
|
|
}
|
|
finally:
|
|
db.close()
|
|
|
|
|
|
# 全局单例
|
|
_device_service = None
|
|
|
|
|
|
def get_device_service() -> DeviceService:
|
|
"""获取设备服务单例"""
|
|
global _device_service
|
|
if _device_service is None:
|
|
_device_service = DeviceService()
|
|
return _device_service
|