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-09 15:31:31 +08:00
commit fe55f045a3
7 changed files with 40 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,19 +4,13 @@ using Abp.Collections.Extensions;
using Abp.Domain.Repositories;
using Abp.Domain.Uow;
using Microsoft.AspNetCore.Mvc;
using Microsoft.EntityFrameworkCore.Diagnostics;
using MongoDB.Driver.Linq;
using Newtonsoft.Json;
using NPOI.SS.Formula.Functions;
using Swashbuckle.AspNetCore.SwaggerGen;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Linq.Dynamic.Core;
using System.Linq.Expressions;
using System.Security.Cryptography;
using System.Threading.Tasks;
using System.Xml.Serialization;
using ToolLibrary.LogHelper;
using YunDa.ISAS.Application.Core;
using YunDa.ISAS.Application.Core.Session;
@ -24,7 +18,6 @@ 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;
@ -35,7 +28,6 @@ using YunDa.SOMS.DataTransferObject.GeneralInformation.ProtectionDeviceInfoDto.S
using YunDa.SOMS.DataTransferObject.GeneralInformation.ProtectionSettingDto;
using YunDa.SOMS.DataTransferObject.MainStationMaintenanceInfo.OperationReport;
using YunDa.SOMS.Entities.GeneralInformation;
using static Google.Protobuf.Reflection.ExtensionRangeOptions.Types;
namespace YunDa.ISAS.Application.GeneralInformation
{

6
src/YunDa.Application/YunDa.ISAS.Application/GeneralInformation/ProtectionSettingInfo/ProtectionSettingAppService.cs
View File

@ -41,6 +41,7 @@ namespace YunDa.ISAS.Application.GeneralInformation.ProtectionSettingInfo
private readonly IRepository<ProtectionSettingType, Guid> _protectionSettingTypeRepository;
private readonly IRepository<ImDztype, int> _imDztypeRepository;
private readonly IRedisRepository<ImDeviceDzOutput, string> _imDeviceDzRedis;
private readonly IRepository<ImDeviceDzenumPu, int> _imDeviceDzenumPuitory;
private readonly IUnitOfWorkManager _unitOfWorkManager;
public ProtectionSettingAppService(ISessionAppService sessionAppService,
@ -50,6 +51,8 @@ namespace YunDa.ISAS.Application.GeneralInformation.ProtectionSettingInfo
IRepository<ProtectionSetting, Guid> protectionSettingRepository,
IRepository<ProtectionSettingType, Guid> protectionSettingTypeRepository,
IRedisRepository<ImDeviceDzOutput, string> imDeviceDzRedis,
IRepository<ImDeviceDzenumPu, int> imDeviceDzenumPuitory,
IUnitOfWorkManager unitOfWorkManager
) : base(sessionAppService)
{
@ -60,6 +63,7 @@ namespace YunDa.ISAS.Application.GeneralInformation.ProtectionSettingInfo
_protectionSettingTypeRepository = protectionSettingTypeRepository;
_imDztypeRepository = imDztypeRepository;
_imDeviceDzRedis = imDeviceDzRedis;
_imDeviceDzenumPuitory = imDeviceDzenumPuitory;
}
public Task<RequestResult<ProtectionSettingOutput>> CreateOrUpdateAsync(EditProtectionSettingInput input)
@ -414,7 +418,7 @@ namespace YunDa.ISAS.Application.GeneralInformation.ProtectionSettingInfo
RelateCtId = t.RelateCtId,
ReadOnly = t.ReadOnly,
Hidden = t.Hidden,
DzTypeNavigation = new ImDztypeOutput { /* 映射 ImDztype 到 ImDztypeOutput 的属性 */ },
DzTypeNavigation = new ImDztypeOutput { Dztype = t.DzTypeNavigation.Dztype },
Value = (new Random().Next(0, 10)).ToString() // 随机值
}).ToList();
}

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

@ -3664,6 +3664,14 @@
<param name="dzType"></param>
<returns></returns>
</member>
<member name="M:YunDa.ISAS.Application.GeneralInformation.SecondaryCircuitInfo.IProtectionSettingAppService.GetDzByDeviceAddr(System.Int32,System.Int32)">
<summary>
根据装置获取定值
</summary>
<param name="deviceAddr"></param>
<param name="cpuIndex"></param>
<returns></returns>
</member>
<member name="M:YunDa.ISAS.Application.GeneralInformation.SecondaryCircuitInfo.ISecondaryCircuitAppService.GetCircuitTypes">
<summary>
获取回路类型

8
src/YunDa.Domain/YunDa.ISMS.BASE.Entities/ISMS_BASEContext.cs
View File

