Эх сурвалжийг харах

2020/01/16 Jessica 7972
Actions:
1. Add Session and EndPoint Columns in MachineConnectionLog Table
2. Add Exists Columns in MachineConfigure Table
3. Remove the setting which divide configure in group

Modified Files:
1.~\EVCB_OCPP.Domain\Models\Database
2.~\EVCB_OCPP.Domain\Models\Database
3.1.~\EVCB_OCPP.Packet\Features

Jessica.Tseng 5 жил өмнө
parent
commit
59a77e290a

+ 2 - 1
EVCB_OCPP.Domain/App.config

@@ -18,5 +18,6 @@
     <add name="ConnectionLogDBContext" connectionString="data source=172.1.2.187\SQLEXPRESS2017;initial catalog=StandardOCPP_ConnectionLog;persist security info=True;user id=sa;password=Ph0930118811;MultipleActiveResultSets=True;App=EntityFramework" providerName="System.Data.SqlClient" />
     <add name="MainDBContext" connectionString="data source=172.1.2.187\SQLEXPRESS2017;initial catalog=StandardOCPP_Main;;persist security info=True;user id=sa;password=Ph0930118811;MultipleActiveResultSets=True;App=EntityFramework" providerName="System.Data.SqlClient" />
     <add name="MeterValueDBContext" connectionString="data source=172.1.2.187\SQLEXPRESS2017;initial catalog=StandardOCPP_MeterValue;;persist security info=True;user id=sa;password=Ph0930118811;MultipleActiveResultSets=True;App=EntityFramework" providerName="System.Data.SqlClient" />
-  </connectionStrings>
+   
+</connectionStrings>
 </configuration>

+ 29 - 0
EVCB_OCPP.Domain/ConnectionLogContextMigrations/202001160213414_Add_EVSE_Session_EndPoint.Designer.cs

@@ -0,0 +1,29 @@
+// <auto-generated />
+namespace EVCB_OCPP.Domain.ConnectionLogContextMigrations
+{
+    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 Add_EVSE_Session_EndPoint : IMigrationMetadata
+    {
+        private readonly ResourceManager Resources = new ResourceManager(typeof(Add_EVSE_Session_EndPoint));
+        
+        string IMigrationMetadata.Id
+        {
+            get { return "202001160213414_Add_EVSE_Session_EndPoint"; }
+        }
+        
+        string IMigrationMetadata.Source
+        {
+            get { return null; }
+        }
+        
+        string IMigrationMetadata.Target
+        {
+            get { return Resources.GetString("Target"); }
+        }
+    }
+}

+ 20 - 0
EVCB_OCPP.Domain/ConnectionLogContextMigrations/202001160213414_Add_EVSE_Session_EndPoint.cs

@@ -0,0 +1,20 @@
+namespace EVCB_OCPP.Domain.ConnectionLogContextMigrations
+{
+    using System;
+    using System.Data.Entity.Migrations;
+    
+    public partial class Add_EVSE_Session_EndPoint : DbMigration
+    {
+        public override void Up()
+        {
+            AddColumn("dbo.MachineConnectionLog", "EVSEEndPoint", c => c.String(maxLength: 25));
+            AddColumn("dbo.MachineConnectionLog", "Session", c => c.String(maxLength: 36));
+        }
+        
+        public override void Down()
+        {
+            DropColumn("dbo.MachineConnectionLog", "Session");
+            DropColumn("dbo.MachineConnectionLog", "EVSEEndPoint");
+        }
+    }
+}

+ 126 - 0
EVCB_OCPP.Domain/ConnectionLogContextMigrations/202001160213414_Add_EVSE_Session_EndPoint.resx

