NetMQ 协议，支持摄像头增、删、改
This commit is contained in:
@@ -1,103 +1,177 @@
|
||||
using Newtonsoft.Json.Linq;
|
||||
using SHH.CameraSdk; // 引用包含 FrameController 和 FrameRequirement 的命名空间
|
||||
using SHH.CameraSdk;
|
||||
using SHH.Contracts;
|
||||
|
||||
namespace SHH.CameraService;
|
||||
|
||||
/// <summary>
|
||||
/// 同步设备配置处理器
|
||||
/// </summary>
|
||||
public class SyncCameraHandler : ICommandHandler
|
||||
{
|
||||
private readonly CameraManager _cameraManager;
|
||||
|
||||
public string ActionName => ProtocolHeaders.SyncCamera;
|
||||
/// <summary>
|
||||
/// 命令名称
|
||||
/// </summary>
|
||||
public string ActionName => ProtocolHeaders.Sync_Camera;
|
||||
|
||||
/// <summary>
|
||||
/// 构造函数
|
||||
/// </summary>
|
||||
/// <param name="cameraManager"></param>
|
||||
public SyncCameraHandler(CameraManager cameraManager)
|
||||
{
|
||||
_cameraManager = cameraManager;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 执行处理
|
||||
/// </summary>
|
||||
/// <param name="payload"></param>
|
||||
/// <returns></returns>
|
||||
public async Task ExecuteAsync(JToken payload)
|
||||
{
|
||||
// 1. 解析配置
|
||||
// 1. 反序列化配置 DTO
|
||||
var dto = payload.ToObject<CameraConfigDto>();
|
||||
if (dto == null) return;
|
||||
|
||||
// 2. 添加设备到管理器 (这一步是必须的，不然没有 Device 就没有 Controller)
|
||||
var videoConfig = new VideoSourceConfig
|
||||
{
|
||||
Id = dto.Id,
|
||||
Name = dto.Name,
|
||||
IpAddress = dto.IpAddress,
|
||||
Port = dto.Port,
|
||||
Username = dto.Username,
|
||||
Password = dto.Password,
|
||||
ChannelIndex = dto.ChannelIndex,
|
||||
StreamType = dto.StreamType,
|
||||
Brand = (DeviceBrand)dto.Brand,
|
||||
RenderHandle = (IntPtr)dto.RenderHandle,
|
||||
MainboardIp = dto.MainboardIp,
|
||||
MainboardPort = dto.MainboardPort,
|
||||
// 必须给个默认值，防止空引用
|
||||
VendorArguments = new Dictionary<string, string>(),
|
||||
};
|
||||
|
||||
// 如果设备不存在才添加，如果已存在，后续逻辑会直接获取
|
||||
if (_cameraManager.GetDevice(videoConfig.Id) == null)
|
||||
{
|
||||
_cameraManager.AddDevice(videoConfig);
|
||||
}
|
||||
|
||||
// 3. 核心：直接获取设备实例
|
||||
// 2. 尝试获取现有设备
|
||||
var device = _cameraManager.GetDevice(dto.Id);
|
||||
if (device == null)
|
||||
{
|
||||
Console.WriteLine($"[SyncError] 设备 {dto.Id} 创建失败，无法执行自动订阅。");
|
||||
return;
|
||||
}
|
||||
|
||||
// 4. 拿到你的“宝贝”控制器 (FrameController)
|
||||
var controller = device.Controller;
|
||||
if (controller == null)
|
||||
if (device != null)
|
||||
{
|
||||
Console.WriteLine($"[SyncError] 设备 {dto.Id} 不支持流控调度 (Controller is null)。");
|
||||
return;
|
||||
}
|
||||
// =========================================================
|
||||
// 场景 A: 设备已存在 -> 执行智能更新 (Smart Update)
|
||||
// =========================================================
|
||||
Console.WriteLine($"[Sync] 更新设备配置: {dto.Id} ({dto.Name})");
|
||||
|
||||
// 5. 暴力注册订阅需求 (Loop AutoSubscriptions)
|
||||
if (dto.AutoSubscriptions != null && dto.AutoSubscriptions.Count > 0)
|
||||
{
|
||||
foreach (var subItem in dto.AutoSubscriptions)
|
||||
// 将全量配置映射为部分更新 DTO
|
||||
var updateDto = new DeviceUpdateDto
|
||||
{
|
||||
// 生成 AppId (照抄你给的逻辑)
|
||||
string finalAppId = string.IsNullOrWhiteSpace(subItem.AppId)
|
||||
? $"SUB_{Guid.NewGuid().ToString("N").Substring(0, 8).ToUpper()}"
|
||||
: subItem.AppId;
|
||||
// --- 冷更新参数 (变更会触发重启) ---
|
||||
IpAddress = dto.IpAddress,
|
||||
Port = dto.Port,
|
||||
Username = dto.Username,
|
||||
Password = dto.Password,
|
||||
ChannelIndex = dto.ChannelIndex,
|
||||
Brand = dto.Brand,
|
||||
RtspPath = dto.RtspPath,
|
||||
RenderHandle = dto.RenderHandle, // long 类型直接赋值
|
||||
|
||||
Console.WriteLine($"[自动化] 正在注册流控: {finalAppId}, 目标: {subItem.TargetFps} FPS");
|
||||
// --- 热更新参数 (变更立即生效) ---
|
||||
Name = dto.Name,
|
||||
Location = dto.Location,
|
||||
StreamType = dto.StreamType,
|
||||
|
||||
// 构造 FrameRequirement 对象 (完全匹配你 FrameController 的入参)
|
||||
// 这里的属性赋值对应你代码里 req.Type, req.SavePath 等逻辑
|
||||
var requirement = new FrameRequirement
|
||||
MainboardIp = dto.MainboardIp,
|
||||
MainboardPort = dto.MainboardPort,
|
||||
|
||||
// --- 图像处理参数 (热更新) ---
|
||||
AllowCompress = dto.AllowCompress,
|
||||
AllowExpand = dto.AllowExpand,
|
||||
TargetResolution = dto.TargetResolution,
|
||||
EnhanceImage = dto.EnhanceImage,
|
||||
UseGrayscale = dto.UseGrayscale
|
||||
};
|
||||
|
||||
// 调用 Manager 的核心更新逻辑 (它会自动判断是 Stop->Start 还是直接应用)
|
||||
await _cameraManager.UpdateDeviceConfigAsync(dto.Id, updateDto);
|
||||
}
|
||||
else
|
||||
{
|
||||
// =========================================================
|
||||
// 场景 B: 设备不存在 -> 执行新增 (Add New)
|
||||
// =========================================================
|
||||
Console.WriteLine($"[Sync] 新增设备: {dto.Id} ({dto.Name})");
|
||||
|
||||
// 构造全新的设备配置
|
||||
var newConfig = new VideoSourceConfig
|
||||
{
|
||||
Id = dto.Id,
|
||||
Name = dto.Name,
|
||||
Brand = (DeviceBrand)dto.Brand, // int -> Enum 强转
|
||||
IpAddress = dto.IpAddress,
|
||||
Port = dto.Port,
|
||||
Username = dto.Username,
|
||||
Password = dto.Password,
|
||||
ChannelIndex = dto.ChannelIndex,
|
||||
StreamType = dto.StreamType,
|
||||
RtspPath = dto.RtspPath,
|
||||
MainboardIp = dto.MainboardIp,
|
||||
MainboardPort = dto.MainboardPort,
|
||||
RenderHandle = (IntPtr)dto.RenderHandle, // long -> IntPtr 转换
|
||||
ConnectionTimeoutMs = 5000 // 默认超时
|
||||
};
|
||||
|
||||
// 添加到管理器池
|
||||
_cameraManager.AddDevice(newConfig);
|
||||
|
||||
// 重新获取引用以进行后续操作
|
||||
device = _cameraManager.GetDevice(dto.Id);
|
||||
|
||||
}
|
||||
|
||||
// ★★★ 核心修复：统一处理“运行意图” ★★★
|
||||
if (device != null)
|
||||
{
|
||||
// 将 DTO 的立即执行标志直接同步给设备的运行意图
|
||||
device.IsRunning = dto.ImmediateExecution;
|
||||
|
||||
if (dto.ImmediateExecution)
|
||||
{
|
||||
// 情况 1: 收到“启动”指令
|
||||
if (!device.IsOnline) // 只有没在线时才点火
|
||||
{
|
||||
AppId = finalAppId,
|
||||
TargetFps = subItem.TargetFps, // 8帧 或 1帧
|
||||
Type = (SubscriptionType)subItem.Type, // 业务类型 (LocalWindow, NetworkTrans...)
|
||||
Memo = subItem.Memo ?? "Auto Sync",
|
||||
|
||||
// 其它字段给默认空值，防止 Controller 内部逻辑报错
|
||||
Handle = "",
|
||||
SavePath = ""
|
||||
};
|
||||
|
||||
// ★★★ 见证奇迹的时刻：直接调用 Register ★★★
|
||||
controller.Register(requirement);
|
||||
Console.WriteLine($"[Sync] 指令：立即启动设备 {dto.Id}");
|
||||
_ = device.StartAsync();
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
// 情况 2: 收到“停止”指令 (即 ImmediateExecution = false)
|
||||
if (device.IsOnline) // 只有在线时才熄火
|
||||
{
|
||||
Console.WriteLine($"[Sync] 指令：立即停止设备 {dto.Id}");
|
||||
_ = device.StopAsync();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//// 6. 启动设备
|
||||
//// 你的积分算法会在 device 内部的推流循环中被 MakeDecision 调用
|
||||
if (dto.ImmediateExecution)
|
||||
await device.StartAsync();
|
||||
// =========================================================
|
||||
// 3. 处理自动订阅策略 (Auto Subscriptions)
|
||||
// =========================================================
|
||||
// 无论新增还是更新，都确保订阅策略是最新的
|
||||
if (device != null && dto.AutoSubscriptions != null)
|
||||
{
|
||||
var controller = device.Controller;
|
||||
if (controller != null)
|
||||
{
|
||||
foreach (var sub in dto.AutoSubscriptions)
|
||||
{
|
||||
// 如果没有 AppId，生成一个临时的（通常 Dashboard 会下发固定的 AppId）
|
||||
string appId = string.IsNullOrWhiteSpace(sub.AppId)
|
||||
? $"AUTO_{Guid.NewGuid().ToString("N")[..8]}"
|
||||
: sub.AppId;
|
||||
|
||||
Console.WriteLine($"[SyncSuccess] 设备 {dto.Id} 同步完成，策略已下发。");
|
||||
// 构造流控需求
|
||||
var req = new FrameRequirement
|
||||
{
|
||||
AppId = appId,
|
||||
TargetFps = sub.TargetFps,
|
||||
Type = (SubscriptionType)sub.Type, // int -> Enum
|
||||
Memo = sub.Memo ?? "Sync Auto",
|
||||
|
||||
// 自动订阅通常不包含具体的 Handle 或 SavePath，除非协议里带了
|
||||
// 如果需要支持网络转发，这里可以扩展映射 sub.TargetIp 等
|
||||
Handle = "",
|
||||
SavePath = ""
|
||||
};
|
||||
|
||||
// 注册到帧控制器
|
||||
controller.Register(req);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user