Browse Source

1. 資料庫DLL
a.加入CDFA 計費欄位
b.調整儲存電樁內部模組版本資訊的欄位長度
2.Packet DLL 修正 ChangeConfiguration value長度 500

Jessica Tseng 3 years ago
parent
commit
2e4a9e8e39

+ 22 - 1
EVCB_OCPP.Domain/EVCB_OCPP.Domain.csproj

@@ -214,6 +214,18 @@
     <Compile Include="MainDBContextMigrations\202105310249294_Add_Customer_TTIAAPI_Fields.Designer.cs">
       <DependentUpon>202105310249294_Add_Customer_TTIAAPI_Fields.cs</DependentUpon>
     </Compile>
+    <Compile Include="MainDBContextMigrations\202108100119249_AddCost_Field_TransactionTable.cs" />
+    <Compile Include="MainDBContextMigrations\202108100119249_AddCost_Field_TransactionTable.Designer.cs">
+      <DependentUpon>202108100119249_AddCost_Field_TransactionTable.cs</DependentUpon>
+    </Compile>
+    <Compile Include="MainDBContextMigrations\202108100136463_ModifyLengthBoardVersions_Machine.cs" />
+    <Compile Include="MainDBContextMigrations\202108100136463_ModifyLengthBoardVersions_Machine.Designer.cs">
+      <DependentUpon>202108100136463_ModifyLengthBoardVersions_Machine.cs</DependentUpon>
+    </Compile>
+    <Compile Include="MainDBContextMigrations\202108100251030_Rename_Receipt_TransactionTable.cs" />
+    <Compile Include="MainDBContextMigrations\202108100251030_Rename_Receipt_TransactionTable.Designer.cs">
+      <DependentUpon>202108100251030_Rename_Receipt_TransactionTable.cs</DependentUpon>
+    </Compile>
     <Compile Include="MainDBContextMigrations\Configuration.cs" />
     <Compile Include="MeterValueDBContext.cs" />
     <Compile Include="MeterValueDBContextMigrations\201907150814558_Init.cs" />
@@ -384,6 +396,15 @@
     <EmbeddedResource Include="MainDBContextMigrations\202105310249294_Add_Customer_TTIAAPI_Fields.resx">
       <DependentUpon>202105310249294_Add_Customer_TTIAAPI_Fields.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="MainDBContextMigrations\202108100119249_AddCost_Field_TransactionTable.resx">
+      <DependentUpon>202108100119249_AddCost_Field_TransactionTable.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="MainDBContextMigrations\202108100136463_ModifyLengthBoardVersions_Machine.resx">
+      <DependentUpon>202108100136463_ModifyLengthBoardVersions_Machine.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="MainDBContextMigrations\202108100251030_Rename_Receipt_TransactionTable.resx">
+      <DependentUpon>202108100251030_Rename_Receipt_TransactionTable.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="MeterValueDBContextMigrations\201907150814558_Init.resx">
       <DependentUpon>201907150814558_Init.cs</DependentUpon>
     </EmbeddedResource>
@@ -410,6 +431,6 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PreBuildEvent>GitVersion.exe $(SolutionDir) /updateassemblyinfo</PreBuildEvent>
+    <PreBuildEvent>GitVersion.exe $(ProjectDir) /updateassemblyinfo</PreBuildEvent>
   </PropertyGroup>
 </Project>

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

+ 22 - 0
EVCB_OCPP.Domain/MainDBContextMigrations/202108100119249_AddCost_Field_TransactionTable.cs

@@ -0,0 +1,22 @@
+namespace EVCB_OCPP.Domain.MainDBContextMigrations
+{
+    using System;
+    using System.Data.Entity.Migrations;
+    
+    public partial class AddCost_Field_TransactionTable : DbMigration
+    {
+        public override void Up()
+        {
+            AddColumn("dbo.TransactionRecord", "Cost", c => c.Decimal(nullable: false, precision: 18, scale: 2));
+            AddColumn("dbo.TransactionRecord", "Recipt", c => c.String(maxLength: 500));
+            AddColumn("dbo.TransactionRecord", "Fee", c => c.String(maxLength: 500));
+        }
+        
+        public override void Down()
+        {
+            DropColumn("dbo.TransactionRecord", "Fee");
+            DropColumn("dbo.TransactionRecord", "Recipt");
+            DropColumn("dbo.TransactionRecord", "Cost");
+        }
+    }
+}

File diff suppressed because it is too large
+ 120 - 0
EVCB_OCPP.Domain/MainDBContextMigrations/202108100119249_AddCost_Field_TransactionTable.resx


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

+ 18 - 0
EVCB_OCPP.Domain/MainDBContextMigrations/202108100136463_ModifyLengthBoardVersions_Machine.cs

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

File diff suppressed because it is too large
+ 120 - 0
EVCB_OCPP.Domain/MainDBContextMigrations/202108100136463_ModifyLengthBoardVersions_Machine.resx


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

+ 20 - 0
EVCB_OCPP.Domain/MainDBContextMigrations/202108100251030_Rename_Receipt_TransactionTable.cs

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

File diff suppressed because it is too large
+ 120 - 0
EVCB_OCPP.Domain/MainDBContextMigrations/202108100251030_Rename_Receipt_TransactionTable.resx


+ 1 - 2
EVCB_OCPP.Domain/Models/Database/Machine.cs

@@ -204,8 +204,7 @@
 
         /// <summary>
         /// Board Versions
-        /// </summary>
-        [StringLength(500)]
+        /// </summary>       
         public string BoardVersions { get; set; }
 
 

+ 17 - 0
EVCB_OCPP.Domain/Models/Database/TransactionRecord.cs

@@ -146,6 +146,23 @@
         /// </summary>
         public bool UploadedtoTTIA { set; get; }
 
+        [DataType("decimal(16 ,2)")]
+        public decimal Cost { set; get; }
+
+        /// <summary>
+        /// 收費明細
+        /// </summary>
+        [StringLength(500)]
+        public string Receipt { set; get; }
+
+        /// <summary>
+        /// 收費標準
+        /// </summary>
+        [StringLength(500)]
+        public string Fee { set; get; }
+
+
+
 
 
     }

+ 1 - 1
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("df397fc")]
+[assembly: AssemblyInformationalVersion("69ed52f")]

+ 1 - 1
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("df397fc")]
+[assembly: AssemblyInformationalVersion("69ed52f")]

+ 1 - 1
EVCB_OCPP.Packet/Messages/Core/ChangeConfigurationRequest.cs

@@ -27,7 +27,7 @@ namespace EVCB_OCPP.Packet.Messages.Core
 
         [DisplayFormat(ConvertEmptyStringToNull = false)]
         [Required(AllowEmptyStrings = true)]
-        [MaxLength(50)]
+        [MaxLength(500)]
         public string value { set; get; }
 
         public bool TransactionRelated()

+ 1 - 1
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("df397fc")]
+[assembly: AssemblyInformationalVersion("69ed52f")]

+ 1 - 1
EVCB_OCPP.Packet20/Properties/AssemblyInfo.cs

@@ -33,4 +33,4 @@ using System.Runtime.InteropServices;
 // [assembly: AssemblyVersion("0.1.0.0")]
 [assembly: AssemblyVersion("0.1.0.0")]
 [assembly: AssemblyFileVersion("0.1.0.0")]
-[assembly: AssemblyInformationalVersion("df397fc")]
+[assembly: AssemblyInformationalVersion("69ed52f")]

Some files were not shown because too many files changed in this diff