feat: 信标设备绑定 + 蓝牙模式管理 + 系统管理增强 + 数据导出
- 新增 DeviceBeaconBinding 模型,信标-设备多对多绑定 CRUD - 蓝牙打卡模式批量配置/恢复正常模式 API - 反向同步: 查询设备 BTMACSET 配置更新数据库绑定 (独立 session 解决事务隔离) - 设备列表快捷操作弹窗修复 (fire-and-forget IIFE 替代阻塞轮询) - 保存按钮防抖: 围栏/信标绑定保存点击后 disabled + 转圈防重复提交 - 审计日志中间件 + 系统配置/备份/固件 API - 设备分组管理 + 告警规则配置 - 5个数据导出 API (CSV UTF-8 BOM) - 位置热力图 + 告警条件删除 + 位置清理 via [HAPI](https://hapi.run) Co-Authored-By: HAPI <noreply@hapi.run>
This commit is contained in:
@@ -16,6 +16,8 @@ from app.schemas import (
|
||||
BeaconConfigCreate,
|
||||
BeaconConfigResponse,
|
||||
BeaconConfigUpdate,
|
||||
BeaconDeviceDetail,
|
||||
DeviceBeaconBindRequest,
|
||||
PaginatedList,
|
||||
)
|
||||
from app.services import beacon_service
|
||||
@@ -49,6 +51,76 @@ async def list_beacons(
|
||||
)
|
||||
|
||||
|
||||
@router.post(
|
||||
"/setup-bluetooth-mode",
|
||||
response_model=APIResponse,
|
||||
summary="批量配置蓝牙打卡模式 / Setup BT clock-in mode for devices",
|
||||
dependencies=[Depends(require_write)],
|
||||
)
|
||||
async def setup_bluetooth_mode(
|
||||
device_ids: list[int] | None = Query(default=None, description="指定设备ID,不传则所有在线设备"),
|
||||
db: AsyncSession = Depends(get_db),
|
||||
):
|
||||
result = await beacon_service.setup_bluetooth_mode(db, device_ids)
|
||||
if result["error"]:
|
||||
return APIResponse(code=1, message=result["error"], data=result)
|
||||
return APIResponse(
|
||||
message=f"共 {result['total']} 台: {result['sent']} 台已配置, {result['failed']} 台失败",
|
||||
data=result,
|
||||
)
|
||||
|
||||
|
||||
@router.post(
|
||||
"/restore-normal-mode",
|
||||
response_model=APIResponse,
|
||||
summary="恢复正常模式 / Restore devices to normal (smart) mode",
|
||||
dependencies=[Depends(require_write)],
|
||||
)
|
||||
async def restore_normal_mode(
|
||||
device_ids: list[int] | None = Query(default=None, description="指定设备ID,不传则所有在线设备"),
|
||||
db: AsyncSession = Depends(get_db),
|
||||
):
|
||||
result = await beacon_service.restore_normal_mode(db, device_ids)
|
||||
if result["error"]:
|
||||
return APIResponse(code=1, message=result["error"], data=result)
|
||||
return APIResponse(
|
||||
message=f"共 {result['total']} 台: {result['sent']} 台已恢复, {result['failed']} 台失败",
|
||||
data=result,
|
||||
)
|
||||
|
||||
|
||||
@router.post(
|
||||
"/reverse-sync",
|
||||
response_model=APIResponse,
|
||||
summary="从设备反向同步信标配置 / Query devices and update DB bindings",
|
||||
dependencies=[Depends(require_write)],
|
||||
)
|
||||
async def reverse_sync_beacons(db: AsyncSession = Depends(get_db)):
|
||||
result = await beacon_service.reverse_sync_from_devices(db)
|
||||
if result["error"]:
|
||||
return APIResponse(code=1, message=result["error"], data=result)
|
||||
return APIResponse(
|
||||
message=f"查询 {result['queried']} 台设备,{result['responded']} 台响应,{result['updated']} 台有变更",
|
||||
data=result,
|
||||
)
|
||||
|
||||
|
||||
@router.post(
|
||||
"/sync-device/{device_id}",
|
||||
response_model=APIResponse,
|
||||
summary="同步信标配置到设备 / Sync beacon MACs to device via BTMACSET",
|
||||
dependencies=[Depends(require_write)],
|
||||
)
|
||||
async def sync_device_beacons(device_id: int, db: AsyncSession = Depends(get_db)):
|
||||
result = await beacon_service.sync_device_beacons(db, device_id)
|
||||
if result["error"]:
|
||||
return APIResponse(code=1, message=result["error"], data=result)
|
||||
return APIResponse(
|
||||
message=f"已发送 {len(result['commands'])} 条指令,共 {result['mac_count']} 个信标MAC",
|
||||
data=result,
|
||||
)
|
||||
|
||||
|
||||
@router.get(
|
||||
"/{beacon_id}",
|
||||
response_model=APIResponse[BeaconConfigResponse],
|
||||
@@ -102,3 +174,52 @@ async def delete_beacon(beacon_id: int, db: AsyncSession = Depends(get_db)):
|
||||
if not success:
|
||||
raise HTTPException(status_code=404, detail="Beacon not found")
|
||||
return APIResponse(message="Beacon deleted")
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Device-Beacon Binding endpoints
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
|
||||
@router.get(
|
||||
"/{beacon_id}/devices",
|
||||
response_model=APIResponse[list[BeaconDeviceDetail]],
|
||||
summary="获取信标绑定的设备 / Get beacon devices",
|
||||
)
|
||||
async def get_beacon_devices(beacon_id: int, db: AsyncSession = Depends(get_db)):
|
||||
beacon = await beacon_service.get_beacon(db, beacon_id)
|
||||
if beacon is None:
|
||||
raise HTTPException(status_code=404, detail="Beacon not found")
|
||||
items = await beacon_service.get_beacon_devices(db, beacon_id)
|
||||
return APIResponse(data=[BeaconDeviceDetail(**item) for item in items])
|
||||
|
||||
|
||||
@router.post(
|
||||
"/{beacon_id}/devices",
|
||||
response_model=APIResponse,
|
||||
summary="绑定设备到信标 / Bind devices to beacon",
|
||||
dependencies=[Depends(require_write)],
|
||||
)
|
||||
async def bind_devices(
|
||||
beacon_id: int, body: DeviceBeaconBindRequest, db: AsyncSession = Depends(get_db),
|
||||
):
|
||||
result = await beacon_service.bind_devices_to_beacon(db, beacon_id, body.device_ids)
|
||||
if result.get("error"):
|
||||
raise HTTPException(status_code=404, detail=result["error"])
|
||||
return APIResponse(
|
||||
message=f"绑定完成: 新增{result['created']}, 已绑定{result['already_bound']}, 未找到{result['not_found']}",
|
||||
data=result,
|
||||
)
|
||||
|
||||
|
||||
@router.delete(
|
||||
"/{beacon_id}/devices",
|
||||
response_model=APIResponse,
|
||||
summary="解绑设备 / Unbind devices from beacon",
|
||||
dependencies=[Depends(require_write)],
|
||||
)
|
||||
async def unbind_devices(
|
||||
beacon_id: int, body: DeviceBeaconBindRequest, db: AsyncSession = Depends(get_db),
|
||||
):
|
||||
count = await beacon_service.unbind_devices_from_beacon(db, beacon_id, body.device_ids)
|
||||
return APIResponse(message=f"已解绑 {count} 个设备")
|
||||
|
||||
Reference in New Issue
Block a user