@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Target" xml:space="preserve">
+    <value>H4sIAAAAAAAEAM1YzW7jNhC+F+g7CDpnLdtpFttA3kUiO0XQODZW2VwLWhorRClSFanAfrY99JH6Ch3qX7KsWKlb9GaRnG9++c3Qf33/0/6yC5nxCrGkgs/MyWhsGsA94VMezMxEbT98Mr98/vEHe+GHO+O5OHepz6EklzPzRano2rKk9wIhkaOQerGQYqtGnggt4gtrOh7/bE0mFiCEiViGYX9NuKIhpB/46QjuQaQSwpbCBybzddxxU1TjkYQgI+LBzFw8O7e/rZz1ejQXIaHcNG4YJWiHC2xrGoRzoYhCK6+/SXBVLHjgRrhA2NM+Ajy3JUxCbv11dfxUR8ZT7YhVCRZQXiIVWjQMcHKZR8Zqi78rvmYZOYzdAmOs9trrNH4zc0m8F8oBo83B0zoeRGAabcXXDou10GGoR1l2RnOiyIZIGHUBXhhtsYuybsYjLLDR+MJwEqaSGGYcEhUTdmGskw2j3q+wfxK/A5/xhLG6L+gN7jUWcGkdiwhitf8K29zDe980rKac1RYsxWoymb/3XH38yTQeUTnZMChLpRYbV4kYfgEOMVHgr4lSEHONAWmwD7S3dDkvJA7gVuwqpViieNdMY0l2D8AD9YK3cPrJNO7oDvxiJTfkG6d4NVFIxQm8pWsJUpIAtJYeXVfjM6jSBdGj4/Lj+BxaljLoUTI9iw4nBp3YFS80oWvwhFTVURb9SPfSxZooYG6FYED4YJTFs7tYcH8taIXV5fzVGXx3sWBS4ulJ5GA1tlXR0CE5IXMoZAiIi/DXmWR+q7dhpzo4Crk9pymZa226lsG7oHqprzItax+dhNbtT2l51ausrFkVTc060tXsJYkijGyty+Urhpu1OOeDO5z9wwzD8mRHEyitLTUhjyE5tHZ1Any4o7FUBcebhuOHHcc683QkB4XSnlS0qb3KTCGsfxd3ot2WTkCsonyHjod4NdMYQGnkaYalQK5HGIk72ogjWBLyY62oT7rRGOowjY3T8RrkX8drbJyOlzF8HShbGWCRZu+GJTIYFKGKmRvxqZZPxyq4uZGvfO10lCY317GaO6cjlgxcBysXD3Fsq1XT7WtkHdyj1nDUvqN9TNc+UmovGa/FbHbOMm8P9Qe0kx0xDQzQK/U15bh7qSBMZ8+R+wdzGE3TVRxYEk63IFU2P+I0MJm2Xgb/nyndktJn7xjV//OBeEODtILfnHoHTjUdYzB/JbGHy4eDcIX9zqm3E1rPvcOQ60NuJ2Q25g40t5ppOzGnwyEPRlgfP9U/H2E3VJ1lfO3282qom61p9UhG+lGHDqft2ehfnDkzAsTkbQS6mDlw1un0kJttq/63jD0HSYMKwq7UVqDFmXu+FUV+MAB1i4ojB/dUESxMchMruiWewm1PZ1S/OJ4JS3TxhBvw7/kqUVGibqSEcMMaL2zb6tefjuBNm+1VpL/kOVxAM6m+Wyt+m1Dml3bfHd6MYxC6pHJeRavwxYVwwb5EehT8RKA8fHOIgGtWfoIwYggmV9wlr/Ae2/CJ9QAB8fZFiz0O8nYimmG355QEMQlljlHJ678aLf1f4+e/AYy708WdFAAA</value>
+  </data>
+  <data name="DefaultSchema" xml:space="preserve">
+    <value>dbo</value>
+  </data>
+</root>

+ 16 - 0
EVCB_OCPP.Domain/DefaultSetting.cs

@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace EVCB_OCPP.Domain
+{
+    public static class DefaultSetting
+    {
+        /// <summary>
+        /// 預設 Null的 DateTime 
+        /// </summary>
+        public static DateTime DefaultNullTime = new DateTime(1991, 1, 1);
+    }
+}

