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

Merge branch 'master' of http://192.168.110.57:3000/guor/SOMS

Browse Source
This commit is contained in:
郭睿 2024-12-02 14:53:24 +08:00
commit f93e0c97af
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/YunDa.Application/YunDa.ISAS.Application/GeneralInformation/SecondaryCircuitInfo/SecondaryCircuitLogicExpressionAppService.cs
View File

@ -96,7 +96,12 @@ namespace YunDa.ISAS.Application.GeneralInformation.SecondaryCircuitInfo
{
entity.TelemeteringConfigurationId = telemeteringId;
}
var telesignal = InsertTelesignal(secondaryCircuitProtectionDevice, entity.Name);
if (_telemeteringConfigurationRepository.GetAll().Where(t => t.DataSourceCategory == DataSourceCategoryEnum.None).Count()>0)
{
dispatchaddr = (int)_telemeteringConfigurationRepository.GetAll().Where(t => t.DataSourceCategory == DataSourceCategoryEnum.None)?.Select(t => t.DispatcherAddress)?.Max() + 1;
}
var telesignal = InsertTelesignal(secondaryCircuitProtectionDevice, entity.Name, dispatchaddr);
var telesignalId = await _telesignalisationConfigurationRepository.InsertAndGetIdAsync(telesignal);
if (telesignalId!= default)
{
@ -122,9 +127,9 @@ namespace YunDa.ISAS.Application.GeneralInformation.SecondaryCircuitInfo
{
// 新增的记录
var entity = new TelemeteringConfiguration();
entity.DispatcherAddress = 0;
entity.DispatcherAddress = dispatchaddr;
entity.CPUSector = 0;
entity.DeviceAddress = 0;
entity.DeviceAddress = 1;
entity.InfoAddress = 0;
entity.InfoCPUSector = 0;
entity.InfoDeviceAddress = dispatchaddr;
@ -149,15 +154,15 @@ namespace YunDa.ISAS.Application.GeneralInformation.SecondaryCircuitInfo
}
return null;
}
private TelesignalisationConfiguration InsertTelesignal(SecondaryCircuitProtectionDevice secondaryCircuitProtectionDevice, string secondaryCircuitName)
private TelesignalisationConfiguration InsertTelesignal(SecondaryCircuitProtectionDevice secondaryCircuitProtectionDevice, string secondaryCircuitName, int dispatchaddr)
{
// 新增的记录
var entity = new TelesignalisationConfiguration
{
Name = $"{secondaryCircuitName}_判定虚遥信",
DispatcherAddress = 0,
DispatcherAddress = dispatchaddr,
CPUSector = 0,
DeviceAddress = 0,
DeviceAddress = 1,
InfoAddress = 0,
InfoCPUSector = 0,
InfoDeviceAddress = 0,
@ -175,6 +180,8 @@ namespace YunDa.ISAS.Application.GeneralInformation.SecondaryCircuitInfo
DataSourceCategory = DataSourceCategoryEnum.None,
IsCommStatus = false,
TransformerSubstationId = secondaryCircuitProtectionDevice.ProtectionDevice.TransformerSubstationId,
EquipmentInfoId = secondaryCircuitProtectionDevice.ProtectionDevice.EquipmentInfoId,
EquipmentTypeId = secondaryCircuitProtectionDevice.ProtectionDevice.EquipmentInfo.EquipmentTypeId,
};
return entity;
}