2020/04/17 Jessica

Actions
1.TransactionRecord Table 使用Id 作為TransactionId  & 刪除ReportedOn 欄位、修正欄位名錯誤 RetryStopTransactionTimes

2.MachineOperateRecord Table 新增  ReportedOn 欄位

3.復原 TransactionDataRecord Table  用來上傳MeterValue的Model

EVCB_OCPP.Domain/EVCB_OCPP.Domain.csproj

@@ -166,6 +166,10 @@
     <Compile Include="MainDBContextMigrations\202002210346267_Add_Action_MachineOperateRecord.Designer.cs">
       <DependentUpon>202002210346267_Add_Action_MachineOperateRecord.cs</DependentUpon>
     </Compile>
+    <Compile Include="MainDBContextMigrations\202004170135337_RemoveTransactionId_RenameFewField_AddMachineOperateRecord.cs" />
+    <Compile Include="MainDBContextMigrations\202004170135337_RemoveTransactionId_RenameFewField_AddMachineOperateRecord.Designer.cs">
+      <DependentUpon>202004170135337_RemoveTransactionId_RenameFewField_AddMachineOperateRecord.cs</DependentUpon>
+    </Compile>
     <Compile Include="MainDBContextMigrations\Configuration.cs" />
     <Compile Include="MeterValueDBContext.cs" />
     <Compile Include="MeterValueDBContextMigrations\201907150814558_Init.cs" />
@@ -303,6 +307,9 @@
     <EmbeddedResource Include="MainDBContextMigrations\202002210346267_Add_Action_MachineOperateRecord.resx">
       <DependentUpon>202002210346267_Add_Action_MachineOperateRecord.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="MainDBContextMigrations\202004170135337_RemoveTransactionId_RenameFewField_AddMachineOperateRecord.resx">
+      <DependentUpon>202004170135337_RemoveTransactionId_RenameFewField_AddMachineOperateRecord.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="MeterValueDBContextMigrations\201907150814558_Init.resx">
       <DependentUpon>201907150814558_Init.cs</DependentUpon>
     </EmbeddedResource>

EVCB_OCPP.Domain/MainDBContext.cs

@@ -33,7 +33,7 @@
         // 針對您要包含在模型中的每種實體類型新增 DbSet。如需有關設定和使用
         // Code First 模型的詳細資訊，請參閱 http://go.microsoft.com/fwlink/?LinkId=390109。
 
-        public virtual DbSet<ApiLogEntry> ApiLogEntry { get; set; }
+       
 
         public virtual DbSet<ConnectorStatus> ConnectorStatus { get; set; }
 

EVCB_OCPP.Domain/MainDBContextMigrations/202004170135337_RemoveTransactionId_RenameFewField_AddMachineOperateRecord.Designer.cs

