From 121a4a0d3dbe51ea8f4effec1a07567ec6511a66 Mon Sep 17 00:00:00 2001
From: LiuXin <lxxh1992@163.com>
Date: Fri, 22 Aug 2025 09:34:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8A=A5=E8=AD=A6=E7=9A=84?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Alarm.DomainService/DahAlarm/DahuaGeneralCtlService.cs | 7 ++++---
 .../DahAlarm/IDahuaGeneralCtlService.cs                    | 2 +-
 .../AlarmService.API/Controllers/AlarmController.cs        | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/WeiCloud.Fusion/AlarmService/Alarm.DomainService/DahAlarm/DahuaGeneralCtlService.cs b/WeiCloud.Fusion/AlarmService/Alarm.DomainService/DahAlarm/DahuaGeneralCtlService.cs
index 829c51f..ac3bb43 100644
--- a/WeiCloud.Fusion/AlarmService/Alarm.DomainService/DahAlarm/DahuaGeneralCtlService.cs
+++ b/WeiCloud.Fusion/AlarmService/Alarm.DomainService/DahAlarm/DahuaGeneralCtlService.cs
@@ -189,12 +189,13 @@ namespace Alarm.DomainService.DahAlarm
         /// <param name="dto"></param>
         /// <returns></returns>
         /// <exception cref="NotImplementedException"></exception>
-        public async Task<DaHApiResult<bool>> HandleAsync(EventEnvelopeDto dto)
+        public async Task<DaHApiResult<bool>> HandleAsync(object dto2)
         {
             DaHApiResult<bool> result = new() { Code = "200", Msg = "接口调用成功", Data = true };
+            _logger.LogWarning($"报警回调的数据{dto2}");
             try
             {
-                if (dto is null)
+                if (dto2 is null)
                 {
                     result.Code = "500";
                     result.Msg = "请求参数不能为空";
@@ -202,7 +203,7 @@ namespace Alarm.DomainService.DahAlarm
                     _logger.LogWarning("大华报警事件订阅回调处理失败，参数不能为空");
                     return result;
                 }
-
+                EventEnvelopeDto dto = dto2 as EventEnvelopeDto;
                 if (dto.Info is not null)
                 {
                     //这是大华的残卫报警类型
diff --git a/WeiCloud.Fusion/AlarmService/Alarm.DomainService/DahAlarm/IDahuaGeneralCtlService.cs b/WeiCloud.Fusion/AlarmService/Alarm.DomainService/DahAlarm/IDahuaGeneralCtlService.cs
index 2f9c716..7a06401 100644
--- a/WeiCloud.Fusion/AlarmService/Alarm.DomainService/DahAlarm/IDahuaGeneralCtlService.cs
+++ b/WeiCloud.Fusion/AlarmService/Alarm.DomainService/DahAlarm/IDahuaGeneralCtlService.cs
@@ -25,6 +25,6 @@ namespace Alarm.DomainService.DahAlarm
         /// <param name="env"></param>
         /// <param name="ct"></param>
         /// <returns></returns>
-        Task<DaHApiResult<bool>> HandleAsync(EventEnvelopeDto env);
+        Task<DaHApiResult<bool>> HandleAsync(object env);
     }
 }
\ No newline at end of file
diff --git a/WeiCloud.Fusion/AlarmService/AlarmService.API/Controllers/AlarmController.cs b/WeiCloud.Fusion/AlarmService/AlarmService.API/Controllers/AlarmController.cs
index 6a795e8..2f3665d 100644
--- a/WeiCloud.Fusion/AlarmService/AlarmService.API/Controllers/AlarmController.cs
+++ b/WeiCloud.Fusion/AlarmService/AlarmService.API/Controllers/AlarmController.cs
@@ -37,7 +37,7 @@ namespace AlarmService.API.Controllers
         /// <param name="env"></param>
         /// <returns></returns>
         [HttpPost]
-        public async Task<DaHApiResult<bool>> DahuaAuthCallback(EventEnvelopeDto env)
+        public async Task<DaHApiResult<bool>> DahuaAuthCallback(object env)
         {
             return await _generalCtlService.HandleAsync(env);
         }