+ 17 - 2
EVCB_OCPP.Domain/EVCB_OCPP.Domain.csproj

@@ -17,7 +17,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
+    <OutputPath>..\bin\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -25,7 +25,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
+    <OutputPath>..\bin\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -70,8 +70,13 @@
     <Compile Include="ConnectionLogContextMigrations\201912160853002_Add_Fields_IsSent.Designer.cs">
       <DependentUpon>201912160853002_Add_Fields_IsSent.cs</DependentUpon>
     </Compile>
+    <Compile Include="ConnectionLogContextMigrations\202001160213414_Add_EVSE_Session_EndPoint.cs" />
+    <Compile Include="ConnectionLogContextMigrations\202001160213414_Add_EVSE_Session_EndPoint.Designer.cs">
+      <DependentUpon>202001160213414_Add_EVSE_Session_EndPoint.cs</DependentUpon>
+    </Compile>
     <Compile Include="ConnectionLogContextMigrations\Configuration.cs" />
     <Compile Include="ConnectionLogDBContext.cs" />
+    <Compile Include="DefaultSetting.cs" />
     <Compile Include="MainDBContext.cs" />
     <Compile Include="MainDBContextMigrations\201907180821556_Init.cs" />
     <Compile Include="MainDBContextMigrations\201907180821556_Init.Designer.cs">
@@ -149,6 +154,10 @@
     <Compile Include="MainDBContextMigrations\201912170616522_Modify_ServerMessage_MachineOperate_FieldLength.Designer.cs">
       <DependentUpon>201912170616522_Modify_ServerMessage_MachineOperate_FieldLength.cs</DependentUpon>
     </Compile>
+    <Compile Include="MainDBContextMigrations\202001130345443_Add_Column_MachineConfiure_Exists.cs" />
+    <Compile Include="MainDBContextMigrations\202001130345443_Add_Column_MachineConfiure_Exists.Designer.cs">
+      <DependentUpon>202001130345443_Add_Column_MachineConfiure_Exists.cs</DependentUpon>
+    </Compile>
     <Compile Include="MainDBContextMigrations\Configuration.cs" />
     <Compile Include="MeterValueDBContext.cs" />
     <Compile Include="MeterValueDBContextMigrations\201907150814558_Init.cs" />
@@ -217,6 +226,9 @@
     <EmbeddedResource Include="ConnectionLogContextMigrations\201912160853002_Add_Fields_IsSent.resx">
       <DependentUpon>201912160853002_Add_Fields_IsSent.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="ConnectionLogContextMigrations\202001160213414_Add_EVSE_Session_EndPoint.resx">
+      <DependentUpon>202001160213414_Add_EVSE_Session_EndPoint.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="MainDBContextMigrations\201907180821556_Init.resx">
       <DependentUpon>201907180821556_Init.cs</DependentUpon>
     </EmbeddedResource>
@@ -274,6 +286,9 @@
     <EmbeddedResource Include="MainDBContextMigrations\201912170616522_Modify_ServerMessage_MachineOperate_FieldLength.resx">
       <DependentUpon>201912170616522_Modify_ServerMessage_MachineOperate_FieldLength.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="MainDBContextMigrations\202001130345443_Add_Column_MachineConfiure_Exists.resx">
+      <DependentUpon>202001130345443_Add_Column_MachineConfiure_Exists.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="MeterValueDBContextMigrations\201907150814558_Init.resx">
       <DependentUpon>201907150814558_Init.cs</DependentUpon>
     </EmbeddedResource>

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

+ 18 - 0
EVCB_OCPP.Domain/MainDBContextMigrations/202001130345443_Add_Column_MachineConfiure_Exists.cs