@ -2107,15 +2107,15 @@ namespace YunDa.ISMS.BASE.Entities
modelBuilder.Entity<ImDeviceDzenumPu>(entity =>
{
entity.HasKey(e => new { e.PuctgyCode, e.EnumTypeId, e.EnumIndex })
entity.HasKey(e => new { e.Id, e.EnumTypeId, e.EnumIndex })
.HasName("PK_DeviceDZEnumPU");
entity.ToTable("im_DeviceDZEnumPU");
entity.HasIndex(e => new { e.PuctgyCode, e.EnumTypeId, e.EnumComment }, "UK_DeviceDZEnumPU")
entity.HasIndex(e => new { e.Id, e.EnumTypeId, e.EnumComment }, "UK_DeviceDZEnumPU")
.IsUnique();
entity.Property(e => e.PuctgyCode).HasColumnName("PUCtgyCode");
entity.Property(e => e.Id).HasColumnName("PUCtgyCode");
entity.Property(e => e.EnumTypeId).HasColumnName("Enum_TypeId");
@ -2128,7 +2128,7 @@ namespace YunDa.ISMS.BASE.Entities
entity.HasOne(d => d.PuctgyCodeNavigation)
.WithMany(p => p.ImDeviceDzenumPus)
.HasForeignKey(d => d.PuctgyCode)
.HasForeignKey(d => d.Id)
.OnDelete(DeleteBehavior.ClientSetNull)
.HasConstraintName("FK_DeviceDZEnumPU_PUCtgy");
});

14
src/YunDa.Domain/YunDa.ISMS.BASE.Entities/Models/ImDeviceDzenumPu.cs
View File

@ -1,15 +1,21 @@
using System;
using Abp.Domain.Entities;
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using System.Text.Json.Serialization;
namespace YunDa.ISMS.BASE.Entities.Models
{
public partial class ImDeviceDzenumPu
public partial class ImDeviceDzenumPu:Entity<int>
{
public int PuctgyCode { get; set; }
[Key]
[Column("PuctgyCode")]
public override int Id { get; set; }
public int EnumTypeId { get; set; }
public int EnumIndex { get; set; }
public string? EnumComment { get; set; }
public virtual ImPuCtgy PuctgyCodeNavigation { get; set; } = null!;
[JsonIgnore] public virtual ImPuCtgy PuctgyCodeNavigation { get; set; } = null!;
}
}

5
src/YunDa.Domain/YunDa.ISMS.BASE.Entities/Models/ImDztype.cs
View File

@ -3,6 +3,7 @@ using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using System.Text.Json.Serialization;
namespace YunDa.ISMS.BASE.Entities.Models
{
@ -18,7 +19,7 @@ namespace YunDa.ISMS.BASE.Entities.Models
public override int Id { get; set; }
public string Dztype { get; set; } = null!;
public virtual ICollection<ImDeviceDzTmp> ImDeviceDzTmps { get; set; }
public virtual ICollection<ImDeviceDz> ImDeviceDzs { get; set; }
[JsonIgnore] public virtual ICollection<ImDeviceDzTmp> ImDeviceDzTmps { get; set; }
[JsonIgnore] public virtual ICollection<ImDeviceDz> ImDeviceDzs { get; set; }
}
}

19
src/YunDa.Domain/YunDa.ISMS.BASE.Entities/Models/ImPuCtgy.cs
View File

@ -3,6 +3,7 @@ using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using System.Text.Json.Serialization;
namespace YunDa.ISMS.BASE.Entities.Models
{
@ -49,14 +50,14 @@ namespace YunDa.ISMS.BASE.Entities.Models
public virtual ImDevCtgy DevCtgyNavigation { get; set; } = null!;
public virtual ImManufacturer ManufacturerNavigation { get; set; } = null!;
public virtual ImProtectDeviceTmp? ImProtectDeviceTmp { get; set; }
public virtual ICollection<ImAnalogData20102> ImAnalogData20102s { get; set; }
public virtual ICollection<ImAsdu140FltActType> ImAsdu140FltActTypes { get; set; }
public virtual ICollection<ImBreakerNoEnum> ImBreakerNoEnums { get; set; }
public virtual ICollection<ImDeviceDzenumPu> ImDeviceDzenumPus { get; set; }
public virtual ICollection<ImEventType> ImEventTypes { get; set; }
public virtual ICollection<ImFaultActType20102> ImFaultActType20102s { get; set; }
public virtual ICollection<ImProtectDevice> ImProtectDevices { get; set; }
public virtual ICollection<ImPuWaveChl> ImPuWaveChls { get; set; }
public virtual ICollection<ImPuctgyFltRptItem> ImPuctgyFltRptItems { get; set; }
[JsonIgnore] public virtual ICollection<ImAnalogData20102> ImAnalogData20102s { get; set; }
[JsonIgnore] public virtual ICollection<ImAsdu140FltActType> ImAsdu140FltActTypes { get; set; }
[JsonIgnore] public virtual ICollection<ImBreakerNoEnum> ImBreakerNoEnums { get; set; }
[JsonIgnore] public virtual ICollection<ImDeviceDzenumPu> ImDeviceDzenumPus { get; set; }
[JsonIgnore] public virtual ICollection<ImEventType> ImEventTypes { get; set; }
[JsonIgnore] public virtual ICollection<ImFaultActType20102> ImFaultActType20102s { get; set; }
[JsonIgnore] public virtual ICollection<ImProtectDevice> ImProtectDevices { get; set; }
[JsonIgnore] public virtual ICollection<ImPuWaveChl> ImPuWaveChls { get; set; }
[JsonIgnore] public virtual ICollection<ImPuctgyFltRptItem> ImPuctgyFltRptItems { get; set; }
}
}