桌面端
- 新增 LocalWsServer(ws://127.0.0.1:17301):hello / ping / get_channels /
start_preview / stop_preview / open_window / close_window / ptz / ptz_preset,
一条连接可同时推多路 JPEG 帧(帧头带 sid);慢命令并发派发,云台命令按连接串行,
页面断开自动清理会话与满帧率窗口
- LocalHttpServer 删除预览(MJPEG/快照/满帧率窗口)、/api/hik/channels、/api/hik/ptz*,
HTTP 17300 只保留 /api/query/{code}、/api/activate-login、/api/playback/download,
其余 POST 统一回 404 并提示已迁到 WS;不再依赖 HCNetSDK
- App 自行组装 HikStreamService -> HikPreviewService + HikNativePreviewService 注入 WS
- 后台服务加固:框架依赖(开发版)安装/启动时自动写服务环境变量 DOTNET_ROOT,
避免 LocalSystem 找不到用户目录里的 .NET 8 而报「后台服务启动超时」
前端
- 新增 api/localWs.ts(连接/断线/请求-响应/二进制帧分发),补 getChannels / openWindow /
closeWindow / ptz / ptzPreset
- CamerasView 预览只走 WS(保留「唤起本机软件 -> 等待 -> 提示安装」兜底),
满帧率窗口、云台、预置点改走 WS
- NvrsView 拉取通道改走 WS(连不上时自动唤起一次再重试)
- CameraLayoutCanvas 合成画面 4 路改 WS 推帧
- 删除 createHikPreview/closeHikPreview*/openHikWindow/closeHikWindow*/ptzControl/ptzPreset
与 isLocalServiceAlive/waitForLocalService
其他
- 移除 cameras.has_ptz(迁移 20261019233000)与相关接口/字段/UI
- 通道号按 struStreamMode 映射(IP 通道空槽导致 51 之后整体错位)
- 扫码 24 小时内只保留最后一次扫描(后上报时间更新时覆盖)
- 清理历史 DESKTOP 占位通道(迁移 20261019230000)
- README / desktop README 补 17301 与 WS 接口说明,修正已删除的 /api/health 描述
127 lines
3.3 KiB
TypeScript
127 lines
3.3 KiB
TypeScript
/**
|
||
* 视频接入:NVR / 摄像头 / 工作台 —— 类型定义
|
||
*
|
||
* 后端返回的字段名同时存在驼峰与下划线(Sequelize 的 toJSON 习惯),
|
||
* 页面只用驼峰字段,下划线字段忽略即可。
|
||
*/
|
||
|
||
/** NVR 录像机 */
|
||
export interface Nvr {
|
||
id: number;
|
||
userId?: number | null;
|
||
name: string;
|
||
host: string;
|
||
port: number;
|
||
username: string;
|
||
serialNumber?: string | null;
|
||
deviceModel?: string | null;
|
||
channelCount: number;
|
||
lastSyncAt?: string | null;
|
||
lastError?: string | null;
|
||
status: number;
|
||
remark?: string | null;
|
||
createdAt?: string;
|
||
updatedAt?: string;
|
||
}
|
||
|
||
/** 摄像头(NVR 通道) */
|
||
export interface Camera {
|
||
id: number;
|
||
nvrId: number;
|
||
channelNo: number;
|
||
name: string;
|
||
/** 设备上的通道名(可能为空) */
|
||
channelName?: string | null;
|
||
type: 'analog' | 'digital' | string;
|
||
ip?: string | null;
|
||
port?: number | null;
|
||
enabled: number;
|
||
status: number;
|
||
remark?: string | null;
|
||
nvr?: {
|
||
id: number;
|
||
name: string;
|
||
host: string;
|
||
port: number;
|
||
serialNumber?: string | null;
|
||
userId?: number | null;
|
||
} | null;
|
||
/** 已被哪个工作台绑定(null = 可绑);来自 /cameras/options */
|
||
boundWorkstation?: { id: number; code?: string; name?: string } | null;
|
||
}
|
||
|
||
/** 工作台 */
|
||
export interface Workstation {
|
||
id: number;
|
||
userId?: number | null;
|
||
code: string;
|
||
name: string;
|
||
/** 1 散单工作台 2 团购工作台 */
|
||
wsType?: number;
|
||
/** 录制范围:触发点之前秒数(团购=扫码前,散单=任务结束前) */
|
||
recordBeforeSec?: number;
|
||
/** 录制范围:触发点之后秒数 */
|
||
recordAfterSec?: number;
|
||
/** 最大录制时长(秒),默认 240 */
|
||
recordMaxSec?: number;
|
||
status: number;
|
||
remark?: string | null;
|
||
/** 合成画布(默认 1920×1080) */
|
||
canvasWidth?: number;
|
||
canvasHeight?: number;
|
||
cameraCount?: number;
|
||
scanChannelCount?: number;
|
||
createdAt?: string;
|
||
updatedAt?: string;
|
||
/** Sequelize 实际输出的下划线时间字段 */
|
||
created_at?: string;
|
||
updated_at?: string;
|
||
}
|
||
|
||
/** 工作台-摄像头绑定 */
|
||
export interface WorkstationCameraLink {
|
||
id: number;
|
||
workstationId: number;
|
||
cameraId: number;
|
||
sortNo: number;
|
||
remark?: string | null;
|
||
/** 合成画面里的矩形(像素,相对画布) */
|
||
x?: number;
|
||
y?: number;
|
||
width?: number;
|
||
height?: number;
|
||
/** 0 主码流 1 子码流 */
|
||
streamType?: number;
|
||
zIndex?: number;
|
||
camera?: (Camera & { displayName?: string }) | null;
|
||
}
|
||
|
||
/** 工作台-扫码通道绑定 */
|
||
export interface WorkstationScanChannelLink {
|
||
id: number;
|
||
workstationId: number;
|
||
scannerId: number;
|
||
channelId: string;
|
||
channelName?: string | null;
|
||
sortNo: number;
|
||
remark?: string | null;
|
||
scanner?: { id: number; sn: string; name?: string | null; status?: number } | null;
|
||
}
|
||
|
||
/** 工作台详情 */
|
||
export interface WorkstationDetail extends Workstation {
|
||
cameras: WorkstationCameraLink[];
|
||
scanChannels: WorkstationScanChannelLink[];
|
||
}
|
||
|
||
/** 可绑定的扫码通道(来自中控上报) */
|
||
export interface AvailableScanChannel {
|
||
id: number;
|
||
scannerId: number;
|
||
channelId: string;
|
||
channelName?: string | null;
|
||
scanner?: { id: number; sn: string; name?: string | null; status?: number } | null;
|
||
/** 已被哪个工作台绑定(null = 可绑) */
|
||
boundWorkstation?: { id: number; code?: string; name?: string } | null;
|
||
}
|