add StartSOC StopSOC

EVCB_OCPP.TaskScheduler/Models/Transaction.cs

@@ -112,7 +112,15 @@ namespace EVCB_OCPP.TaskScheduler.Models
         /// </summary>
         public string Fee { set; get; }
 
+        /// <summary>
+        ///StartSOC
+        /// </summary>
+        public string StartSOC { set; get; }
 
+        /// <summary>
+        ///StopSOC
+        /// </summary>
+        public string StopSOC { set; get; }
 
         /// <summary>
         /// 收據

EVCB_OCPP.TaskScheduler/Services/CommonCustomerService.cs

@@ -15,7 +15,7 @@ namespace EVCB_OCPP.TaskScheduler.Services
 {
     public class CommonCustomerService : ICustomerService
     {
-        private readonly ILogger logger;
+        private readonly ILogger<CommonCustomerService> logger;
         private readonly DatabaseService _dbService;// = new DatabaseService();
         private readonly OuterHttpClient httpClient;//= new OuterHttpClient();
         private Guid customerId = Guid.Empty;
@@ -26,11 +26,15 @@ namespace EVCB_OCPP.TaskScheduler.Services
         private ParallelOptions po = new ParallelOptions();
         private int ChargeRecordCallCounter = 0;
 
-        public CommonCustomerService(DatabaseService databaseService,ILoggerProvider loggerProvider)
+        public CommonCustomerService(
+            DatabaseService databaseService,
+            ILogger<CommonCustomerService> logger,
+            ILogger<OuterHttpClient> clogger
+            )
         {
             this._dbService = databaseService;
-            this.logger = loggerProvider.CreateLogger(nameof(CommonCustomerService));
-            this.httpClient = new OuterHttpClient(loggerProvider.CreateLogger(nameof(OuterHttpClient)));
+            this.logger = logger;// loggerProvider.CreateLogger(nameof(CommonCustomerService));
+            this.httpClient = new OuterHttpClient(clogger);
         }
 
         public async Task SetCustomerId(Guid customerId)
@@ -250,10 +254,13 @@ namespace EVCB_OCPP.TaskScheduler.Services
                                     Receipt = r.Receipt,
                                     TotalCost = r.Cost,
                                     Fee = r.Fee,
-                                    CarNum = CarNum
-                                };
+                                    CarNum = CarNum,
 
+                                    StartSOC = r.StartSOC,
+                                    StopSOC = r.StopSOC,
+                                };
 
+                                logger.LogDebug(JsonConvert.SerializeObject(request, DefaultSetting.JSONSERIALIZER_FORMAT));
 
                                 var response = await httpClient.Post(_partnerAPIRoot + "completed_session", new Dictionary<string, string>()
                             {

EVCB_OCPP.TaskScheduler/Services/DatabaseService.cs

@@ -159,7 +159,7 @@ public class DatabaseService
                 if (isgoing)
                 {
                     sqlString = $"""
-                        SELECT Top({size}) Id,ReservationId, ChargeBoxId,ConnectorId,StartTime,MeterStart,StartIdTag 
+                        SELECT Top({size}) Id,ReservationId, ChargeBoxId,ConnectorId,StartTime,MeterStart,StartIdTag,StartSOC,StopSOC 
                         FROM [dbo].[TransactionRecord]
                         WHERE CustomerId=@CustomerId and StopTime='1991/1/1' and StartTransactionReportedOn='1991/1/1'
                         """;
@@ -169,7 +169,7 @@ public class DatabaseService
                     if (customerId == new Guid("009E603C-79CD-4620-A2B8-D9349C0E8AD8"))
                     {
                         sqlString = $"""
-                            SELECT Top({size}) Id,ReservationId,ChargeBoxId,ConnectorId,StartTime,StopTime,MeterStart,MeterStop,StartIdTag ,StopReasonId,Receipt,Cost,Fee 
+                            SELECT Top({size}) Id,ReservationId,ChargeBoxId,ConnectorId,StartTime,StopTime,MeterStart,MeterStop,StartIdTag ,StopReasonId,Receipt,Cost,Fee,StartSOC,StopSOC 
                             FROM [dbo].[TransactionRecord] 
                             WHERE CustomerId=@CustomerId and StopTime!='1991/1/1' and StopTransactionReportedOn='1991/1/1' and  BillingDone=1
                             """;
@@ -177,7 +177,7 @@ public class DatabaseService
                     else
                     {
                         sqlString = $"""
-                            SELECT Top({size}) Id,ReservationId,ChargeBoxId,ConnectorId,StartTime,StopTime,MeterStart,MeterStop,StartIdTag ,StopReasonId,Receipt,Cost,Fee 
+                            SELECT Top({size}) Id,ReservationId,ChargeBoxId,ConnectorId,StartTime,StopTime,MeterStart,MeterStop,StartIdTag ,StopReasonId,Receipt,Cost,Fee,StartSOC,StopSOC 
                             FROM [dbo].[TransactionRecord] 
                             WHERE CustomerId=@CustomerId and StopTime!='1991/1/1' and StopTransactionReportedOn='1991/1/1' 
                             """;
@@ -228,12 +228,12 @@ public class DatabaseService
         //    """;
         string sqlString = $"""
             WITH CTE AS (
-                SELECT Id,CustomerId,ReservationId,ChargeBoxId,ConnectorId,StartTime,StopTime,MeterStart,MeterStop,StartIdTag ,StopReasonId,Receipt,Cost,Fee 
+                SELECT Id,CustomerId,ReservationId,ChargeBoxId,ConnectorId,StartTime,StopTime,MeterStart,MeterStop,StartIdTag ,StopReasonId,Receipt,Cost,Fee,StartSOC,StopSOC 
                 	, ROW_NUMBER() OVER (PARTITION BY CustomerId ORDER BY Id desc) AS RowNum
                 FROM [dbo].[TransactionRecord] 
                 WHERE StopTime!='1991/1/1' and StopTransactionReportedOn='1991/1/1'
             )
-            SELECT Id,CustomerId,ReservationId,ChargeBoxId,ConnectorId,StartTime,StopTime,MeterStart,MeterStop,StartIdTag ,StopReasonId,Receipt,Cost,Fee
+            SELECT Id,CustomerId,ReservationId,ChargeBoxId,ConnectorId,StartTime,StopTime,MeterStart,MeterStop,StartIdTag ,StopReasonId,Receipt,Cost,Fee,StartSOC,StopSOC
             FROM CTE
             WHERE RowNum < {size};
             """;

version.txt

@@ -1 +1 @@
-DockerTrans_v1.0.0
+DockerTrans_v1.0.1