@@ -0,0 +1,18 @@
+namespace EVCB_OCPP.Domain.MainDBContextMigrations
+{
+    using System;
+    using System.Data.Entity.Migrations;
+    
+    public partial class Add_Column_MachineConfiure_Exists : DbMigration
+    {
+        public override void Up()
+        {
+            AddColumn("dbo.MachineConfigures", "Exists", c => c.Boolean(nullable: false));
+        }
+        
+        public override void Down()
+        {
+            DropColumn("dbo.MachineConfigures", "Exists");
+        }
+    }
+}

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 120 - 0
EVCB_OCPP.Domain/MainDBContextMigrations/202001130345443_Add_Column_MachineConfiure_Exists.resx


+ 14 - 0
EVCB_OCPP.Domain/Models/Database/MachineConfigure.cs

@@ -10,6 +10,15 @@ namespace EVCB_OCPP.Domain.Models.Database
 {
     public class MachineConfigure
     {
+        public MachineConfigure()
+        {
+            Exists = false;
+            ReadOnly = true;
+            ConfigureSetting = string.Empty;
+
+
+        }
+
         [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
         [Key]
         public Int32 Id { set; get; }
@@ -17,6 +26,11 @@ namespace EVCB_OCPP.Domain.Models.Database
         [StringLength(128)]
         public string ChargeBoxId { get; set; }
 
+        /// <summary>
+        /// 電樁是否存在此設定值
+        /// </summary>
+        public bool Exists { set; get; }
+
         /// <summary>
         /// 存取限制 
         /// </summary>

+ 13 - 0
EVCB_OCPP.Domain/Models/Database/MachineConnectionLog.cs

@@ -53,5 +53,18 @@ namespace EVCB_OCPP.Domain.Models.Database
         /// 傳出訊息
         /// </summary>
         public bool IsSent { set; get; }
+
+        /// <summary>
+        /// 電樁 EndPoint 
+        /// </summary>
+        [StringLength(25)]
+        public string EVSEEndPoint { get; set; }
+
+
+        /// <summary>
+        /// Session
+        /// </summary>
+        [StringLength(36)]
+        public string Session { get; set; }
     }
 }

+ 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("0.1.0+6.Branch.master.Sha.6ec1d5c4c98507245ccdd89f07020334a321fe31")]
+[assembly: AssemblyInformationalVersion("40aaad4")]

+ 2 - 3
EVCB_OCPP.Packet/EVCB_OCPP.Packet.csproj

@@ -17,7 +17,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
+    <OutputPath>..\bin\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -25,7 +25,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
+    <OutputPath>..\bin\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -214,7 +214,6 @@
     <Compile Include="Messages\SubTypes\UpdateType.cs" />
     <Compile Include="Messages\SubTypes\ValueFormat.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Utilities\ConfigureHelper.cs" />
     <Compile Include="Utilities\FormatHelper.cs" />
     <Compile Include="Utilities\UTCDateTimeConverter.cs" />
   </ItemGroup>

+ 48 - 39
EVCB_OCPP.Packet/Features/StandardConfiguration.cs

@@ -74,7 +74,7 @@ namespace OCPPPackage.Profiles
         public const string TransactionMessageRetryInterval = "TransactionMessageRetryInterval";
 
         public const string UnlockConnectorOnEVSideDisconnect = "UnlockConnectorOnEVSideDisconnect";
-       
+
         public const string WebSocketPingInterval = "WebSocketPingInterval";
 
         #endregion
@@ -104,57 +104,47 @@ namespace OCPPPackage.Profiles
         public const string MaxChargingProfilesInstalled = "MaxChargingProfilesInstalled";
         #endregion
 
+   
 
-        public static readonly List<string> CoreProfileConfigs_1of2 = new List<string>()
-        {
-           AllowOfflineTxForUnknownId,
-           AuthorizationCacheEnabled,
-           AuthorizeRemoteTxRequests,
-           BlinkRepeat,
-           ClockAlignedDataInterval,
-           ConnectionTimeOut,
-           ConnectorPhaseRotation,
-           ConnectorPhaseRotationMaxLength,
-           GetConfigurationMaxKeys,
-           HeartbeatInterval,
-           LightIntensity,
-           LocalAuthorizeOffline,
-           LocalPreAuthorize,
-           MaxEnergyOnInvalidId,
-           MeterValuesAlignedData,
-           MeterValuesAlignedDataMaxLength,
-           MeterValuesSampledData,
-           MeterValuesSampledDataMaxLength,
-          
 
-        };
+       
 
