代码优化

WeiCloud.Fusion/AlarmService/Alarm.DomainService/DahAlarm/DahuaGeneralCtlService.cs

@@ -18,7 +18,7 @@ namespace Alarm.DomainService.DahAlarm
         private readonly IMqttClientService _mqttClientService;
         private readonly ITokenProviderService _tokenProviderService;
 
-        // private readonly HttpClient _http;
+        private readonly HttpClient _http;
         private string mqttHostIp;
 
         private int mqttHostPort;
@@ -50,16 +50,16 @@ namespace Alarm.DomainService.DahAlarm
             topicName = _configuration["SubscribeMQTT:TopicName"]!;
             _mqttClientService = mqttClientService;
             _tokenProviderService = tokenProviderService;
-            //  _http = http;
+            _http = http;
         }
 
-        /// <summary>
-        /// 开发测试的时候，忽略证书
-        /// </summary>
-        private static readonly HttpClient _http = new(new HttpClientHandler
-        {
-            ServerCertificateCustomValidationCallback = HttpClientHandler.DangerousAcceptAnyServerCertificateValidator,
-        });
+        ///// <summary>
+        ///// 开发测试的时候，忽略证书
+        ///// </summary>
+        //private static readonly HttpClient _http = new(new HttpClientHandler
+        //{
+        //    ServerCertificateCustomValidationCallback = HttpClientHandler.DangerousAcceptAnyServerCertificateValidator,
+        //});
 
         /// <summary>
         /// 新增报警事件订阅

WeiCloud.Fusion/VideoService/Video.API/Controllers/DaHua/VideoManageController.cs