@@ -0,0 +1,29 @@
+// <auto-generated />
+namespace EVCB_OCPP.Domain.MainDBContextMigrations
+{
+    using System.CodeDom.Compiler;
+    using System.Data.Entity.Migrations;
+    using System.Data.Entity.Migrations.Infrastructure;
+    using System.Resources;
+    
+    [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")]
+    public sealed partial class RemoveTransactionId_RenameFewField_AddMachineOperateRecord : IMigrationMetadata
+    {
+        private readonly ResourceManager Resources = new ResourceManager(typeof(RemoveTransactionId_RenameFewField_AddMachineOperateRecord));
+        
+        string IMigrationMetadata.Id
+        {
+            get { return "202004170135337_RemoveTransactionId_RenameFewField_AddMachineOperateRecord"; }
+        }
+        
+        string IMigrationMetadata.Source
+        {
+            get { return null; }
+        }
+        
+        string IMigrationMetadata.Target
+        {
+            get { return Resources.GetString("Target"); }
+        }
+    }
+}

EVCB_OCPP.Domain/MainDBContextMigrations/202004170135337_RemoveTransactionId_RenameFewField_AddMachineOperateRecord.cs

@@ -0,0 +1,69 @@
+namespace EVCB_OCPP.Domain.MainDBContextMigrations
+{
+    using System;
+    using System.Data.Entity.Migrations;
+    
+    public partial class RemoveTransactionId_RenameFewField_AddMachineOperateRecord : DbMigration
+    {
+        public override void Up()
+        {
+            DropIndex("dbo.ApiLogEntry", new[] { "RequestTimestamp" });
+            DropIndex("dbo.TransactionRecord", "IX_1202_Issue_Report");
+            DropIndex("dbo.TransactionRecord", new[] { "TransactionId" });
+            DropPrimaryKey("dbo.TransactionRecord");
+            AddColumn("dbo.MachineOperateRecord", "ReportedOn", c => c.DateTime(nullable: false));
+            AddColumn("dbo.TransactionRecord", "RetryStopTransactionTimes", c => c.Int(nullable: false));
+            AlterColumn("dbo.TransactionRecord", "Id", c => c.Int(nullable: false, identity: true));
+            AddPrimaryKey("dbo.TransactionRecord", "Id");
+            CreateIndex("dbo.TransactionRecord", new[] { "ChargeBoxId", "ConnectorId", "StartTime" }, unique: true, name: "IX_1202_Issue_Report");
+            DropColumn("dbo.TransactionRecord", "TransactionId");
+            DropColumn("dbo.TransactionRecord", "ReportedOn");
+            DropColumn("dbo.TransactionRecord", "RtryStopTransactionTimes");
+            DropTable("dbo.ApiLogEntry");
+        }
+        
+        public override void Down()
+        {
+            CreateTable(
+                "dbo.ApiLogEntry",
+                c => new
+                    {
+                        ApiLogEntryId = c.Long(nullable: false, identity: true),
+                        Application = c.String(),
+                        User = c.String(),
+                        Machine = c.String(),
+                        RequestIpAddress = c.String(),
+                        RequestContentType = c.String(),
+                        RequestContentBody = c.String(),
+                        RequestUri = c.String(),
+                        RequestMethod = c.String(),
+                        RequestRouteTemplate = c.String(),
+                        RequestRouteData = c.String(),
+                        RequestHeaders = c.String(),
+                        RequestTimestamp = c.DateTime(),
+                        ResponseContentType = c.String(),
+                        ResponseContentBody = c.String(),
+                        ResponseStatusCode = c.Int(),
+                        ResponseHeaders = c.String(),
+                        ResponseTimestamp = c.DateTime(),
+                        IsOutData = c.Boolean(nullable: false),
+                        ErrorMsg = c.String(),
+                        ErrorOn = c.DateTime(),
+                    })
+                .PrimaryKey(t => t.ApiLogEntryId);
+            
+            AddColumn("dbo.TransactionRecord", "RtryStopTransactionTimes", c => c.Int(nullable: false));
+            AddColumn("dbo.TransactionRecord", "ReportedOn", c => c.DateTime(nullable: false));
+            AddColumn("dbo.TransactionRecord", "TransactionId", c => c.Int(nullable: false));
+            DropIndex("dbo.TransactionRecord", "IX_1202_Issue_Report");
+            DropPrimaryKey("dbo.TransactionRecord");
+            AlterColumn("dbo.TransactionRecord", "Id", c => c.Long(nullable: false, identity: true));
+            DropColumn("dbo.TransactionRecord", "RetryStopTransactionTimes");
+            DropColumn("dbo.MachineOperateRecord", "ReportedOn");
+            AddPrimaryKey("dbo.TransactionRecord", "Id");
+            CreateIndex("dbo.TransactionRecord", "TransactionId");
+            CreateIndex("dbo.TransactionRecord", new[] { "ChargeBoxId", "ConnectorId", "TransactionId", "StartTime" }, unique: true, name: "IX_1202_Issue_Report");
+            CreateIndex("dbo.ApiLogEntry", "RequestTimestamp");
+        }
+    }
+}

EVCB_OCPP.Domain/Models/Database/MachineOperateRecord.cs

@@ -19,6 +19,7 @@ namespace EVCB_OCPP.Domain.Models.Database
         {
             EVSE_Value = string.Empty;
             FinishedOn = new DateTime(1991, 1, 1);
+            ReportedOn = new DateTime(1991, 1, 1);
 
         }
 
@@ -86,5 +87,14 @@ namespace EVCB_OCPP.Domain.Models.Database
         public DateTime FinishedOn { set; get; }
 
 
+        /// <summary>
+        /// 回報時間
+        /// </summary>
+        public DateTime ReportedOn { set; get; }
+
+
+     
+
+
     }
 }

