guorui/SOMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改错误

Browse Source
This commit is contained in:
郭睿AMD7950X 2024-12-03 16:25:45 +08:00
parent 5cf5a93d0a
commit 50626c4165
2 changed files with 55 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/YunDa.Application/YunDa.ISAS.Application/GeneralInformation/ProtectionDevice/ProtectionDeviceAppService.cs
View File

@ -23,7 +23,9 @@ using YunDa.ISAS.Application.Core.Session;
using YunDa.ISAS.Application.Core.SwaggerHelper;
using YunDa.ISAS.DataTransferObject;
using YunDa.ISAS.DataTransferObject.CommonDto;
using YunDa.ISAS.DataTransferObject.DataMonitoring.TelemeteringConfigurationDto;
using YunDa.ISAS.DataTransferObject.GeneralInformation.EquipmentInfoDto.SearchCondition;
using YunDa.ISAS.Entities.DataMonitoring;
using YunDa.ISAS.Entities.GeneralInformation;
using YunDa.ISAS.Redis.Repositories;
using YunDa.ISMS.BASE.Entities.Models;
@ -56,6 +58,8 @@ namespace YunDa.ISAS.Application.GeneralInformation
private readonly IRepository<ImGateWay, string> _imGateWayRepository;
private readonly IRepository<ImPuCtgy, string> _imPuCtgyRepository;
private readonly IRepository<ImEventType, int> _imEventTypeRepository;
private readonly IRepository<TelemeteringConfiguration, Guid> _telemeteringConfigurationRepository;
private readonly IRepository<TelesignalisationConfiguration, Guid> _telesignalisationConfigurationRepository;
private readonly IRepository<ProtectionDeviceGateway, Guid> _protectionDeviceGatewayRepository;
private readonly IRepository<ProtectionDeviceType, Guid> _protectionDeviceTypeyRepository;
@ -70,6 +74,8 @@ namespace YunDa.ISAS.Application.GeneralInformation
IRepository<EquipmentInfo, Guid> equipmentInfoRepository,
IRepository<SecondaryCircuitProtectionDevice, Guid> secondaryCircuitProtectionDeviceRepository
,
IRepository<TelemeteringConfiguration, Guid> telemeteringConfigurationRepository,
IRepository<TelesignalisationConfiguration, Guid> telesignalisationConfigurationRepository,
IRepository<ProtectionDeviceType, Guid> protectionDeviceTypeyRepository,
IRepository<ImPuCtgy, string> imPuCtgyRepository,
IRepository<ProtectionDeviceGateway, Guid> protectionDeviceGatewayRepository,
@ -103,6 +109,8 @@ namespace YunDa.ISAS.Application.GeneralInformation
_transformerSubstationRepository = transformerSubstationRepository;
_imDeviceDzRepository = imDeviceDzRepository;
_imEventTypeRepository = imEventTypeRepository;
_telemeteringConfigurationRepository = telemeteringConfigurationRepository;
_telesignalisationConfigurationRepository = telesignalisationConfigurationRepository;
}
public async Task<RequestResult<ProtectionDeviceInfoViewOutput>> CreateOrUpdateAsync(EditProtectionDeviceInfoInput input)
{
@ -961,8 +969,8 @@ namespace YunDa.ISAS.Application.GeneralInformation
UsedMemory ="0KB",
LcdOperationPassword ="",
ProtectionDeviceId = protectionDeviceInfo.Id,
TotalDisk = "0MB",
UsedDisk ="0MB",
TotalDisk = "0M",
UsedDisk ="0M",
NetworkInterfaces = new List<NetworkInterfaceStatus>
{
new NetworkInterfaceStatus
@ -975,6 +983,11 @@ namespace YunDa.ISAS.Application.GeneralInformation
IpAddress =device.GateWay.GatewayIp2,
InterfaceName ="eth1",
},
new NetworkInterfaceStatus
{
IpAddress ="",
InterfaceName ="eth2",
},
}
};
rst.ResultData = deviceStatus;
@ -992,6 +1005,38 @@ namespace YunDa.ISAS.Application.GeneralInformation
}
return rst;
}
/// <summary>
/// 根据关键字获取保护装置的遥信遥测
/// </summary>
/// <param name="equipmentInfoId"></param>
/// <param name="keyword"></param>
/// <returns></returns>
[ShowApi]
[AbpAllowAnonymous]
[HttpGet]
[DisableAuditing]
public async Task<RequestResult<List<TelemeteringConfigurationProperty>>> GetTelemeteringByKeywordAsync(Guid equipmentInfoId,string keyword)
{
RequestResult<List<TelemeteringConfigurationProperty>> rst = new();
try
{
if (equipmentInfoId!=default&&!string.IsNullOrWhiteSpace(keyword))
{
var repo =(await _telemeteringConfigurationRepository.GetAllIncludingAsync())
.Where(t => t.EquipmentInfoId == equipmentInfoId).ToList();
var data = repo.Where(t => t.Name.ToLower().Contains(keyword.ToLower()));
rst.ResultData = ObjectMapper.Map<List<TelemeteringConfigurationProperty>>(data);
rst.Flag = true;
}
//.Where(t=>t.Name.Contains())
}
catch (Exception ex)
{
Log4Helper.Error(this.GetType(), "线路管理服务", ex);
}
return rst;
}
#if DEBUG
/// <summary>
/// 填充出厂编号

8
src/YunDa.Application/YunDa.ISAS.Application/YunDa.ISAS.Application.xml
View File

@ -3585,6 +3585,14 @@
<param name="equipmentInfoId"></param>
<returns></returns>
</member>
<member name="M:YunDa.ISAS.Application.GeneralInformation.ProtectionDeviceAppService.GetTelemeteringByKeywordAsync(System.Guid,System.String)">
<summary>
根据关键字获取保护装置的遥信遥测
</summary>
<param name="equipmentInfoId"></param>
<param name="keyword"></param>
<returns></returns>
</member>
<member name="M:YunDa.ISAS.Application.GeneralInformation.ProtectionDeviceAppService.UpdateProtetionInfoForTest">
<summary>
填充出厂编号