2020/06/18 Jessica

Actions:
1.Machine 加入板子版號 、 IsDel (假刪除)& 移除AC ConnectorPowerType

EVCB_OCPP.Domain/EVCB_OCPP.Domain.csproj

@@ -190,6 +190,14 @@
     <Compile Include="MainDBContextMigrations\202006080138316_ModifiedChargeBoxIdLenAndOTAFields.Designer.cs">
       <DependentUpon>202006080138316_ModifiedChargeBoxIdLenAndOTAFields.cs</DependentUpon>
     </Compile>
+    <Compile Include="MainDBContextMigrations\202006160623134_MachineBoardVersion.cs" />
+    <Compile Include="MainDBContextMigrations\202006160623134_MachineBoardVersion.Designer.cs">
+      <DependentUpon>202006160623134_MachineBoardVersion.cs</DependentUpon>
+    </Compile>
+    <Compile Include="MainDBContextMigrations\202006180231003_Modify_Machine.cs" />
+    <Compile Include="MainDBContextMigrations\202006180231003_Modify_Machine.Designer.cs">
+      <DependentUpon>202006180231003_Modify_Machine.cs</DependentUpon>
+    </Compile>
     <Compile Include="MainDBContextMigrations\Configuration.cs" />
     <Compile Include="MeterValueDBContext.cs" />
     <Compile Include="MeterValueDBContextMigrations\201907150814558_Init.cs" />
@@ -342,6 +350,12 @@
     <EmbeddedResource Include="MainDBContextMigrations\202006080138316_ModifiedChargeBoxIdLenAndOTAFields.resx">
       <DependentUpon>202006080138316_ModifiedChargeBoxIdLenAndOTAFields.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="MainDBContextMigrations\202006160623134_MachineBoardVersion.resx">
+      <DependentUpon>202006160623134_MachineBoardVersion.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="MainDBContextMigrations\202006180231003_Modify_Machine.resx">
+      <DependentUpon>202006180231003_Modify_Machine.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="MeterValueDBContextMigrations\201907150814558_Init.resx">
       <DependentUpon>201907150814558_Init.cs</DependentUpon>
     </EmbeddedResource>

EVCB_OCPP.Domain/MainDBContext.cs

@@ -69,8 +69,7 @@
         protected override void OnModelCreating(DbModelBuilder modelBuilder)
         {
 
-
-
+            modelBuilder.Entity<Machine>().Property(x => x.RatedPower).HasPrecision(6, 2);
             modelBuilder.Entity<Machine>().Property(x => x.Longitude).HasPrecision(10, 6);
             modelBuilder.Entity<Machine>().Property(x => x.Latitude).HasPrecision(10, 6);
 

EVCB_OCPP.Domain/MainDBContextMigrations/202006160623134_MachineBoardVersion.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 MachineBoardVersion : IMigrationMetadata
+    {
+        private readonly ResourceManager Resources = new ResourceManager(typeof(MachineBoardVersion));
+        
+        string IMigrationMetadata.Id
+        {
+            get { return "202006160623134_MachineBoardVersion"; }
+        }
+        
+        string IMigrationMetadata.Source
+        {
+            get { return null; }
+        }
+        
+        string IMigrationMetadata.Target
+        {
+            get { return Resources.GetString("Target"); }
+        }
+    }
+}

EVCB_OCPP.Domain/MainDBContextMigrations/202006160623134_MachineBoardVersion.cs

@@ -0,0 +1,18 @@
+namespace EVCB_OCPP.Domain.MainDBContextMigrations
+{
+    using System;
+    using System.Data.Entity.Migrations;
+    
+    public partial class MachineBoardVersion : DbMigration
+    {
+        public override void Up()
+        {
+            AddColumn("dbo.Machine", "BoardVersions", c => c.String(maxLength: 500));
+        }
+        
+        public override void Down()
+        {
+            DropColumn("dbo.Machine", "BoardVersions");
+        }
+    }
+}

EVCB_OCPP.Domain/MainDBContextMigrations/202006180231003_Modify_Machine.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 Modify_Machine : IMigrationMetadata
+    {
+        private readonly ResourceManager Resources = new ResourceManager(typeof(Modify_Machine));
+        
+        string IMigrationMetadata.Id
+        {
+            get { return "202006180231003_Modify_Machine"; }
+        }
+        
+        string IMigrationMetadata.Source
+        {
+            get { return null; }
+        }
+        
+        string IMigrationMetadata.Target
+        {
+            get { return Resources.GetString("Target"); }
+        }
+    }
+}

EVCB_OCPP.Domain/MainDBContextMigrations/202006180231003_Modify_Machine.cs

@@ -0,0 +1,22 @@
+namespace EVCB_OCPP.Domain.MainDBContextMigrations
+{
+    using System;
+    using System.Data.Entity.Migrations;
+    
+    public partial class Modify_Machine : DbMigration
+    {
+        public override void Up()
+        {
+            AddColumn("dbo.Machine", "IsDelete", c => c.Boolean(nullable: false));
+            AlterColumn("dbo.Machine", "RatedPower", c => c.Decimal(nullable: false, precision: 6, scale: 2));
+            DropColumn("dbo.Machine", "AC");
+        }
+        
+        public override void Down()
+        {
+            AddColumn("dbo.Machine", "AC", c => c.Boolean(nullable: false));
+            AlterColumn("dbo.Machine", "RatedPower", c => c.Int(nullable: false));
+            DropColumn("dbo.Machine", "IsDelete");
+        }
+    }
+}

EVCB_OCPP.Domain/Models/Database/Machine.cs

@@ -113,10 +113,7 @@
         /// </summary>      
         public Guid CustomerId { get; set; }
 
-        /// <summary>
-        /// 是否為AC電源 true為ac，false為dc
-        /// </summary>
-        public bool AC { get; set; }
+ 
 
 
         /// <summary>
@@ -171,8 +168,8 @@
         [StringLength(50)]
         public string FW_CurrentVersion { get; set; }
 
-
-        public int RatedPower { set; get; }
+        [DataType("decimal(6 ,2)")]
+        public decimal RatedPower { set; get; }
 
         /// <summary>
         /// ConnectorType
@@ -199,13 +196,22 @@
         [StringLength(50)]
         public string VendorId { get; set; }
 
-
         /// <summary>
         /// ModelName
         /// </summary>
         [StringLength(50)]
         public string ModelName { get; set; }
 
+        /// <summary>
+        /// Board Versions
+        /// </summary>
+        [StringLength(500)]
+        public string BoardVersions { get; set; }
+
+
+        public bool IsDelete { set; get; }
+
+
 
 
     }

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("e07ea1e")]
+[assembly: AssemblyInformationalVersion("450cd63")]

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("e07ea1e")]
+[assembly: AssemblyInformationalVersion("450cd63")]

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("e07ea1e")]
+[assembly: AssemblyInformationalVersion("450cd63")]