-        public static readonly List<string> CoreProfileConfigs_2of2 = new List<string>()
+        public static readonly List<string> AllConfigs = new List<string>()
         {
-    
-           MeterValueSampleInterval,
-           MinimumStatusDuration,
+           GetConfigurationMaxKeys,
+           SupportedFeatureProfiles,
            NumberOfConnectors,
-           MinimumStatusDuration,
-           ResetRetries,
+           SupportedFeatureProfilesMaxLength,
            StopTransactionOnEVSideDisconnect,
            StopTransactionOnInvalidId,
            StopTxnAlignedData,
            StopTxnAlignedDataMaxLength,
            StopTxnSampledData,
-           StopTxnSampledDataMaxLength,
-           SupportedFeatureProfiles,
-           SupportedFeatureProfilesMaxLength,
+           StopTxnSampledDataMaxLength,   
            TransactionMessageAttempts,
            TransactionMessageRetryInterval,
+           MaxEnergyOnInvalidId,
+           MeterValuesAlignedData,
+           MeterValuesAlignedDataMaxLength,
+           MeterValuesSampledData,
+           MeterValuesSampledDataMaxLength,
+           WebSocketPingInterval,
+           MeterValueSampleInterval,
+           MinimumStatusDuration,       
            UnlockConnectorOnEVSideDisconnect,
-           WebSocketPingInterval
-
-        };
-
-
-        public static readonly List<string> OtherConfigs = new List<string>()
-        {
+           ResetRetries,
+           AllowOfflineTxForUnknownId,
+           AuthorizationCacheEnabled,
+           AuthorizeRemoteTxRequests,
+           BlinkRepeat,
+           ClockAlignedDataInterval,
+           ConnectionTimeOut,
+           ConnectorPhaseRotation,
+           ConnectorPhaseRotationMaxLength,       
+           HeartbeatInterval,
+           LightIntensity,
+           LocalAuthorizeOffline,
+           LocalPreAuthorize,
            LocalAuthListEnabled,
            LocalAuthListMaxLength,
            SendLocalListMaxLength,
@@ -165,9 +155,28 @@ namespace OCPPPackage.Profiles
            ConnectorSwitch3to1PhaseSupported,
            MaxChargingProfilesInstalled,
 
+
+
         };
 
+
+        public static bool Contains(List<string> configs)
+        {
+            foreach (var item in configs)
+            {
+                if (!AllConfigs.Contains(item))
+                    return false;
+            }
+
+            return true;
+
+        }
+
        
 
+
+     
+
+
     }
 }

+ 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("0.1.0+6.Branch.master.Sha.6ec1d5c4c98507245ccdd89f07020334a321fe31")]
+[assembly: AssemblyInformationalVersion("40aaad4")]

+ 0 - 29
EVCB_OCPP.Packet/Utilities/ConfigureHelper.cs

@@ -1,29 +0,0 @@
-
-using EVCB_OCPP.Packet.Utilities;
-using EVCB_OCPP.Packet.Messages.SubTypes;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace EVCB_OCPP.Packet.Utilities
-{
-    public static class ConfigureHelper
-    {
-        public static IConfiguration GetConfig(Dictionary<string,string> configkeyvalue)
-        {
-
-            return null;
-        }
-
-        public static Dictionary<string, string> GetConfigDic(IConfiguration config)
-        {
-
-            return null;
-        }
-
-      
-
-    }
-}

Энэ ялгаанд хэт олон файл өөрчлөгдсөн тул зарим файлыг харуулаагүй болно