xiaowei/DMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

重构了代码

Browse Source
This commit is contained in:
David P.G
2025-07-02 22:07:16 +08:00
parent 31f6cf64f4
commit b6519ae0b1
16 changed files with 326 additions and 294 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Data/Entities/DbDataVariable.cs → Data/Entities/DbVariableData.cs
View File

@@ -4,8 +4,8 @@ using SqlSugar.DbConvert;
namespace PMSWPF.Data.Entities;
[SugarTable("DataVariable")]
public class DbDataVariable
[SugarTable("VariableData")]
public class DbVariableData
{
[SugarColumn(IsPrimaryKey = true, IsIdentity = true)] //数据库是自增才配自增
public int Id { get; set; }
@@ -28,13 +28,13 @@ public class DbDataVariable
[SugarColumn(IsNullable = true)] public List<DbMqtt>? Mqtts { get; set; }
public string DataValue { get; set; }
public string DisplayValue { get; set; }
public string DataValue { get; set; } = String.Empty;
public string DisplayValue { get; set; } = String.Empty;
public DateTime UpdateTime { get; set; }
[SugarColumn(IsNullable = true)] public DbUser? UpdateUser { get; set; }
public string Converstion { get; set; }
public string Converstion { get; set; } = String.Empty;
public bool IsDeleted { get; set; }
public bool IsActive { get; set; }
public bool IsSave { get; set; }
@@ -43,6 +43,6 @@ public class DbDataVariable
public double AlarmMin { get; set; }
public double AlarmMax { get; set; }
[SugarColumn(ColumnDataType = "varchar(20)", SqlParameterDbType = typeof(EnumToStringConvert))]
[SugarColumn(ColumnDataType = "varchar(20)", IsNullable = true, SqlParameterDbType = typeof(EnumToStringConvert))]
public SignalType SignalType { get; set; }
}

2
Data/Entities/DbS7DataVariable.cs → Data/Entities/DbVariableS7Data.cs
View File

@@ -3,6 +3,6 @@
namespace PMSWPF.Data.Entities;
[SugarTable("S7DataVariable")]
public class DbS7DataVariable : DbDataVariable
public class DbVariableS7Data : DbVariableData
{
}

4
Data/Entities/DbVariableTable.cs
View File

@@ -18,8 +18,8 @@ public class DbVariableTable
[SugarColumn(ColumnDataType = "varchar(20)", SqlParameterDbType = typeof(EnumToStringConvert))]
public ProtocolType ProtocolType { get; set; }
[Navigate(NavigateType.OneToMany, nameof(DbDataVariable.VariableTableId))]
public List<DbDataVariable>? DataVariables { get; set; }
[Navigate(NavigateType.OneToMany, nameof(DbVariableData.VariableTableId))]
public List<DbVariableData>? DataVariables { get; set; }
[SugarColumn(IsNullable = true)] public int? DeviceId { get; set; }