EVCB_OCPP.Domain/Models/Database/TransactionDataRecord.cs

@@ -10,8 +10,8 @@ namespace EVCB_OCPP.Domain.Models.Database
     public class TransactionDataRecord
     {
         [Key]
-        public Int64 Id { set; get; }     
-         
+        public Int64 Id { set; get; }
+
         public byte ConnectorId { get; set; }
 
         /// <summary>

EVCB_OCPP.Domain/Models/Database/TransactionRecord.cs

@@ -20,7 +20,7 @@
             StartTime = new DateTime(1991, 1, 1);
             StopTime = new DateTime(1991, 1, 1);
             ReservationId = -1;
-            ReportedOn = new DateTime(1991, 1, 1);
+       
             CreatedOn = new DateTime(1991, 1, 1);
             UpdatedOn = new DateTime(1991, 1, 1);
             StartTransactionReportedOn = new DateTime(1991, 1, 1);
@@ -29,7 +29,7 @@
         }
 
         [Key]
-        public Int64 Id { get; set; }
+        public Int32 Id { get; set; }
 
         /// <summary>
         /// 客戶代碼
@@ -44,16 +44,7 @@
         /// </summary>
         [Required]
         [Index("IX_1202_Issue_Report", Order = 2, IsUnique = true)]
-        public byte ConnectorId { get; set; }
-
-
-        /// <summary>
-        /// TransactionId
-        /// </summary>
-        [Index("IX_TransactionId")]
-        [Index("IX_1202_Issue_Report", Order = 3, IsUnique = true)]
-        [Required]
-        public int TransactionId { get; set; }
+        public byte ConnectorId { get; set; }   
 
 
 
@@ -82,7 +73,7 @@
         /// <summary>
         /// 開始充電開始時間
         /// </summary>
-        [Index("IX_1202_Issue_Report", Order = 4, IsUnique = true)]
+        [Index("IX_1202_Issue_Report", Order = 3, IsUnique = true)]
         public DateTime StartTime { get; set; }
 
         /// <summary>
@@ -112,15 +103,7 @@
         /// 結束meter
         /// </summary>
         [DataType("decimal(16 ,2")]
-        public decimal MeterStop { get; set; }
-      
-
-      
-
-        /// <summary>
-        /// 回報時間
-        /// </summary>
-        public DateTime ReportedOn { get; set; }
+        public decimal MeterStop { get; set; }      
 
         /// <summary>
         /// 產生時間
@@ -151,7 +134,7 @@
         /// <summary>
         /// 結束充電回報的次數
         /// </summary>
-        public int RtryStopTransactionTimes { get; set; }
+        public int RetryStopTransactionTimes { get; set; }
 
         /// <summary>
         /// 回調客戶API，問題紀錄

EVCB_OCPP.Domain/Properties/AssemblyInfo.cs

@@ -35,4 +35,4 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyVersion("0.1.0.0")]
 [assembly: AssemblyFileVersion("0.1.0.0")]
 
-[assembly: AssemblyInformationalVersion("5ea1b39")]
+[assembly: AssemblyInformationalVersion("04817db")]

EVCB_OCPP.MailService/Properties/AssemblyInfo.cs

@@ -35,4 +35,4 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyVersion("0.1.0.0")]
 [assembly: AssemblyFileVersion("0.1.0.0")]
 
-[assembly: AssemblyInformationalVersion("5ea1b39")]
+[assembly: AssemblyInformationalVersion("04817db")]

EVCB_OCPP.Packet/Properties/AssemblyInfo.cs

@@ -35,4 +35,4 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyVersion("0.1.0.0")]
 [assembly: AssemblyFileVersion("0.1.0.0")]
 
-[assembly: AssemblyInformationalVersion("5ea1b39")]
+[assembly: AssemblyInformationalVersion("04817db")]