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
///
///
///
- public async Task> HandleAsync(EventEnvelopeDto dto)
+ public async Task> HandleAsync(object dto2)
{
DaHApiResult 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
///
///
///
- Task> HandleAsync(EventEnvelopeDto env);
+ Task> 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
///
///
[HttpPost]
- public async Task> DahuaAuthCallback(EventEnvelopeDto env)
+ public async Task> DahuaAuthCallback(object env)
{
return await _generalCtlService.HandleAsync(env);
}