@@ -13,33 +13,33 @@ namespace Video.API.Controllers.DaHua
     public class VideoManageController : ControllerBase
     {
         private readonly ILogger<VideoManageController> _logger;
-        private readonly IRootVideoPlaybackService _rootVideoPlaybackService;
+        private readonly IDahuaGeneralCtlService _dahGeneralCtlService;
         private readonly IConfiguration _configuration;
 
         /// <summary>
         /// 构造
         /// </summary>
         /// <param name="logger"></param>
-        /// <param name="rootVideoPlaybackService"></param>
+        /// <param name="dahGeneralCtlService"></param>
         /// <param name="configuration"></param>
-        public VideoManageController(ILogger<VideoManageController> logger, IRootVideoPlaybackService rootVideoPlaybackService, IConfiguration configuration)
+        public VideoManageController(ILogger<VideoManageController> logger, IDahuaGeneralCtlService dahGeneralCtlService, IConfiguration configuration)
         {
             _logger = logger;
-            _rootVideoPlaybackService = rootVideoPlaybackService;
+            _dahGeneralCtlService = dahGeneralCtlService;
             _configuration = configuration;
         }
 
         #region 大华视频处理
 
         /// <summary>
-        /// 大华视频回放
+        /// 大华hls视频回放
         /// </summary>
         /// <param name="dto"></param>
         /// <returns></returns>
         [HttpPost("playback/dh")]
-        public async Task<ApiResult<UrlDataDto>> StartAndPlaybackDH([FromBody] PlaybackReqDto dto, [FromQuery] string? ipaddress)
+        public async Task<DaHApiResult<UrlDataDto>> StartAndPlaybackDH([FromBody] PlaybackReqDto dto, [FromQuery] string? ipaddress)
         {
-            return await _rootVideoPlaybackService.GetDaHRecordVideoUrl(dto, ipaddress);
+            return await _dahGeneralCtlService.RecordVideoUrl(dto, ipaddress);
         }
 
         /// <summary>
@@ -48,20 +48,20 @@ namespace Video.API.Controllers.DaHua
         /// <param name="dto"></param>
         /// <returns></returns>
         [HttpPost("rtspplayback/dh")]
-        public async Task<ApiResult<UrlDataDto>> RtspPlaybackByTime([FromBody] RtspPlayBackReqDto dto, [FromQuery] string? ipaddress)
+        public async Task<DaHApiResult<UrlDataDto>> RtspPlaybackByTime([FromBody] RtspPlayBackReqDto dto, [FromQuery] string? ipaddress)
         {
-            return await _rootVideoPlaybackService.RtspPlaybackByTime(dto, ipaddress);
+            return await _dahGeneralCtlService.RtspPlaybackByTime(dto, ipaddress);
         }
 
         /// <summary>
-        /// 大华视频的实时流地址
+        /// 大华hls视频的实时流地址
         /// </summary>
         /// <param name="dto"></param>
         /// <returns></returns>
         [HttpPost("realtime/dh")]
-        public async Task<ApiResult<UrlDataDto>> GetRealtimeUrl([FromBody] StreamReqDto dto, [FromQuery] string? ipaddress)
+        public async Task<DaHApiResult<UrlDataDto>> GetRealtimeUrl([FromBody] StreamReqDto dto, [FromQuery] string? ipaddress)
         {
-            return await _rootVideoPlaybackService.GetRealtimeUrl(dto, ipaddress);
+            return await _dahGeneralCtlService.RealtimeStreamUrl(dto, ipaddress);
         }
 
         /// <summary>
@@ -70,9 +70,9 @@ namespace Video.API.Controllers.DaHua
         /// <param name="dto"></param>
         /// <returns></returns>
         [HttpPost("rtspstart/dh")]
-        public async Task<ApiResult<UrlDataDto>> RtspStartVideoUrl([FromBody] StreamRtspReqDto dto, [FromQuery] string? ipaddress)
+        public async Task<DaHApiResult<UrlDataDto>> RtspStartVideoUrl([FromBody] StreamRtspReqDto dto, [FromQuery] string? ipaddress)
         {
-            return await _rootVideoPlaybackService.RtspStartVideoUrl(dto, ipaddress);
+            return await _dahGeneralCtlService.RtspStartVideoUrl(dto, ipaddress);
         }
 
         /// <summary>
@@ -81,9 +81,9 @@ namespace Video.API.Controllers.DaHua
         /// <param name="dto"></param>
         /// <returns></returns>
         [HttpPost("channel/dh")]
-        public async Task<ApiResult<PageInfoDto>> GetChannelCodes(ChannelPageReqDto dto)
+        public async Task<DaHApiResult<PageInfoDto>> GetChannelCodes(ChannelPageReqDto dto)
         {
-            return await _rootVideoPlaybackService.GetChannelCodes(dto);
+            return await _dahGeneralCtlService.GetChannelPageList(dto);
         }
 
         /// <summary>
@@ -135,9 +135,9 @@ namespace Video.API.Controllers.DaHua
         /// <param name="userClient"></param>
         /// <returns></returns>
         [HttpGet("logout/dh")]
-        public async Task<ApiResult<object>> Logout(string authorization, string? openId, int? userClient)
+        public async Task<DaHApiResult<object>> Logout(string authorization, string? openId, int? userClient)
         {
-            return await _rootVideoPlaybackService.Logout(authorization, openId, userClient);
+            return await _dahGeneralCtlService.Logout(authorization, openId, userClient);
         }
 
         /// <summary>
@@ -148,7 +148,7 @@ namespace Video.API.Controllers.DaHua
         [HttpPost("download")]
         public async Task<string> GetDownUrl(DownloadReqDto dto)
         {
-            return await _rootVideoPlaybackService.Download(dto);
+            return await _dahGeneralCtlService.Download(dto);
         }
 
         #endregion 大华视频处理

WeiCloud.Fusion/VideoService/Video.DomainService/Dahvision/DahuaGeneralCtlService.cs

@@ -22,7 +22,6 @@ namespace Video.DomainService
             _tokenProviderService = tokenProviderService;
 
             _http = http;
-            _http = http;
         }
 
         ///// <summary>