feat(fire-management): 更新大华摄像头接口参数支持
- 为 ListDaHuaCameraInfo 方法添加 isOnline 参数以筛选在线状态 - 为 GetDaHuaRtsp 方法添加 streamType 参数以支持不同码流类型 - 调整分页参数默认值,pageNum 默认为 1,pageSize 默认为 10 - 移除控制器方法上的 AllowAnonymous 特性 - 优化接口调用逻辑以传递新增参数到大华 APIDataMaintenance
parent
a6afa20a31
commit
d7f515b94c
|
|
@ -1492,7 +1492,7 @@ ORDER BY
|
|||
};
|
||||
}
|
||||
|
||||
public async Task<Response<dynamic>> ListDaHuaCameraInfo(int pageNum ,int pageSize)
|
||||
public async Task<Response<dynamic>> ListDaHuaCameraInfo(int pageNum, int pageSize, int isOnline)
|
||||
{
|
||||
var daHuaApi = new DaHuaApi("https://icc-dev.hibetatest.com:4077");
|
||||
var channelCategoryRequest = new ChannelCategoryRequest
|
||||
|
|
@ -1511,15 +1511,15 @@ ORDER BY
|
|||
Result = channelCategoryResponse.data.pageData
|
||||
};
|
||||
}
|
||||
|
||||
return new Response<dynamic>
|
||||
{
|
||||
Code = channelCategoryResponse.code,
|
||||
Message = channelCategoryResponse.errMsg
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
public async Task<Response<dynamic>> GetDaHuaRtsp(string channelCode)
|
||||
public async Task<Response<dynamic>> GetDaHuaRtsp(string channelCode,string streamType)
|
||||
{
|
||||
var daHuaApi = new DaHuaApi("https://icc-dev.hibetatest.com:4077");
|
||||
|
||||
|
|
@ -1529,7 +1529,7 @@ ORDER BY
|
|||
{
|
||||
channelId = channelCode,
|
||||
dataType = "1",
|
||||
streamType = "1" //主码流
|
||||
streamType = streamType //主码流
|
||||
}
|
||||
};
|
||||
var y = await daHuaApi.StartRtspPreviewAsync(request);
|
||||
|
|
|
|||
|
|
@ -30,16 +30,14 @@ public class CameraController : ControllerBase
|
|||
}
|
||||
|
||||
[HttpGet]
|
||||
[AllowAnonymous]
|
||||
public async Task<Response<dynamic>> ListDaHuaCameraInfo(int pageNum,int pageSize)
|
||||
public async Task<Response<dynamic>> ListDaHuaCameraInfo(int pageNum = 1, int pageSize = 10, int isOnline = 1)
|
||||
{
|
||||
return await _app.ListDaHuaCameraInfo(pageNum,pageSize);
|
||||
}
|
||||
[HttpGet]
|
||||
[AllowAnonymous]
|
||||
public async Task<Response<dynamic>> GetDaHuaRtsp(string channelCode)
|
||||
{
|
||||
return await _app.GetDaHuaRtsp(channelCode);
|
||||
return await _app.ListDaHuaCameraInfo(pageNum, pageSize, isOnline);
|
||||
}
|
||||
|
||||
[HttpGet]
|
||||
public async Task<Response<dynamic>> GetDaHuaRtsp(string channelCode, string streamType = "1")
|
||||
{
|
||||
return await _app.GetDaHuaRtsp(channelCode, streamType);
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue