diff --git a/desktop/README.md b/desktop/README.md
index 44c260f..1f280c8 100644
--- a/desktop/README.md
+++ b/desktop/README.md
@@ -925,10 +925,12 @@ ffmpeg(RTSP, tcp) → 灰度 rawvideo 帧 → 读帧线程只留最新一帧(
- 写的是**录像机通道名**(`NET_DVR_SET_PICCFG_V30` 读-改-写整包 + 回读校验),
所以实时流、回放、下载的录像里都带这段字;摄像头本身不改;
- 字段只有 **31 字节(GBK)**:超长时先压摄像头名、保住完整运单号(见 `OsdText`);
-- 每次写设备配置要 1~3 秒,写入在**单线程队列**里串行执行(不阻塞扫码/识别);
- 一个工作台绑了多路摄像头时是**依次**写入的,第二路通常比第一路晚 1~3 秒上屏
- (同一台录像机的配置是「读整包 → 改 → 写回」,并发会读到写了一半的结构体);
- 失败按 5s→10s→20s→40s→60s 退避;配置里被移除的摄像机会先还原一次工作台名再忘掉;
+- 每次写设备配置要 0.3~3 秒,写入在**后台批量队列**里执行(不阻塞扫码/识别):
+ 一个工作台绑了多路摄像头时是**同时下发**的(一批最多 4 路;不同通道并发安全 ——
+ 录像机只是把配置分别转给各摄像头,实测两路并发读改写 20 次全部成功、其余字段零差异),
+ 但**同一通道**必须串行(「读整包 → 改 → 写回」会互相覆盖,批内已按通道去重);
+ 写完一批还有待写的会立刻接着来,不会空等;失败按 5s→10s→20s→40s→60s 退避;
+ 配置里被移除的摄像机会先还原一次工作台名再忘掉;
- 状态在 `agent-status.json` 的 `Osd`(每路摄像头的当前文本 / 最近写入时间 / 错误,**不含密码**)。
> ⚠️ 改通道名 = 改录像机上的通道名:NVR 本机界面、其他客户端、以及我们「拉取通道」读到的名字都会变。
diff --git a/desktop/Services/Hik/HikDeviceService.cs b/desktop/Services/Hik/HikDeviceService.cs
index 86ccfb4..86fc0b3 100644
--- a/desktop/Services/Hik/HikDeviceService.cs
+++ b/desktop/Services/Hik/HikDeviceService.cs
@@ -525,6 +525,10 @@ public sealed class HikDeviceService : IDisposable
/// 4. 再 GET 回读校验,不一致就当失败(不能只信 SET 的返回值)。
///
/// 中文/长度由调用方用 处理(≤31 字节);这里只做长度兜底。
+ ///
+ /// ⚠️ 并发:**不同通道可以同时写**(实测同一 UserID 上两路并发读改写,20 次全部成功、
+ /// 其余字段零差异),所以这里走 `serialize: false` 不占用会话 Gate——一个工作台绑了多路
+ /// 摄像头时能同时下发。**同一个通道**必须由调用方保证串行(同一通道并发读改写会互相覆盖)。
///
/// 写入后的真实值,以及这次有没有真的改动(值相同就跳过,避免无意义写配置)
public HikOsdWriteResult SetChannelOsdName(string host, int port, string userName, string password,
@@ -591,7 +595,7 @@ public sealed class HikDeviceService : IDisposable
}
changed = true;
- });
+ }, serialize: false);
return new HikOsdWriteResult(actual, changed);
}
@@ -686,17 +690,18 @@ public sealed class HikDeviceService : IDisposable
}
/// 取登录 UserID 执行一段 SDK 调用(串行化 + 链路错误重登一次)
- private void ExecuteWithSession(string host, int port, string userName, string password, Action action)
+ private void ExecuteWithSession(string host, int port, string userName, string password, Action action,
+ bool serialize = true)
{
var key = MakeKey(host, port, userName, password);
var session = _sessions.GetOrAdd(key, _ => new Session(host, port, userName));
- session.Gate.Wait();
+ if (serialize) session.Gate.Wait();
try
{
for (var attempt = 1; ; attempt++)
{
- if (session.UserId < 0) Login(session, password);
+ EnsureLoggedIn(session, password);
try
{
@@ -718,7 +723,21 @@ public sealed class HikDeviceService : IDisposable
}
finally
{
- session.Gate.Release();
+ if (serialize) session.Gate.Release();
+ }
+ }
+
+ ///
+ /// 确保会话已登录。并发调用(`serialize: false`)时两路会同时发现 UserId<0,
+ /// 用会话内锁保证只登录一次,避免同一 key 登出两个 UserID。
+ ///
+ private static void EnsureLoggedIn(Session session, string password)
+ {
+ if (session.UserId >= 0) return;
+
+ lock (session.LoginLock)
+ {
+ if (session.UserId < 0) Login(session, password);
}
}
@@ -1629,9 +1648,12 @@ public sealed class HikDeviceService : IDisposable
public DeviceSnapshot? Device { get; set; }
public long LastUsedTicks { get; private set; }
- /// 同一 UserID 的调用串行化
+ /// 同一 UserID 的调用串行化(抓帧/下载等独占型接口;配置读写可走并发模式)
public SemaphoreSlim Gate { get; } = new(1, 1);
+ /// 登录锁:并发调用时保证只登录一次
+ public object LoginLock { get; } = new();
+
public void Touch() => LastUsedTicks = Environment.TickCount64;
}
diff --git a/desktop/Services/Scan/WorkstationOsdService.cs b/desktop/Services/Scan/WorkstationOsdService.cs
index 90b0f26..7425026 100644
--- a/desktop/Services/Scan/WorkstationOsdService.cs
+++ b/desktop/Services/Scan/WorkstationOsdService.cs
@@ -70,7 +70,8 @@ public sealed class OsdSnapshot
/// 4. 配置(工作台/摄像头/通道)由服务端下发,启动拉一次 + 每 1 分钟兜底 + 收到通知立即拉。
///
/// 实现要点:
-/// - 所有设备写入在**单线程工作队列**里串行执行(写一台 1~3 秒,不能堵扫码线程);
+/// - 设备写入走**后台批量队列**(不堵扫码线程):不同通道**并行**下发(一批最多 4 路),
+/// 同一通道保证串行(同一通道的「读整包 → 改 → 写回」会互相覆盖);
/// - 每次写之前重新算目标文本,避免把过期的运单号写上去;
/// - 写失败按 5s→10s→…→60s 退避,不刷日志;配置里移除的摄像头会**还原一次**工作台名再忘掉;
/// - 文本超过 31 字节(GBK)时优先保运单号,压摄像头名(见 )。
@@ -86,6 +87,9 @@ public sealed class WorkstationOsdService : IDisposable
/// 工作线程巡检间隔(扫码会立刻唤醒,这里只是兜底)
private static readonly TimeSpan WorkerTick = TimeSpan.FromSeconds(1);
+ /// 一批最多同时写几路(不同通道并行;路数再多就分批,避免把录像机打满)
+ private const int MaxParallelWrites = 4;
+
private readonly DeviceService _device;
private readonly object _gate = new();
private readonly AutoResetEvent _wake = new(false);
@@ -284,12 +288,10 @@ public sealed class WorkstationOsdService : IDisposable
{
while (!ct.IsCancellationRequested)
{
- try { _wake.WaitOne(WorkerTick); } catch { /* 停机中 */ }
- if (ct.IsCancellationRequested) break;
-
+ bool more;
try
{
- await WriteOnceAsync(ct).ConfigureAwait(false);
+ more = await WriteBatchAsync(ct).ConfigureAwait(false);
}
catch (OperationCanceledException)
{
@@ -300,52 +302,71 @@ public sealed class WorkstationOsdService : IDisposable
AppLog.Write($"[osd] 写 OSD 循环异常:{ex.Message}");
try { await Task.Delay(TimeSpan.FromSeconds(2), ct).ConfigureAwait(false); }
catch { break; }
+ continue;
}
+
+ // 还有待写的立刻接着来(不再死等 1 秒);没活才让出
+ if (more) continue;
+ try { _wake.WaitOne(WorkerTick); } catch { /* 停机中 */ }
}
}
- /// 挑一路需要写的摄像头执行一次(退役摄像头优先)
- private async Task WriteOnceAsync(CancellationToken ct)
+ ///
+ /// 取一批需要写的摄像头**并行**写一次(退役摄像头优先),返回是否还有剩下的。
+ ///
+ /// 同一批里每个通道只会出现一次:**不同通道**可以同时下发(录像机只是把配置分别
+ /// 转给各摄像头,实测同一 UserID 上两路并发读改写 20 次全部成功、其余字段零差异),
+ /// **同一通道**必须串行,否则「读整包 → 改 → 写回」会互相覆盖。
+ ///
+ private async Task WriteBatchAsync(CancellationToken ct)
{
// 设备服务被关掉/停用后不要再动设备(配置可能已经过期)
- if (!_device.Enabled) return;
+ if (!_device.Enabled) return false;
- RetiredWrite? retired = null;
- (CameraState State, string Text)? job = null;
+ var jobs = new List<(OsdCameraTarget Camera, string Text, CameraState? State)>();
+ var more = false;
lock (_gate)
{
- if (_retired.Count > 0)
+ var now = DateTime.Now;
+ var taken = new HashSet(StringComparer.OrdinalIgnoreCase);
+
+ while (_retired.Count > 0 && jobs.Count < MaxParallelWrites)
{
- retired = _retired.Dequeue();
+ var retired = _retired.Dequeue();
+ if (!taken.Add(retired.Camera.Key)) continue;
+ jobs.Add((retired.Camera, retired.Text, null));
}
- else
+
+ foreach (var state in _cameras.Values)
{
- var now = DateTime.Now;
- foreach (var state in _cameras.Values)
+ if (jobs.Count >= MaxParallelWrites)
{
- if (state.NextAttemptAt > now) continue;
- if (!_workstations.TryGetValue(state.WorkstationId, out var workstation)) continue;
-
- var text = DesiredText(workstation, state, now);
- if (string.Equals(text, state.LastText, StringComparison.Ordinal)) continue;
-
- job = (state, text);
+ more = true;
break;
}
+
+ if (state.NextAttemptAt > now) continue;
+ if (!_workstations.TryGetValue(state.WorkstationId, out var workstation)) continue;
+
+ var text = DesiredText(workstation, state, now);
+ if (string.Equals(text, state.LastText, StringComparison.Ordinal)) continue;
+ if (!taken.Add(state.Camera.Key)) continue;
+
+ // 占位:写完(成功/失败)会改成真正的下次时间,避免下一批重复挑同一路
+ state.NextAttemptAt = now + TimeSpan.FromMinutes(1);
+ jobs.Add((state.Camera, text, state));
}
+
+ if (_retired.Count > 0) more = true;
}
- if (retired is not null)
- {
- await WriteCameraAsync(retired.Camera, retired.Text, ct).ConfigureAwait(false);
- return;
- }
+ if (jobs.Count == 0) return false;
- if (job is null) return;
+ await Task.WhenAll(jobs.Select(job => WriteCameraAsync(job.Camera, job.Text, ct, job.State)))
+ .ConfigureAwait(false);
- var (jobState, jobText) = job.Value;
- await WriteCameraAsync(jobState.Camera, jobText, ct, jobState).ConfigureAwait(false);
+ return more;
}
/// 写一路摄像头的 OSD,并更新状态(成功/失败都记在该摄像头上)