From 5cf5a93d0a58239a99b02866e0734c3c9b16ef12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=AD=E7=9D=BFAMD7950X?= <774114798@qq.com>
Date: Mon, 2 Dec 2024 17:47:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../EquipmentInfo/EquipmentInfoExAppService.cs           | 1 +
 .../ProtectionDevice/ProtectionDeviceAppService.cs       | 9 +++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/YunDa.Application/YunDa.ISAS.Application/GeneralInformation/EquipmentInfo/EquipmentInfoExAppService.cs b/src/YunDa.Application/YunDa.ISAS.Application/GeneralInformation/EquipmentInfo/EquipmentInfoExAppService.cs
index 3adb498..425aada 100644
--- a/src/YunDa.Application/YunDa.ISAS.Application/GeneralInformation/EquipmentInfo/EquipmentInfoExAppService.cs
+++ b/src/YunDa.Application/YunDa.ISAS.Application/GeneralInformation/EquipmentInfo/EquipmentInfoExAppService.cs
@@ -687,6 +687,7 @@ namespace YunDa.ISAS.Application.GeneralInformation
 
             return rst;
         }
+
      
     }
 }
diff --git a/src/YunDa.Application/YunDa.ISAS.Application/GeneralInformation/ProtectionDevice/ProtectionDeviceAppService.cs b/src/YunDa.Application/YunDa.ISAS.Application/GeneralInformation/ProtectionDevice/ProtectionDeviceAppService.cs
index dd5f539..13aef20 100644
--- a/src/YunDa.Application/YunDa.ISAS.Application/GeneralInformation/ProtectionDevice/ProtectionDeviceAppService.cs
+++ b/src/YunDa.Application/YunDa.ISAS.Application/GeneralInformation/ProtectionDevice/ProtectionDeviceAppService.cs
@@ -892,9 +892,10 @@ namespace YunDa.ISAS.Application.GeneralInformation
         [AbpAllowAnonymous]
         [HttpGet]
         [DisableAuditing]
-        public RequestResult<AbnormalComponent> GetDeviceEventType(int deviceAddr,int eventCode)
+
+        public RequestResult<EquipmentInfoAbnormalComponent> GetDeviceEventType(int deviceAddr,int eventCode)
         {
-            RequestResult <AbnormalComponent> rst= new RequestResult<AbnormalComponent>();
+            RequestResult <EquipmentInfoAbnormalComponent> rst= new RequestResult<EquipmentInfoAbnormalComponent>();
             try
             {
                 var device = _imProtectDeviceRepository.GetAll().FirstOrDefault(t => t.DeviceAddr == deviceAddr);
@@ -903,11 +904,11 @@ namespace YunDa.ISAS.Application.GeneralInformation
                     var imEvent =  _imEventTypeRepository.GetAll().FirstOrDefault(t=>t.Id == eventCode&&t.PuctgyCode == device.PuctgyCode);
                     if (imEvent!=null)
                     {
-                        AbnormalComponent abnormalComponent = new AbnormalComponent()
+                        EquipmentInfoAbnormalComponent abnormalComponent = new EquipmentInfoAbnormalComponent()
                         {
                             ComponentName = device.DeviceName,
                             AbnormalReason = imEvent.EvtName,
-                            HandlingMeasures =""
+                            HandlingMeasures ="",
                         };
                         rst.ResultData = abnormalComponent;
                         rst.Flag = true;