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

更改生成的耀星数据来源分开调试

Browse Source
This commit is contained in:
郭睿 2024-11-29 10:49:41 +08:00 committed by 郭睿AMD7950X
parent db40fa57a6
commit 025d011e8d
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/YunDa.Application/YunDa.ISAS.Application/GeneralInformation/EquipmentInfo/EquipmentInfoExAppService.cs
View File

@ -500,7 +500,6 @@ namespace YunDa.ISAS.Application.GeneralInformation
.Where(t => t.DataSourceCategory == dataSourceCategory) .Where(t => t.DataSourceCategory == dataSourceCategory)
.Where(t => t.IsActive) .Where(t => t.IsActive)
.ToList(); .ToList();
var duplicateIds = telemeterings var duplicateIds = telemeterings
.GroupBy(t => $"{t.DeviceAddress}_{t.CPUSector}_{t.DispatcherAddress}_{(int)t.DataSourceCategory}") .GroupBy(t => $"{t.DeviceAddress}_{t.CPUSector}_{t.DispatcherAddress}_{(int)t.DataSourceCategory}")
.Where(g => g.Count() > 1) // 找出重复的标识符 .Where(g => g.Count() > 1) // 找出重复的标识符

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

@ -85,7 +85,11 @@ namespace YunDa.ISAS.Application.GeneralInformation.SecondaryCircuitInfo
.Where(t => t.SecondaryCircuitId == input.SecondaryCircuitId).FirstOrDefault(); .Where(t => t.SecondaryCircuitId == input.SecondaryCircuitId).FirstOrDefault();
if (secondaryCircuitProtectionDevice != null) if (secondaryCircuitProtectionDevice != null)
{ {
var dispatchaddr = _telemeteringConfigurationRepository.GetAll().Where(t => t.DataSourceCategory == DataSourceCategoryEnum.None).Select(t => t.DispatcherAddress).Max() + 1; int dispatchaddr = 1;
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 telemetering = InsertTelemetering(secondaryCircuitProtectionDevice, entity.Name, dispatchaddr); var telemetering = InsertTelemetering(secondaryCircuitProtectionDevice, entity.Name, dispatchaddr);
var telemeteringId = await _telemeteringConfigurationRepository.InsertAndGetIdAsync(telemetering); var telemeteringId = await _telemeteringConfigurationRepository.InsertAndGetIdAsync(telemetering);
if (telemeteringId!=default) if (telemeteringId!=default)
@ -168,6 +172,7 @@ namespace YunDa.ISAS.Application.GeneralInformation.SecondaryCircuitInfo
YesContent = "故障", YesContent = "故障",
NoContent = "消失", NoContent = "消失",
UnsurenessContent = "不定", UnsurenessContent = "不定",
DataSourceCategory = DataSourceCategoryEnum.None,
IsCommStatus = false, IsCommStatus = false,
TransformerSubstationId = secondaryCircuitProtectionDevice.ProtectionDevice.TransformerSubstationId, TransformerSubstationId = secondaryCircuitProtectionDevice.ProtectionDevice.TransformerSubstationId,
}; };

1
src/YunDa.Application/YunDa.ISAS.DataTransferObject/YunDa.SOMS.DataTransferObject.csproj
View File

@ -24,7 +24,6 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="Abp" Version="9.4.2" /> <PackageReference Include="Abp" Version="9.4.2" />
<PackageReference Include="Abp.AutoMapper" Version="9.4.2" /> <PackageReference Include="Abp.AutoMapper" Version="9.4.2" />
<PackageReference Include="MathNet.Numerics" Version="5.0.0" />
<PackageReference Include="MessagePack" Version="2.5.192" /> <PackageReference Include="MessagePack" Version="2.5.192" />
</ItemGroup> </ItemGroup>

6
src/YunDa.Web/YunDa.SOMS.Web.MVC/appsettings.development.json
View File

@ -1,6 +1,6 @@
{ {
"ConnectionStrings": { "ConnectionStrings": {
"MysqlSetting": "server=127.0.0.1;port=3306;uid=root;pwd=123456; Database=soms_sys_db;SslMode=none;Pooling=False;", "MysqlSetting": "server=192.168.110.229;port=3306;uid=root;pwd=123456; Database=soms_sys_db;SslMode=none;Pooling=False;",
"ISMS_BASESqlServerSetting": "Server=192.168.110.161;User ID=sa;Password=sa;Database=ISMS_BASE;Trusted_Connection=False;TrustServerCertificate=True", "ISMS_BASESqlServerSetting": "Server=192.168.110.161;User ID=sa;Password=sa;Database=ISMS_BASE;Trusted_Connection=False;TrustServerCertificate=True",
"ISMS_YcSqlServerSetting": "Server=192.168.110.161;User ID=sa;Password=sa;Database=ISMS_Yc;Trusted_Connection=False;TrustServerCertificate=True", "ISMS_YcSqlServerSetting": "Server=192.168.110.161;User ID=sa;Password=sa;Database=ISMS_Yc;Trusted_Connection=False;TrustServerCertificate=True",
"ISMS_DataSqlServerSetting": "Server=192.168.110.161;User ID=sa;Password=sa;Database=ISMS_Data;Trusted_Connection=False;TrustServerCertificate=True", "ISMS_DataSqlServerSetting": "Server=192.168.110.161;User ID=sa;Password=sa;Database=ISMS_Data;Trusted_Connection=False;TrustServerCertificate=True",
@ -8,7 +8,7 @@
"ISMS_ReportServerTempDBSqlServerSetting": "Server=192.168.110.161;User ID=sa;Password=sa;Database=ReportServerTempDB;Trusted_Connection=False;TrustServerCertificate=True", "ISMS_ReportServerTempDBSqlServerSetting": "Server=192.168.110.161;User ID=sa;Password=sa;Database=ReportServerTempDB;Trusted_Connection=False;TrustServerCertificate=True",
"MongoDBSetting": { "MongoDBSetting": {
"Host": "127.0.0.1", "Host": "192.168.110.229",
"Port": "37017", "Port": "37017",
"DatabaseName": "isas_mongodb", "DatabaseName": "isas_mongodb",
"IsAuth": "false", "IsAuth": "false",
@ -16,7 +16,7 @@
"PassWord": "123456" "PassWord": "123456"
}, },
"RedisSetting": { "RedisSetting": {
"Host": "127.0.0.1", "Host": "192.168.110.229",
"Port": "36379", "Port": "36379",
"Auth": "yunda123", "Auth": "yunda123",
"Name": "", "Name": "",