支持通过网页增加、删除、修改摄像头配置信息
支持摄像头配置信息中句柄的设置,并实测有效
This commit is contained in:
@@ -43,6 +43,8 @@ public class MonitorController : ControllerBase
|
||||
Status = c.Status.ToString(),
|
||||
c.IsPhysicalOnline,
|
||||
c.RealFps,
|
||||
c.Width,
|
||||
c.Height,
|
||||
c.TotalFrames,
|
||||
c.Config.Name,
|
||||
c.Config.IpAddress,
|
||||
@@ -69,23 +71,34 @@ public class MonitorController : ControllerBase
|
||||
[HttpGet("{id}")]
|
||||
public IActionResult GetDeviceDetail(long id)
|
||||
{
|
||||
var device = _cameraManager.GetDevice(id);
|
||||
if (device == null) return NotFound($"设备 ID: {id} 不存在");
|
||||
var d = _cameraManager.GetDevice(id);
|
||||
if (d == null) return NotFound($"设备 ID: {id} 不存在");
|
||||
|
||||
return Ok(new
|
||||
{
|
||||
device.Id,
|
||||
Status = device.Status.ToString(),
|
||||
device.IsOnline,
|
||||
device.RealFps,
|
||||
device.TotalFrames,
|
||||
device.Config.Name,
|
||||
device.Config.IpAddress,
|
||||
d.Id,
|
||||
Status = d.Status.ToString(),
|
||||
d.IsOnline,
|
||||
d.IsPhysicalOnline,
|
||||
d.RealFps,
|
||||
d.Width,
|
||||
d.Height,
|
||||
d.TotalFrames,
|
||||
d.Config.Name,
|
||||
d.Config.IpAddress,
|
||||
// --- 新增:将内存中的订阅需求列表传给前端 ---
|
||||
Requirements = device.Controller.GetCurrentRequirements().Select(r => new {
|
||||
Requirements = d.Controller.GetCurrentRequirements().Select(r => new {
|
||||
r.AppId,
|
||||
r.TargetFps,
|
||||
r.LastActive
|
||||
r.LastActive,
|
||||
r.RealFps,
|
||||
r.Memo,
|
||||
r.SavePath,
|
||||
r.Handle,
|
||||
r.TargetIp,
|
||||
r.TargetPort,
|
||||
r.Protocol,
|
||||
r.Type,
|
||||
})
|
||||
});
|
||||
}
|
||||
@@ -171,8 +184,8 @@ public class MonitorController : ControllerBase
|
||||
EnableExpand = request.EnableExpand,
|
||||
TargetWidth = request.TargetWidth,
|
||||
TargetHeight = request.TargetHeight,
|
||||
EnableEnhance = request.EnableEnhance,
|
||||
BrightnessLevel = request.BrightnessLevel
|
||||
EnableBrightness = request.EnableBrightness,
|
||||
Brightness = request.Brightness
|
||||
};
|
||||
|
||||
// 3. 提交给配置管理器 (实时生效)
|
||||
|
||||
Reference in New Issue
Block a user