From 96538f600f7fd422566963adc62c622d7fba32f6 Mon Sep 17 00:00:00 2001 From: Emmanuele Sassi Date: Fri, 23 Apr 2021 14:46:23 +0200 Subject: [PATCH 1/5] Modifiche MachLog --- EgtBEAMWALL.Core/Constants/ConstMachComm.vb | 66 +++++++++++----- EgtBEAMWALL.Core/MachLog.vb | 86 +++++++++++++++++---- 2 files changed, 118 insertions(+), 34 deletions(-) diff --git a/EgtBEAMWALL.Core/Constants/ConstMachComm.vb b/EgtBEAMWALL.Core/Constants/ConstMachComm.vb index d4f01568..00efd083 100644 --- a/EgtBEAMWALL.Core/Constants/ConstMachComm.vb +++ b/EgtBEAMWALL.Core/Constants/ConstMachComm.vb @@ -1,32 +1,56 @@ Public Module ConstMachComm - Public Enum ResultTypes - EXECUTED - RESULT + Public Enum ResultTypes As Integer + NULL = 0 + EXECUTED = 1 + RESULT = 2 End Enum Public Enum CommandTypes As Integer - ERROR_ = 0 - CONNECT = 1 - DISCONNECT = 2 - START = 3 - SOFTSTART = 4 - STOP_ = 5 - RESET = 6 - STEP_ = 7 - SETPOINT = 8 - SENDPROG = 9 - REMOVEPROG = 10 - REMOVEALLPROG = 11 - READ = 12 - WRITE = 13 - DELETEALARMS = 14 - SETOP = 15 + ERROR_ = 1 + CONNECT = 2 + DISCONNECT = 3 + START = 4 + SOFTSTART = 5 + STOP_ = 6 + RESET = 7 + STEP_ = 8 + SETPOINT = 9 + SENDPROG = 10 + REMOVEPROG = 11 + REMOVEALLPROG = 12 + READ = 13 + WRITE = 14 + DELETEALARMS = 15 + SETOP = 16 + End Enum + + Public Enum LogCommandTypes As Integer + NULL = 0 + ERROR_ = 1 + CONNECT = 2 + DISCONNECT = 3 + START = 4 + SOFTSTART = 5 + STOP_ = 6 + RESET = 7 + STEP_ = 8 + SETPOINT = 9 + SENDPROG = 10 + REMOVEPROG = 11 + REMOVEALLPROG = 12 + READ = 13 + WRITE = 14 + DELETEALARMS = 15 + SETOP = 16 + ALARM = 17 + NEWOP = 18 End Enum Public Enum CommandStates As Integer - ERROR_ = 0 - OK = 1 + NULL = 0 + ERROR_ = 1 + OK = 2 End Enum End Module diff --git a/EgtBEAMWALL.Core/MachLog.vb b/EgtBEAMWALL.Core/MachLog.vb index a34c638c..b318e022 100644 --- a/EgtBEAMWALL.Core/MachLog.vb +++ b/EgtBEAMWALL.Core/MachLog.vb @@ -1,28 +1,88 @@ Public Class MachLog - Private m_CommandType As CommandTypes + Private m_CommandType As LogCommandTypes + Public ReadOnly Property CommandType As CommandTypes + Get + Return m_CommandType + End Get + End Property Private m_CommandState As CommandStates + Public ReadOnly Property CommandState As CommandStates + Get + Return m_CommandState + End Get + End Property Private m_ResultType As ResultTypes + Public ReadOnly Property ResultType As ResultTypes + Get + Return m_ResultType + End Get + End Property Private m_Description As String + Public ReadOnly Property Description As String + Get + Return m_Description + End Get + End Property Private m_AlarmOperation As Integer + Public ReadOnly Property AlarmOperation As Integer + Get + Return m_AlarmOperation + End Get + End Property Private m_AlarmType As Integer + Public ReadOnly Property AlarmType As Integer + Get + Return m_AlarmType + End Get + End Property Private m_AlarmMessage As String + Public ReadOnly Property AlarmMessage As String + Get + Return m_AlarmMessage + End Get + End Property Private m_AlarmCode As String + Public ReadOnly Property AlarmCode As String + Get + Return m_AlarmCode + End Get + End Property Private m_AlarmDateTime As String + Public ReadOnly Property AlarmDateTime As String + Get + Return m_AlarmDateTime + End Get + End Property Private m_newOpState As Integer + Public ReadOnly Property newOpState As Integer + Get + Return m_newOpState + End Get + End Property Private m_CommandExecutedCorrectly As Boolean + Public ReadOnly Property CommandExecutedCorrectly As Boolean + Get + Return m_CommandExecutedCorrectly + End Get + End Property Private m_VarAddress As String + Public ReadOnly Property VarAddress As String + Get + Return m_VarAddress + End Get + End Property Private m_VarValue As String - - Public Delegate Sub ResultCallbackDlg(CommandType As CommandTypes, CommandState As CommandStates, ResultType As ResultTypes, Description As String) - Public Delegate Sub AlarmCallbackDlg(AlarmOperation As Integer, AlarmType As Integer, AlarmMessage As String, AlarmCode As String, AlarmDateTime As String) - Public Delegate Sub OpStateCallbackDlg(newOpState As Integer) - Public Delegate Sub ReadVarCallbackDlg(CommandExecutedCorrectly As Boolean, VarAddress As String, VarValue As String) + Public ReadOnly Property VarValue As String + Get + Return m_VarValue + End Get + End Property Protected Sub New() End Sub - Friend Shared Function CreateResultLog(CommandType As CommandTypes, CommandState As CommandStates, ResultType As ResultTypes, Description As String) + Friend Shared Function CreateResultLog(CommandType As LogCommandTypes, CommandState As CommandStates, ResultType As ResultTypes, Description As String) Dim NewMachLog As New MachLog NewMachLog.m_CommandType = CommandType NewMachLog.m_CommandState = CommandState @@ -31,9 +91,9 @@ Return NewMachLog End Function - Friend Shared Function CreateAlarmLog(CommandType As CommandTypes, AlarmOperation As Integer, AlarmType As Integer, AlarmMessage As String, AlarmCode As String, AlarmDateTime As String) + Friend Shared Function CreateAlarmLog(AlarmOperation As Integer, AlarmType As Integer, AlarmMessage As String, AlarmCode As String, AlarmDateTime As String) Dim NewMachLog As New MachLog - NewMachLog.m_CommandType = CommandType + NewMachLog.m_CommandType = LogCommandTypes.ALARM NewMachLog.m_AlarmOperation = AlarmOperation NewMachLog.m_AlarmType = AlarmType NewMachLog.m_AlarmMessage = AlarmMessage @@ -42,16 +102,16 @@ Return NewMachLog End Function - Friend Shared Function CreateOPStateLog(CommandType As CommandTypes, newOpState As Integer) + Friend Shared Function CreateOPStateLog(newOpState As Integer) Dim NewMachLog As New MachLog - NewMachLog.m_CommandType = CommandType + NewMachLog.m_CommandType = LogCommandTypes.NEWOP NewMachLog.m_newOpState = newOpState Return NewMachLog End Function - Friend Shared Function CreateAlarmLog(CommandType As CommandTypes, CommandExecutedCorrectly As Boolean, VarAddress As String, VarValue As String) + Friend Shared Function CreateReadLog(CommandExecutedCorrectly As Boolean, VarAddress As String, VarValue As String) Dim NewMachLog As New MachLog - NewMachLog.m_CommandType = CommandType + NewMachLog.m_CommandType = CommandTypes.READ NewMachLog.m_AlarmOperation = CommandExecutedCorrectly NewMachLog.m_AlarmType = VarAddress NewMachLog.m_AlarmMessage = VarValue From afe64db07558fe4c8274ae387435002c25766a1f Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Fri, 23 Apr 2021 18:24:28 +0200 Subject: [PATCH 2/5] Update classe VB CoreMacLog --- EgtBEAMWALL.Core/MachLog.vb | 283 ++++++++++++++++++++++-------------- 1 file changed, 170 insertions(+), 113 deletions(-) diff --git a/EgtBEAMWALL.Core/MachLog.vb b/EgtBEAMWALL.Core/MachLog.vb index b318e022..1a4a10b1 100644 --- a/EgtBEAMWALL.Core/MachLog.vb +++ b/EgtBEAMWALL.Core/MachLog.vb @@ -1,121 +1,178 @@ Public Class MachLog - Private m_CommandType As LogCommandTypes - Public ReadOnly Property CommandType As CommandTypes - Get - Return m_CommandType - End Get - End Property - Private m_CommandState As CommandStates - Public ReadOnly Property CommandState As CommandStates - Get - Return m_CommandState - End Get - End Property - Private m_ResultType As ResultTypes - Public ReadOnly Property ResultType As ResultTypes - Get - Return m_ResultType - End Get - End Property - Private m_Description As String - Public ReadOnly Property Description As String - Get - Return m_Description - End Get - End Property - Private m_AlarmOperation As Integer - Public ReadOnly Property AlarmOperation As Integer - Get - Return m_AlarmOperation - End Get - End Property - Private m_AlarmType As Integer - Public ReadOnly Property AlarmType As Integer - Get - Return m_AlarmType - End Get - End Property - Private m_AlarmMessage As String - Public ReadOnly Property AlarmMessage As String - Get - Return m_AlarmMessage - End Get - End Property - Private m_AlarmCode As String - Public ReadOnly Property AlarmCode As String - Get - Return m_AlarmCode - End Get - End Property - Private m_AlarmDateTime As String - Public ReadOnly Property AlarmDateTime As String - Get - Return m_AlarmDateTime - End Get - End Property - Private m_newOpState As Integer - Public ReadOnly Property newOpState As Integer - Get - Return m_newOpState - End Get - End Property - Private m_CommandExecutedCorrectly As Boolean - Public ReadOnly Property CommandExecutedCorrectly As Boolean - Get - Return m_CommandExecutedCorrectly - End Get - End Property - Private m_VarAddress As String - Public ReadOnly Property VarAddress As String - Get - Return m_VarAddress - End Get - End Property - Private m_VarValue As String - Public ReadOnly Property VarValue As String - Get - Return m_VarValue - End Get - End Property +#Region "Private Fields" - Protected Sub New() - End Sub + Private m_AlarmCode As String + Private m_AlarmDateTime As Date + Private m_AlarmMessage As String + Private m_AlarmOperation As Integer + Private m_AlarmType As Integer + Private m_CommandExecutedCorrectly As Boolean + Private m_CommandState As CommandStates + Private m_CommandType As LogCommandTypes + Private m_Description As String - Friend Shared Function CreateResultLog(CommandType As LogCommandTypes, CommandState As CommandStates, ResultType As ResultTypes, Description As String) - Dim NewMachLog As New MachLog - NewMachLog.m_CommandType = CommandType - NewMachLog.m_CommandState = CommandState - NewMachLog.m_ResultType = ResultType - NewMachLog.m_Description = Description - Return NewMachLog - End Function + Private m_newOpState As Integer - Friend Shared Function CreateAlarmLog(AlarmOperation As Integer, AlarmType As Integer, AlarmMessage As String, AlarmCode As String, AlarmDateTime As String) - Dim NewMachLog As New MachLog - NewMachLog.m_CommandType = LogCommandTypes.ALARM - NewMachLog.m_AlarmOperation = AlarmOperation - NewMachLog.m_AlarmType = AlarmType - NewMachLog.m_AlarmMessage = AlarmMessage - NewMachLog.m_AlarmCode = AlarmCode - NewMachLog.m_AlarmDateTime = AlarmDateTime - Return NewMachLog - End Function + Private m_ResultType As ResultTypes - Friend Shared Function CreateOPStateLog(newOpState As Integer) - Dim NewMachLog As New MachLog - NewMachLog.m_CommandType = LogCommandTypes.NEWOP - NewMachLog.m_newOpState = newOpState - Return NewMachLog - End Function + Private m_VarAddress As String - Friend Shared Function CreateReadLog(CommandExecutedCorrectly As Boolean, VarAddress As String, VarValue As String) - Dim NewMachLog As New MachLog - NewMachLog.m_CommandType = CommandTypes.READ - NewMachLog.m_AlarmOperation = CommandExecutedCorrectly - NewMachLog.m_AlarmType = VarAddress - NewMachLog.m_AlarmMessage = VarValue - Return NewMachLog - End Function + Private m_VarValue As String -End Class +#End Region + +#Region "Protected Constructors" + + Protected Sub New() + End Sub + +#End Region + +#Region "Public Properties" + + Public ReadOnly Property AlarmCode As String + Get + Return m_AlarmCode + End Get + End Property + + Public ReadOnly Property AlarmDateTime As Date + Get + Return m_AlarmDateTime + End Get + End Property + + Public ReadOnly Property AlarmMessage As String + Get + Return m_AlarmMessage + End Get + End Property + + Public ReadOnly Property AlarmOperation As Integer + Get + Return m_AlarmOperation + End Get + End Property + + Public ReadOnly Property AlarmType As Integer + Get + Return m_AlarmType + End Get + End Property + + Public ReadOnly Property CommandExecutedCorrectly As Boolean + Get + Return m_CommandExecutedCorrectly + End Get + End Property + + Public ReadOnly Property CommandState As CommandStates + Get + Return m_CommandState + End Get + End Property + + Public ReadOnly Property CommandType As LogCommandTypes + Get + Return m_CommandType + End Get + End Property + + Public ReadOnly Property Description As String + Get + Return m_Description + End Get + End Property + + Public ReadOnly Property newOpState As Integer + Get + Return m_newOpState + End Get + End Property + + Public ReadOnly Property ResultType As ResultTypes + Get + Return m_ResultType + End Get + End Property + + Public ReadOnly Property VarAddress As String + Get + Return m_VarAddress + End Get + End Property + + Public ReadOnly Property VarValue As String + Get + Return m_VarValue + End Get + End Property + +#End Region + +#Region "Internal Methods" + + Friend Shared Function CreateAlarmLog(AlarmOperation As Integer, AlarmType As Integer, AlarmMessage As String, AlarmCode As String, AlarmDateTime As String) + Dim NewMachLog As New MachLog + NewMachLog.m_CommandType = LogCommandTypes.ALARM + NewMachLog.m_AlarmOperation = AlarmOperation + NewMachLog.m_AlarmType = AlarmType + NewMachLog.m_AlarmMessage = AlarmMessage + NewMachLog.m_AlarmCode = AlarmCode + NewMachLog.m_AlarmDateTime = AlarmDateTime + Return NewMachLog + End Function + + Friend Shared Function CreateOPStateLog(newOpState As Integer) + Dim NewMachLog As New MachLog + NewMachLog.m_CommandType = LogCommandTypes.NEWOP + NewMachLog.m_newOpState = newOpState + Return NewMachLog + End Function + + Friend Shared Function CreateReadLog(CommandExecutedCorrectly As Boolean, VarAddress As String, VarValue As String) + Dim NewMachLog As New MachLog + NewMachLog.m_CommandType = CommandTypes.READ + NewMachLog.m_AlarmOperation = CommandExecutedCorrectly + NewMachLog.m_AlarmType = VarAddress + NewMachLog.m_AlarmMessage = VarValue + Return NewMachLog + End Function + + Friend Shared Function CreateResultLog(CommandType As LogCommandTypes, CommandState As CommandStates, ResultType As ResultTypes, Description As String) + Dim NewMachLog As New MachLog + NewMachLog.m_CommandType = CommandType + NewMachLog.m_CommandState = CommandState + NewMachLog.m_ResultType = ResultType + NewMachLog.m_Description = Description + Return NewMachLog + End Function + +#End Region + +#Region "Public Methods" + + Public Shared Function CreateMacLog(AlarmCode As String, AlarmDateTime As Date, AlarmMessage As String, AlarmOperation As Integer, AlarmType As Integer, CommandExecutedCorrectly As Boolean, CommandState As CommandStates, CommandType As LogCommandTypes, Description As String, newOpState As Integer, ResultType As ResultTypes, VarAddress As String, VarValue As String) As MachLog + + Dim NewMachLog As New MachLog + NewMachLog.m_AlarmCode = AlarmCode + NewMachLog.m_AlarmDateTime = AlarmDateTime + NewMachLog.m_AlarmMessage = AlarmMessage + NewMachLog.m_AlarmOperation = AlarmOperation + NewMachLog.m_AlarmType = AlarmType + NewMachLog.m_CommandExecutedCorrectly = CommandExecutedCorrectly + NewMachLog.m_CommandState = CommandState + NewMachLog.m_CommandType = CommandType + NewMachLog.m_Description = Description + NewMachLog.m_newOpState = newOpState + NewMachLog.m_ResultType = ResultType + NewMachLog.m_VarAddress = VarAddress + NewMachLog.m_VarValue = VarValue + + Return NewMachLog + End Function + +#End Region + +End Class \ No newline at end of file From 00d43473f54df120d7aa075da3a38b9b41740175 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Fri, 23 Apr 2021 18:24:36 +0200 Subject: [PATCH 3/5] update controllers DB x MacLog --- .../Controllers/LogMachineController.cs | 79 +++++++++--- .../Controllers/MachGroupController.cs | 2 + .../DatabaseModels/LogMachineModel.cs | 114 +++++++++++------- 3 files changed, 136 insertions(+), 59 deletions(-) diff --git a/EgtBEAMWALL.DataLayer/Controllers/LogMachineController.cs b/EgtBEAMWALL.DataLayer/Controllers/LogMachineController.cs index 4e7272f5..1c485f99 100644 --- a/EgtBEAMWALL.DataLayer/Controllers/LogMachineController.cs +++ b/EgtBEAMWALL.DataLayer/Controllers/LogMachineController.cs @@ -26,29 +26,61 @@ namespace EgtBEAMWALL.DataLayer.Controllers #region Public Methods + /// + /// Conversion of base class to DB model class + /// + /// + /// + public static LogMachineModel ConvertFromCore(Core.MachLog coreMacLog) + { + LogMachineModel answ = new LogMachineModel(); + if (coreMacLog != null) + { + answ = new LogMachineModel() + { + AlarmCode = coreMacLog.AlarmCode, + AlarmDatetime = coreMacLog.AlarmDateTime, + AlarmMessage = coreMacLog.AlarmMessage, + AlarmOperation = coreMacLog.AlarmOperation, + AlarmType = coreMacLog.AlarmType, + CommandExecutedCorrectly = coreMacLog.CommandExecutedCorrectly, + CommandState = coreMacLog.CommandState, + CommandType = coreMacLog.CommandType, + Description = coreMacLog.Description, + NewOpState = coreMacLog.newOpState, + ResultType = coreMacLog.ResultType, + VarAddress = coreMacLog.VarAddress, + VarValue = coreMacLog.VarValue + }; + } + return answ; + } + + /// + /// Conversion from DB to Core class + /// + /// + /// + public static Core.MachLog ConvertToCore(LogMachineModel dbLog) + { + var newRecord = Core.MachLog.CreateMacLog(dbLog.AlarmCode, dbLog.AlarmDatetime, dbLog.AlarmMessage, dbLog.AlarmOperation, dbLog.AlarmType, dbLog.CommandExecutedCorrectly, dbLog.CommandState, dbLog.CommandType, dbLog.Description, dbLog.NewOpState, dbLog.ResultType, dbLog.VarAddress, dbLog.VarValue); + return newRecord; + } + /// /// Create machine LOG record /// - /// - /// - /// - /// - /// - /// - /// - /// - /// + /// /// - public bool Create(string machineId, DateTime dtCreated, string fileName, DateTime dtExported, int sn, string description, Core.EventType eventType, string message, double value) + public bool Create(LogMachineModel newLogMac) { bool fatto = false; try { try { - LogMachineModel newItem = new LogMachineModel() { MachineId = machineId, DtEvent = dtCreated, CncFileName = fileName, DtExported = dtExported, SN = sn, Description = description, EventType = eventType, Message = message, Value = value }; // Add to database - dbCtx.LogMachineList.Add(newItem); + dbCtx.LogMachineList.Add(newLogMac); // Commit changes dbCtx.SaveChanges(); } @@ -62,6 +94,17 @@ namespace EgtBEAMWALL.DataLayer.Controllers return fatto; } + /// + /// Create machine LOG record (da modello dati CORE) + /// + /// + /// + public bool Create(Core.MachLog newMachLog) + { + var dbLogModel = ConvertFromCore(newMachLog); + return Create(dbLogModel); + } + /// /// Delete by key /// @@ -113,13 +156,13 @@ namespace EgtBEAMWALL.DataLayer.Controllers /// /// /// - public List GetPaginatedAsc(DateTime dtStart, DateTime dtEnd) + public List GetAsc(DateTime dtStart, DateTime dtEnd) { // retrieve return dbCtx .LogMachineList - .Where(x => x.DtEvent >= dtStart && x.DtEvent <= dtEnd) - .OrderBy(x => x.DtEvent) + .Where(x => x.AlarmDatetime >= dtStart && x.AlarmDatetime <= dtEnd) + .OrderBy(x => x.AlarmDatetime) .ToList(); } @@ -129,13 +172,13 @@ namespace EgtBEAMWALL.DataLayer.Controllers /// /// /// - public List GetPaginatedDesc(DateTime dtStart, DateTime dtEnd) + public List GetDesc(DateTime dtStart, DateTime dtEnd) { // retrieve return dbCtx .LogMachineList - .Where(x => x.DtEvent >= dtStart && x.DtEvent <= dtEnd) - .OrderByDescending(x => x.DtEvent) + .Where(x => x.AlarmDatetime >= dtStart && x.AlarmDatetime <= dtEnd) + .OrderByDescending(x => x.AlarmDatetime) .ToList(); } diff --git a/EgtBEAMWALL.DataLayer/Controllers/MachGroupController.cs b/EgtBEAMWALL.DataLayer/Controllers/MachGroupController.cs index 06278c26..29fb01eb 100644 --- a/EgtBEAMWALL.DataLayer/Controllers/MachGroupController.cs +++ b/EgtBEAMWALL.DataLayer/Controllers/MachGroupController.cs @@ -107,6 +107,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers return answ; } +#if false /// /// Conversion of base class to DB model class /// @@ -136,6 +137,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers } return answ; } +#endif /// /// Create record on DB diff --git a/EgtBEAMWALL.DataLayer/DatabaseModels/LogMachineModel.cs b/EgtBEAMWALL.DataLayer/DatabaseModels/LogMachineModel.cs index 691befe5..88243b26 100644 --- a/EgtBEAMWALL.DataLayer/DatabaseModels/LogMachineModel.cs +++ b/EgtBEAMWALL.DataLayer/DatabaseModels/LogMachineModel.cs @@ -16,10 +16,52 @@ namespace EgtBEAMWALL.DataLayer.DatabaseModels #region Public Properties /// - /// File CNC di riferimento + /// Codice Allarme /// - [Column("CncFileName")] - public string CncFileName { get; set; } = ""; + [Column("AlarmCode")] + public string AlarmCode { get; set; } = ""; + + /// + /// Data Evento + /// + [Column("AlarmDtEvent")] + public DateTime AlarmDatetime { get; set; } = DateTime.Now; + + /// + /// Messaggio Allarme + /// + [Column("AlarmMessage")] + public string AlarmMessage { get; set; } = ""; + + /// + /// Alarm Operation + /// + [Column("AlarmOperation")] + public int AlarmOperation { get; set; } = 0; + + /// + /// Alarm Type + /// + [Column("AlarmType")] + public int AlarmType { get; set; } = 0; + + /// + /// Esaecuzione comando corretta + /// + [Column("CommExecuted")] + public bool CommandExecutedCorrectly { get; set; } = false; + + /// + /// Stato da enum Core + /// + [Column("CommandState")] + public Core.ConstMachComm.CommandStates CommandState { get; set; } = Core.ConstMachComm.CommandStates.NULL; + + /// + /// Tipo Comando da enum Core + /// + [Column("CommandType")] + public Core.ConstMachComm.LogCommandTypes CommandType { get; set; } = Core.ConstMachComm.LogCommandTypes.NULL; /// /// Descrizione @@ -27,51 +69,41 @@ namespace EgtBEAMWALL.DataLayer.DatabaseModels [Column("Description")] public string Description { get; set; } = ""; - /// - /// Data Evento - /// - [Column("DtEvent")] - public DateTime DtEvent { get; set; } - - /// - /// Data Esportazione - /// - [Column("DtExported")] - public DateTime DtExported { get; set; } - - /// - /// Tipo evento da enum Core - /// - [Column("EventType")] - public Core.EventType EventType { get; set; } = Core.EventType.ND; - [Key, Column("DbId"), DatabaseGenerated(DatabaseGeneratedOption.Identity)] public int LogDbId { get; set; } + /// + /// New OP State + /// + [Column("NewOpState")] + public int NewOpState { get; set; } = 0; + + /// + /// Stato da enum Core + /// + [Column("ResultType")] + public Core.ConstMachComm.ResultTypes ResultType { get; set; } = Core.ConstMachComm.ResultTypes.NULL; + + /// + /// Indirizzo VAR + /// + [Column("VarAddress")] + public string VarAddress { get; set; } = ""; + + /// + /// Valore VAR + /// + [Column("VarValue")] + public string VarValue { get; set; } = ""; + + #endregion Public Properties + +#if false /// /// MachineId del BTL /// [Column("MachineId")] public string MachineId { get; set; } = ""; - - /// - /// Messaggio - /// - [Column("Message")] - public string Message { get; set; } = ""; - - /// - /// Seriale - /// - [Column("SN")] - public int SN { get; set; } = 0; - - /// - /// Valore Associato - /// - [Column("Value")] - public double Value { get; set; } = 0; - - #endregion Public Properties +#endif } } \ No newline at end of file From 421e2e22145103dba6034ec01545d1d91fee6bbf Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Fri, 23 Apr 2021 18:26:52 +0200 Subject: [PATCH 4/5] aggiunto data migration --- ...104231625149_LogMachineUpgrade.Designer.cs | 29 ++++ .../202104231625149_LogMachineUpgrade.cs | 56 ++++++++ .../202104231625149_LogMachineUpgrade.resx | 126 ++++++++++++++++++ 3 files changed, 211 insertions(+) create mode 100644 EgtBEAMWALL.DataLayer/Migrations/202104231625149_LogMachineUpgrade.Designer.cs create mode 100644 EgtBEAMWALL.DataLayer/Migrations/202104231625149_LogMachineUpgrade.cs create mode 100644 EgtBEAMWALL.DataLayer/Migrations/202104231625149_LogMachineUpgrade.resx diff --git a/EgtBEAMWALL.DataLayer/Migrations/202104231625149_LogMachineUpgrade.Designer.cs b/EgtBEAMWALL.DataLayer/Migrations/202104231625149_LogMachineUpgrade.Designer.cs new file mode 100644 index 00000000..4bf468ff --- /dev/null +++ b/EgtBEAMWALL.DataLayer/Migrations/202104231625149_LogMachineUpgrade.Designer.cs @@ -0,0 +1,29 @@ +// +namespace EgtBEAMWALL.DataLayer.Migrations +{ + using System.CodeDom.Compiler; + using System.Data.Entity.Migrations; + using System.Data.Entity.Migrations.Infrastructure; + using System.Resources; + + [GeneratedCode("EntityFramework.Migrations", "6.4.4")] + public sealed partial class LogMachineUpgrade : IMigrationMetadata + { + private readonly ResourceManager Resources = new ResourceManager(typeof(LogMachineUpgrade)); + + string IMigrationMetadata.Id + { + get { return "202104231625149_LogMachineUpgrade"; } + } + + string IMigrationMetadata.Source + { + get { return null; } + } + + string IMigrationMetadata.Target + { + get { return Resources.GetString("Target"); } + } + } +} diff --git a/EgtBEAMWALL.DataLayer/Migrations/202104231625149_LogMachineUpgrade.cs b/EgtBEAMWALL.DataLayer/Migrations/202104231625149_LogMachineUpgrade.cs new file mode 100644 index 00000000..cb5478cd --- /dev/null +++ b/EgtBEAMWALL.DataLayer/Migrations/202104231625149_LogMachineUpgrade.cs @@ -0,0 +1,56 @@ +namespace EgtBEAMWALL.DataLayer.Migrations +{ + using System; + using System.Data.Entity.Migrations; + + public partial class LogMachineUpgrade : DbMigration + { + public override void Up() + { + AddColumn("dbo.LogMachine", "AlarmCode", c => c.String(unicode: false)); + AddColumn("dbo.LogMachine", "AlarmDtEvent", c => c.DateTime(nullable: false, precision: 0)); + AddColumn("dbo.LogMachine", "AlarmMessage", c => c.String(unicode: false)); + AddColumn("dbo.LogMachine", "AlarmOperation", c => c.Int(nullable: false)); + AddColumn("dbo.LogMachine", "AlarmType", c => c.Int(nullable: false)); + AddColumn("dbo.LogMachine", "CommExecuted", c => c.Boolean(nullable: false)); + AddColumn("dbo.LogMachine", "CommandState", c => c.Int(nullable: false)); + AddColumn("dbo.LogMachine", "CommandType", c => c.Int(nullable: false)); + AddColumn("dbo.LogMachine", "NewOpState", c => c.Int(nullable: false)); + AddColumn("dbo.LogMachine", "ResultType", c => c.Int(nullable: false)); + AddColumn("dbo.LogMachine", "VarAddress", c => c.String(unicode: false)); + AddColumn("dbo.LogMachine", "VarValue", c => c.String(unicode: false)); + DropColumn("dbo.LogMachine", "CncFileName"); + DropColumn("dbo.LogMachine", "DtEvent"); + DropColumn("dbo.LogMachine", "DtExported"); + DropColumn("dbo.LogMachine", "EventType"); + DropColumn("dbo.LogMachine", "MachineId"); + DropColumn("dbo.LogMachine", "Message"); + DropColumn("dbo.LogMachine", "SN"); + DropColumn("dbo.LogMachine", "Value"); + } + + public override void Down() + { + AddColumn("dbo.LogMachine", "Value", c => c.Double(nullable: false)); + AddColumn("dbo.LogMachine", "SN", c => c.Int(nullable: false)); + AddColumn("dbo.LogMachine", "Message", c => c.String(unicode: false)); + AddColumn("dbo.LogMachine", "MachineId", c => c.String(unicode: false)); + AddColumn("dbo.LogMachine", "EventType", c => c.Int(nullable: false)); + AddColumn("dbo.LogMachine", "DtExported", c => c.DateTime(nullable: false, precision: 0)); + AddColumn("dbo.LogMachine", "DtEvent", c => c.DateTime(nullable: false, precision: 0)); + AddColumn("dbo.LogMachine", "CncFileName", c => c.String(unicode: false)); + DropColumn("dbo.LogMachine", "VarValue"); + DropColumn("dbo.LogMachine", "VarAddress"); + DropColumn("dbo.LogMachine", "ResultType"); + DropColumn("dbo.LogMachine", "NewOpState"); + DropColumn("dbo.LogMachine", "CommandType"); + DropColumn("dbo.LogMachine", "CommandState"); + DropColumn("dbo.LogMachine", "CommExecuted"); + DropColumn("dbo.LogMachine", "AlarmType"); + DropColumn("dbo.LogMachine", "AlarmOperation"); + DropColumn("dbo.LogMachine", "AlarmMessage"); + DropColumn("dbo.LogMachine", "AlarmDtEvent"); + DropColumn("dbo.LogMachine", "AlarmCode"); + } + } +} diff --git a/EgtBEAMWALL.DataLayer/Migrations/202104231625149_LogMachineUpgrade.resx b/EgtBEAMWALL.DataLayer/Migrations/202104231625149_LogMachineUpgrade.resx new file mode 100644 index 00000000..30598288 --- /dev/null +++ b/EgtBEAMWALL.DataLayer/Migrations/202104231625149_LogMachineUpgrade.resx @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 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 + + + dbo + + \ No newline at end of file From 2f03f59eeaba3cc3ac8d5dfd83d4926799825481 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Fri, 23 Apr 2021 18:26:57 +0200 Subject: [PATCH 5/5] refresh views --- .../DatabaseContext.Views.cs | 50 +++++++++++-------- .../EgtBEAMWALL.DataLayer.csproj | 7 +++ 2 files changed, 36 insertions(+), 21 deletions(-) diff --git a/EgtBEAMWALL.DataLayer/DatabaseContext.Views.cs b/EgtBEAMWALL.DataLayer/DatabaseContext.Views.cs index 3a728e88..04e467e0 100644 --- a/EgtBEAMWALL.DataLayer/DatabaseContext.Views.cs +++ b/EgtBEAMWALL.DataLayer/DatabaseContext.Views.cs @@ -11,7 +11,7 @@ using System.Data.Entity.Infrastructure.MappingViews; [assembly: DbMappingViewCacheTypeAttribute( typeof(EgtBEAMWALL.DataLayer.DatabaseContext), - typeof(Edm_EntityMappingGeneratedViews.ViewsForBaseEntitySetsa95a868b62cc753257f94e9de93da89a15deb865d6b60b5e975a50d917c6ee74))] + typeof(Edm_EntityMappingGeneratedViews.ViewsForBaseEntitySets991d60e8c06fb7a14542a1fa467435dadb8759ce92cff08ef069c8042ed59eec))] namespace Edm_EntityMappingGeneratedViews { @@ -23,14 +23,14 @@ namespace Edm_EntityMappingGeneratedViews /// Implements a mapping view cache. /// [GeneratedCode("Entity Framework 6 Power Tools", "0.9.2.0")] - internal sealed class ViewsForBaseEntitySetsa95a868b62cc753257f94e9de93da89a15deb865d6b60b5e975a50d917c6ee74 : DbMappingViewCache + internal sealed class ViewsForBaseEntitySets991d60e8c06fb7a14542a1fa467435dadb8759ce92cff08ef069c8042ed59eec : DbMappingViewCache { /// /// Gets a hash value computed over the mapping closure. /// public override string MappingHashValue { - get { return "a95a868b62cc753257f94e9de93da89a15deb865d6b60b5e975a50d917c6ee74"; } + get { return "991d60e8c06fb7a14542a1fa467435dadb8759ce92cff08ef069c8042ed59eec"; } } /// @@ -404,19 +404,23 @@ namespace Edm_EntityMappingGeneratedViews { return new DbMappingView(@" SELECT VALUE -- Constructing LogMachineModel - [CodeFirstDatabaseSchema.LogMachineModel](T1.LogMachineModel_DbId, T1.LogMachineModel_CncFileName, T1.LogMachineModel_Description, T1.LogMachineModel_DtEvent, T1.LogMachineModel_DtExported, T1.LogMachineModel_EventType, T1.LogMachineModel_MachineId, T1.LogMachineModel_Message, T1.LogMachineModel_SN, T1.LogMachineModel_Value) + [CodeFirstDatabaseSchema.LogMachineModel](T1.LogMachineModel_DbId, T1.LogMachineModel_AlarmCode, T1.LogMachineModel_AlarmDtEvent, T1.LogMachineModel_AlarmMessage, T1.LogMachineModel_AlarmOperation, T1.LogMachineModel_AlarmType, T1.LogMachineModel_CommExecuted, T1.LogMachineModel_CommandState, T1.LogMachineModel_CommandType, T1.LogMachineModel_Description, T1.LogMachineModel_NewOpState, T1.LogMachineModel_ResultType, T1.LogMachineModel_VarAddress, T1.LogMachineModel_VarValue) FROM ( SELECT T.LogDbId AS LogMachineModel_DbId, - T.CncFileName AS LogMachineModel_CncFileName, + T.AlarmCode AS LogMachineModel_AlarmCode, + T.AlarmDatetime AS LogMachineModel_AlarmDtEvent, + T.AlarmMessage AS LogMachineModel_AlarmMessage, + T.AlarmOperation AS LogMachineModel_AlarmOperation, + T.AlarmType AS LogMachineModel_AlarmType, + T.CommandExecutedCorrectly AS LogMachineModel_CommExecuted, + CAST(T.CommandState AS [Edm.Int32]) AS LogMachineModel_CommandState, + CAST(T.CommandType AS [Edm.Int32]) AS LogMachineModel_CommandType, T.Description AS LogMachineModel_Description, - T.DtEvent AS LogMachineModel_DtEvent, - T.DtExported AS LogMachineModel_DtExported, - CAST(T.EventType AS [Edm.Int32]) AS LogMachineModel_EventType, - T.MachineId AS LogMachineModel_MachineId, - T.Message AS LogMachineModel_Message, - T.SN AS LogMachineModel_SN, - T.[Value] AS LogMachineModel_Value, + T.NewOpState AS LogMachineModel_NewOpState, + CAST(T.ResultType AS [Edm.Int32]) AS LogMachineModel_ResultType, + T.VarAddress AS LogMachineModel_VarAddress, + T.VarValue AS LogMachineModel_VarValue, True AS _from0 FROM DatabaseContext.LogMachineList AS T ) AS T1"); @@ -430,19 +434,23 @@ namespace Edm_EntityMappingGeneratedViews { return new DbMappingView(@" SELECT VALUE -- Constructing LogMachineList - [EgtBEAMWALL.DataLayer.LogMachineModel](T1.LogMachineModel_LogDbId, T1.LogMachineModel_CncFileName, T1.LogMachineModel_Description, T1.LogMachineModel_DtEvent, T1.LogMachineModel_DtExported, T1.LogMachineModel_EventType, T1.LogMachineModel_MachineId, T1.LogMachineModel_Message, T1.LogMachineModel_SN, T1.LogMachineModel_Value) + [EgtBEAMWALL.DataLayer.LogMachineModel](T1.LogMachineModel_LogDbId, T1.LogMachineModel_AlarmCode, T1.LogMachineModel_AlarmDatetime, T1.LogMachineModel_AlarmMessage, T1.LogMachineModel_AlarmOperation, T1.LogMachineModel_AlarmType, T1.LogMachineModel_CommandExecutedCorrectly, T1.LogMachineModel_CommandState, T1.LogMachineModel_CommandType, T1.LogMachineModel_Description, T1.LogMachineModel_NewOpState, T1.LogMachineModel_ResultType, T1.LogMachineModel_VarAddress, T1.LogMachineModel_VarValue) FROM ( SELECT T.DbId AS LogMachineModel_LogDbId, - T.CncFileName AS LogMachineModel_CncFileName, + T.AlarmCode AS LogMachineModel_AlarmCode, + T.AlarmDtEvent AS LogMachineModel_AlarmDatetime, + T.AlarmMessage AS LogMachineModel_AlarmMessage, + T.AlarmOperation AS LogMachineModel_AlarmOperation, + T.AlarmType AS LogMachineModel_AlarmType, + T.CommExecuted AS LogMachineModel_CommandExecutedCorrectly, + CAST(T.CommandState AS [EgtBEAMWALL.DataLayer.CommandStates]) AS LogMachineModel_CommandState, + CAST(T.CommandType AS [EgtBEAMWALL.DataLayer.LogCommandTypes]) AS LogMachineModel_CommandType, T.Description AS LogMachineModel_Description, - T.DtEvent AS LogMachineModel_DtEvent, - T.DtExported AS LogMachineModel_DtExported, - CAST(T.EventType AS [EgtBEAMWALL.DataLayer.EventType]) AS LogMachineModel_EventType, - T.MachineId AS LogMachineModel_MachineId, - T.Message AS LogMachineModel_Message, - T.SN AS LogMachineModel_SN, - T.[Value] AS LogMachineModel_Value, + T.NewOpState AS LogMachineModel_NewOpState, + CAST(T.ResultType AS [EgtBEAMWALL.DataLayer.ResultTypes]) AS LogMachineModel_ResultType, + T.VarAddress AS LogMachineModel_VarAddress, + T.VarValue AS LogMachineModel_VarValue, True AS _from0 FROM CodeFirstDatabase.LogMachineModel AS T ) AS T1"); diff --git a/EgtBEAMWALL.DataLayer/EgtBEAMWALL.DataLayer.csproj b/EgtBEAMWALL.DataLayer/EgtBEAMWALL.DataLayer.csproj index 3828ba4f..d22c3623 100644 --- a/EgtBEAMWALL.DataLayer/EgtBEAMWALL.DataLayer.csproj +++ b/EgtBEAMWALL.DataLayer/EgtBEAMWALL.DataLayer.csproj @@ -96,6 +96,10 @@ 202104150749157_FullDbInit.cs + + + 202104231625149_LogMachineUpgrade.cs + @@ -113,6 +117,9 @@ 202104150749157_FullDbInit.cs + + 202104231625149_LogMachineUpgrade.cs +