Add Centered Db Context

EVCB_OCPP.TaskScheduler/EVCB_OCPP.TaskScheduler.csproj

@@ -15,6 +15,8 @@
     <PackageReference Include="Dapper.Transaction" Version="2.0.123" />
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
     <PackageReference Include="Microsoft.Data.SqlClient" Version="5.0.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.5" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.5" />
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.0" />
     <PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.17.0" />
@@ -28,8 +30,13 @@
     <PackageReference Include="System.ServiceModel.Duplex" Version="4.10.0" />
     <PackageReference Include="System.ServiceModel.NetTcp" Version="4.10.0" />
     <PackageReference Include="System.ServiceModel.Federation" Version="4.10.0" />
-    <PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.355802">
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="DLL\" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="EVCB_OCPP.Domain">
+      <HintPath>DLL\EVCB_OCPP.Domain.dll</HintPath>
+    </Reference>
   </ItemGroup>
 </Project>

EVCB_OCPP.TaskScheduler/Helper/AddPortalDbContext.cs

@@ -0,0 +1,143 @@
+using EVCB_OCPP.Domain;
+using Microsoft.Data.SqlClient;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Polly;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace EVCB_OCPP.TaskScheduler.Helper;
+
+public static class AddPortalDbContext
+{
+    public const string CommandTimeoutKey = "CommandTimeout";
+    public static IServiceCollection AddMainDbContext(this IServiceCollection services, IConfiguration configuration)
+    {
+        const string DbUserIdKey = "MainDbUserIdKey";
+        const string DbPassKey = "MainDbPass";
+        const string DbConnectionStringKey = "MainDBContext";
+
+        var conneciotnString = GetConnectionString(configuration, DbUserIdKey, DbPassKey, DbConnectionStringKey);
+
+        services.AddSingleton(
+            new SqlConnectionFactory<MainDBContext>()
+            {
+                ConnectionString = conneciotnString
+            });
+        AddPortalDbContextInternal<MainDBContext>(services, configuration, conneciotnString, logToConsole: false);
+        return services;
+    }
+
+    public static IServiceCollection AddMeterValueDbContext(this IServiceCollection services, IConfiguration configuration)
+    {
+        const string DbUserIdKey = "MeterValueDbUserId";
+        const string DbPassKey = "MeterValueDbPass";
+        const string DbConnectionStringKey = "MeterValueDBContext";
+
+        var conneciotnString = GetConnectionString(configuration, DbUserIdKey, DbPassKey, DbConnectionStringKey);
+        services.AddSingleton(
+            new SqlConnectionFactory<MeterValueDBContext>()
+            {
+                ConnectionString = conneciotnString
+            });
+        AddPortalDbContextInternal<MeterValueDBContext>(services, configuration, conneciotnString, logToConsole: false);
+        return services;
+    }
+
+    public static IServiceCollection AddConnectionLogDbContext(this IServiceCollection services, IConfiguration configuration)
+    {
+        const string DbUserIdKey = "ConnectionLogDbUserId";
+        const string DbPassKey = "ConnectionLogDbPass";
+        const string DbConnectionStringKey = "ConnectionLogDBContext";
+
+        var conneciotnString = GetConnectionString(configuration, DbUserIdKey, DbPassKey, DbConnectionStringKey);
+        services.AddSingleton(
+            new SqlConnectionFactory<ConnectionLogDBContext>()
+            {
+                ConnectionString = conneciotnString
+            });
+        AddPortalDbContextInternal<ConnectionLogDBContext>(services, configuration, conneciotnString);
+        return services;
+    }
+
+    public static IServiceCollection AddWebDBConetext(this IServiceCollection services, IConfiguration configuration)
+    {
+        const string DbUserIdKey = "WebDbUserId";
+        const string DbPassKey = "WebDbPass";
+        const string DbConnectionStringKey = "WebDBContext";
+
+        var conneciotnString = GetConnectionString(configuration, DbUserIdKey, DbPassKey, DbConnectionStringKey);
+        services.AddSingleton(
+            new SqlConnectionFactory<WebDBConetext>()
+            {
+                ConnectionString = conneciotnString
+            });
+        return services;
+    }
+
+    public static IServiceCollection AddOnlineLogDBContext(this IServiceCollection services, IConfiguration configuration)
+    {
+        const string DbUserIdKey = "OnlineLogDbUserId";
+        const string DbPassKey = "OnlineLogDbPass";
+        const string DbConnectionStringKey = "OnlineLogDBContext";
+
+        var conneciotnString = GetConnectionString(configuration, DbUserIdKey, DbPassKey, DbConnectionStringKey);
+        services.AddSingleton(
+            new SqlConnectionFactory<OnlineLogDBContext>()
+            {
+                ConnectionString = conneciotnString
+            });
+        return services;
+    }
+    private static void AddPortalDbContextInternal<T>(
+        IServiceCollection services, IConfiguration configuration,
+        string connectionString, bool logToConsole = false) where T : DbContext
+    {
+
+        var commandTimeout = int.TryParse(configuration[CommandTimeoutKey], out var temp) ? temp : 180;
+
+        services.AddPooledDbContextFactory<T>((serviceProvider, options) => {
+            options.UseSqlServer(connectionString, dbOptions =>
+            {
+                dbOptions.CommandTimeout(commandTimeout);
+            });
+            if (logToConsole)
+            {
+                options.LogTo(Console.WriteLine);
+            }
+        });
+    }
+
+    private static string GetConnectionString(IConfiguration configuration, string UserIdKey, string DbPassKey, string ConnectionStringKey)
+    {
+        string mainDbUserId = string.IsNullOrEmpty(configuration[UserIdKey]) ? string.Empty : $"user id={configuration[UserIdKey]};";
+        string mainDbUserPass = string.IsNullOrEmpty(configuration[DbPassKey]) ? string.Empty : $"password={configuration[DbPassKey]};";
+        return $"{configuration.GetConnectionString(ConnectionStringKey)}{mainDbUserId}{mainDbUserPass}";
+    }
+}
+
+public class SqlConnectionFactory<T> where T : DbContext
+{
+    public string ConnectionString { get; init; }
+    public SqlConnectionFactory() { }
+    public SqlConnection Create()
+    {
+        var sqlConnection = new SqlConnection(ConnectionString);
+        sqlConnection.Open();
+        return sqlConnection;
+    }
+}
+
+/// <summary>
+/// Dummy
+/// </summary>
+public class WebDBConetext : DbContext { }
+
+/// <summary>
+/// Dummy
+/// </summary>
+public class OnlineLogDBContext : DbContext { }

EVCB_OCPP.TaskScheduler/Jobs/CheckEVSEOnlineJob.cs

@@ -1,15 +1,15 @@
 using Dapper;
-using EVCB_OCPP.TaskScheduler.Helper;
 using EVCB_OCPP.TaskScheduler.Models;
-using Microsoft.Data.SqlClient;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.Logging;
 using Quartz;
 using System;
 using System.Collections.Generic;
-using System.Data;
 using System.Linq;
 using System.Threading.Tasks;
+using Microsoft.Data.SqlClient;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Configuration;
+using EVCB_OCPP.TaskScheduler.Helper;
+using EVCB_OCPP.Domain;
 
 namespace EVCB_OCPP.TaskScheduler.Jobs
 {
@@ -20,144 +20,48 @@ namespace EVCB_OCPP.TaskScheduler.Jobs
     public class CheckEVSEOnlineJob : IJob
     {
         private readonly ILogger logger;
-        private readonly List<EVSEOnlineRecord> updateData = new List<EVSEOnlineRecord>();
-        private readonly List<EVSEOnlineRecord> insertData = new List<EVSEOnlineRecord>();
-        private readonly string mainDBConnectString;// = ConfigurationManager.ConnectionStrings["MainDBContext"].ToString();
-        private readonly string onlineDBConnectString;// = ConfigurationManager.ConnectionStrings["OnlineLogDBContext"].ToString();
-        private DateTime latestHeartbeatTime = DateTime.UtcNow;
+        private readonly SqlConnectionFactory<MainDBContext> mainDbConnectionFactory;
+        private readonly SqlConnectionFactory<OnlineLogDBContext> onlineLogDbConnectionFactory;
+
+        //private readonly string mainDBConnectString;
+        //private readonly string onlineDBConnectString;
+
+        private DateTime latestHeartbeatTime = DateTime.Now;
+        private List<EVSEOnlineRecord> updateData = new List<EVSEOnlineRecord>();
+        private List<EVSEOnlineRecord> insertData = new List<EVSEOnlineRecord>();
 
-        public CheckEVSEOnlineJob(IConfiguration configuration, ILogger<CheckEVSEOnlineJob> logger)
+        public CheckEVSEOnlineJob(
+            ILogger<CheckEVSEOnlineJob> logger,
+            SqlConnectionFactory<MainDBContext> mainDbConnectionFactory,
+            SqlConnectionFactory<OnlineLogDBContext> onlineLogDbConnectionFactory)
         {
             this.logger = logger;
-
-            mainDBConnectString = configuration.GetConnectionString("MainDBContext");
-            onlineDBConnectString = configuration.GetConnectionString("OnlineLogDBContext");
-            CreateEVSEOnlineRecordTable();
+            this.mainDbConnectionFactory = mainDbConnectionFactory;
+            this.onlineLogDbConnectionFactory = onlineLogDbConnectionFactory;
+            //this.mainDBConnectString = configuration.GetConnectionString("MainDBContext");
+            //this.onlineDBConnectString = configuration.GetConnectionString("OnlineLogDBContext");
         }
-        //測試方式
-
-        // A: 假裝更新心跳包
-        // B: 一直開著程式  / 一段時間關程式(關掉時間點 online/offline)
-
 
         public async Task Execute(IJobExecutionContext context)
         {
-            using var timer = TimerHelper.Start(this.ToString(), logger);
+            logger.LogDebug(this.ToString() + " :Starting........");
             try
             {
-                List<EVSECurrentStatus> _EVSEs = await GetEVSEs();
+                List<EVSECurrentStatus> _EVSEs = GetEVSEs();
                 var checktime = DateTime.UtcNow.AddDays(-3);
                 _EVSEs = _EVSEs.Where(x => x.HeartbeatUpdatedOn > checktime).ToList();
 
                 foreach (var evse in _EVSEs)
                 {
-                    latestHeartbeatTime = evse.HeartbeatUpdatedOn;
+
                     if (IsOnlineNow(evse))
                     {
-                        if (evse.Online)
-                        {
-
-                            if (latestHeartbeatTime.Minute % 10 == 0)
-                            {
-                                //on-on
-                                //現在是整點，找上一筆填入end time and insert start time 
-
-                                //  var _pickDate = currentTime.AddHours(-1);
-                                var _pickDate = latestHeartbeatTime;
-                                bool isCrossDay = false;
-                                int _startHour = _pickDate.AddHours(-6).Hour; //往回巡視六個小時前紀錄
-
-
-
-                                //跨日處理
-                                if (_startHour > _pickDate.Hour)
-                                {
-                                    isCrossDay = true;
-
-                                }
-
-                                var _picks = await GetOnlineRecords(_pickDate, evse.CustomerId.ToString(), evse.ChargeBoxId, isCrossDay ? 0 : _startHour, _pickDate.Hour);
-
-                                if (isCrossDay)
-                                {
-                                    var _picksCrossData = await GetOnlineRecords(_pickDate.AddHours(-6), evse.CustomerId.ToString(), evse.ChargeBoxId, _startHour, 23);
-                                    _picks.AddRange(_picksCrossData);
-                                }
-
-                                _picks = _picks.OrderBy(x => x.OnlineTime).ToList();
-
-                                bool _isIgnore = true;
-
-                                for (int i = 0; i < _picks.Count; i++)
-                                {
-                                    if (_picks[i].HourIndex != evse.HeartbeatUpdatedOn.Hour && _picks[i].OfflineTime == DefaultSetting.DefaultNullTime)
-                                    {
-                                        _picks[i].OfflineTime = new DateTime(_picks[i].OnlineTime.AddHours(1).Year,
-                                            _picks[i].OnlineTime.AddHours(1).Month, _picks[i].OnlineTime.AddHours(1).Day, _picks[i].OnlineTime.AddHours(1).Hour, 0, 0);
-
-                                        _picks[i].TotalMinute = (int)_picks[i].OfflineTime.Subtract(_picks[i].OnlineTime).TotalMinutes;
-                                        updateData.Add(_picks[i]);
-
-                                        var checkTime = _picks[i].OfflineTime;
-                                        while ((int)latestHeartbeatTime.Subtract(checkTime).TotalHours > 0)
-                                        {
-                                            var _existedCount = _picks.Where(x => x.HourIndex == checkTime.Hour).ToList().Count;
-
-                                            if (_existedCount == 0)
-                                            {
-                                                insertData.Add(new EVSEOnlineRecord()
-                                                {
-                                                    CustomerId = evse.CustomerId,
-                                                    StationId = "0",
-                                                    HourIndex = checkTime.Hour,
-                                                    ChargeBoxId = evse.ChargeBoxId,
-                                                    OnlineTime = new DateTime(checkTime.Year, checkTime.Month, checkTime.Day, checkTime.Hour, 0, 0),
-                                                    OfflineTime = new DateTime(checkTime.AddHours(1).Year, checkTime.AddHours(1).Month, checkTime.AddHours(1).Day, checkTime.AddHours(1).Hour, 0, 0),
-                                                    TotalMinute = 60
-
-                                                });
-                                                checkTime = checkTime.AddHours(1);
-                                            }
-                                        }
-                                    }
-
-                                }
-
-                                _isIgnore = _picks.Where(x => x.HourIndex == latestHeartbeatTime.Hour).ToList().Count == 0 ? false : true;
-
-                                if (!_isIgnore)
-                                {
-                                    insertData.Add(new EVSEOnlineRecord()
-                                    {
-                                        CustomerId = evse.CustomerId,
-                                        StationId = "0",
-                                        HourIndex = evse.HeartbeatUpdatedOn.Hour,
-                                        ChargeBoxId = evse.ChargeBoxId,
-                                        OnlineTime = new DateTime(latestHeartbeatTime.Year,
-                                                latestHeartbeatTime.Month, latestHeartbeatTime.Day, latestHeartbeatTime.Hour, 0, 0),
-                                        OfflineTime = DefaultSetting.DefaultNullTime
-
-                                    });
-                                }
-                            }
-
-                        }
-                        else
-                        {
-                            //off - on 
-                            await UpdateEVSECurrentStatus(evse.CustomerId.ToString(), evse.ChargeBoxId, true, DefaultSetting.DefaultNullTime);
-
-                            insertData.Add(new EVSEOnlineRecord()
-                            {
-                                CustomerId = evse.CustomerId,
-                                StationId = "0",
-                                HourIndex = evse.HeartbeatUpdatedOn.Hour,
-                                ChargeBoxId = evse.ChargeBoxId,
-                                OnlineTime = evse.HeartbeatUpdatedOn,
-
-                            });
 
+                        if (!evse.Online)
+                        { //off - on                           
 
+                            UpdateEVSECurrentStatus(evse.CustomerId.ToString(), evse.ChargeBoxId, true, DefaultSetting.DefaultNullTime);
+                            await UpdateOnlineRecords(evse.ChargeBoxId, true, evse.HeartbeatUpdatedOn, null);
                         }
                     }
                     else
@@ -165,95 +69,43 @@ namespace EVCB_OCPP.TaskScheduler.Jobs
 
                         if (evse.Online)
                         {
+                            //on -off                        
 
-                            //on -off  
-                            await UpdateEVSECurrentStatus(evse.CustomerId.ToString(), evse.ChargeBoxId, false, evse.HeartbeatUpdatedOn);
-
-                            var _pickDate = evse.HeartbeatUpdatedOn.Date;
-                            var _picks = await GetOnlineRecords(_pickDate, evse.CustomerId.ToString(), evse.ChargeBoxId, _pickDate.Hour, evse.HeartbeatUpdatedOn.Hour);
-                            _picks = _picks.Where(x => x.OfflineTime == DefaultSetting.DefaultNullTime).ToList();
-
-                            foreach (var item in _picks)
+                            UpdateEVSECurrentStatus(evse.CustomerId.ToString(), evse.ChargeBoxId, false, evse.HeartbeatUpdatedOn);
+                            var online_row = await GetOnlineRecord(evse.ChargeBoxId);
+                            if (online_row != null)
                             {
-                                if (evse.HeartbeatUpdatedOn.Hour - item.OnlineTime.Hour > 0)
-                                {
-                                    item.OfflineTime = new DateTime(item.OnlineTime.AddHours(1).Year, item.OnlineTime.AddHours(1).Month, item.OnlineTime.AddHours(1).Day, item.OnlineTime.AddHours(1).Hour, 0, 0);
-                                    item.TotalMinute = (int)item.OfflineTime.Subtract(item.OnlineTime).TotalMinutes;
-                                    updateData.Add(item);
-
-                                    var checkTime = item.OfflineTime;
-                                    while (evse.HeartbeatUpdatedOn.Hour - checkTime.Hour >= 0)
-                                    {
-                                        insertData.Add(new EVSEOnlineRecord()
-                                        {
-                                            CustomerId = evse.CustomerId,
-                                            StationId = "0",
-                                            HourIndex = checkTime.Hour,
-                                            ChargeBoxId = evse.ChargeBoxId,
-                                            OnlineTime = checkTime,
-                                            OfflineTime = evse.HeartbeatUpdatedOn.Hour == checkTime.Hour ? evse.HeartbeatUpdatedOn : new DateTime(checkTime.AddHours(1).Year, checkTime.AddHours(1).Month, checkTime.AddHours(1).Day, checkTime.AddHours(1).Hour, 0, 0)
-
-                                        });
-                                        checkTime = evse.HeartbeatUpdatedOn.Hour == checkTime.Hour ? insertData.LastOrDefault().OfflineTime.AddHours(1) : insertData.LastOrDefault().OfflineTime;
-                                    }
-
-                                }
-                                else
-                                {
-                                    item.OfflineTime = evse.HeartbeatUpdatedOn;
-                                    item.TotalMinute = (int)item.OfflineTime.Subtract(item.OnlineTime).TotalMinutes;
-                                    updateData.Add(item);
-
-                                }
-
+                                await UpdateOnlineRecords(evse.ChargeBoxId, false, evse.HeartbeatUpdatedOn, online_row.Id);
                             }
 
                         }
-                        else
-                        {
-                            //off-off do nothing
-                        }
-                    }
 
-                    if ((insertData.Count + updateData.Count) % 100 == 0)
-                    {
-                        await UpdateOnlineRecords(updateData, insertData);
-                        ClearCache();
                     }
-
-
                 }
-
-
-                await UpdateOnlineRecords(updateData, insertData);
-
-
             }
             catch (Exception ex)
             {
                 logger.LogDebug("ERROR " + this.ToString() + ex.ToString());
             }
 
-            logger.LogInformation("{0} complete", this.ToString());
+
+
+            logger.LogDebug(this.ToString() + " :Finished........");
+
         }
 
 
-        private async Task<List<EVSECurrentStatus>> GetEVSEs()
+        private List<EVSECurrentStatus> GetEVSEs()
         {
             List<EVSECurrentStatus> result = new List<EVSECurrentStatus>();
             try
             {
-                using (var dbConn = new SqlConnection(mainDBConnectString))
+                using (var dbConn = mainDbConnectionFactory.Create())
                 {
-                    //dbConn.Open();
-                    string sqlstring = """
-                       SELECT m.CustomerId,m.Id,m.ChargeBoxId,m.Online,m.HeartbeatUpdatedOn,MachineConfigurations.ConfigureSetting HeartbeatInterval
-                       FROM [dbo].[Machine]  m  
-                       left join [dbo].[MachineConfigurations] MachineConfigurations  
-                       on m.ChargeBoxId = MachineConfigurations.ChargeBoxId
-                       where MachineConfigurations.ConfigureName = 'HeartbeatInterval' and MachineConfigurations.ConfigureSetting!=''
-                       """;
-                    result = (await dbConn.QueryAsync<EVSECurrentStatus>(sqlstring)).ToList();
+                    string sqlstring = "SELECT m.CustomerId,m.Id,m.ChargeBoxId,m.Online,m.HeartbeatUpdatedOn,MachineConfigurations.ConfigureSetting HeartbeatInterval"
+                   + "  FROM [dbo].[Machine]  m  left join [dbo].[MachineConfigurations]  MachineConfigurations  on m.ChargeBoxId = MachineConfigurations.ChargeBoxId"
+                   + " where MachineConfigurations.ConfigureName = 'HeartbeatInterval'  and MachineConfigurations.ConfigureSetting!=''";
+                    result = dbConn.Query<EVSECurrentStatus>(sqlstring).ToList();
                 }
 
             }
@@ -266,26 +118,25 @@ namespace EVCB_OCPP.TaskScheduler.Jobs
             return result;
         }
 
-        private async Task UpdateEVSECurrentStatus(string customerId, string ChargeBoxId, bool turnOn, DateTime offlineTime)
+        private void UpdateEVSECurrentStatus(string customerId, string ChargeBoxId, bool turnOn, DateTime offlineTime)
         {
             try
             {
-                string sqlString = string.Format("UPDATE [dbo].[Machine] SET Online=@Online {0} WHERE chargeBoxId=@chargeBoxId and customerId=@customerId", turnOn ? "" : " ,OfflineOn=@OfflineOn");
-                using (var dbConn = new SqlConnection(mainDBConnectString))
+                string sqlString = string.Format("UPDATE [dbo].[Machine] SET Online=@Online {0} WHERE chargeBoxId=@chargeBoxId ", turnOn ? "" : " ,OfflineOn=@OfflineOn");
+                using (var dbConn = mainDbConnectionFactory.Create())
                 {
-                    //dbConn.Open();
                     var parameters = new DynamicParameters();
-                    parameters.Add("@Online", turnOn, DbType.Boolean);
-                    parameters.Add("@chargeBoxId", ChargeBoxId, DbType.String, ParameterDirection.Input, 50);
-                    parameters.Add("@customerId", customerId, DbType.String , ParameterDirection.Input, 36);
+                    parameters.Add("@Online", turnOn, System.Data.DbType.Boolean);
+                    parameters.Add("@chargeBoxId", ChargeBoxId, System.Data.DbType.String);
+
                     if (!turnOn)
                     {
-                        parameters.Add("@OfflineOn", offlineTime, DbType.DateTime);
+                        parameters.Add("@OfflineOn", offlineTime, System.Data.DbType.DateTime);
                     }
 
 
 
-                    await dbConn.ExecuteAsync(sqlString, parameters);
+                    dbConn.Execute(sqlString, parameters);
                 }
 
             }
@@ -296,109 +147,71 @@ namespace EVCB_OCPP.TaskScheduler.Jobs
         }
 
 
-        async private Task UpdateOnlineRecords(List<EVSEOnlineRecord> updateItems, List<EVSEOnlineRecord> insertItems)
+        async private Task UpdateOnlineRecords(string chargeBoxId, bool online, DateTime hearbeatDt, Int64? rowId)
         {
-            List<EVSEOnlineRecord> records = new List<EVSEOnlineRecord>();
             try
             {
-                for (int i = 0; i < updateItems.Count; i++)
+                if (online)
                 {
-                    var updateItem = updateItems[i];
-                    string sqlString = string.Format("UPDATE [dbo].[EVSEOnlineRecord_{0}] SET OfflineTime=@OfflineTime , TotalMinute=@TotalMinute  WHERE customerId=@customerId and chargeBoxId=@chargeBoxId and " +
-                       "OnlineTime=@OnlineTime", updateItem.OnlineTime.Date.ToString("yyMMdd"));
-                    using (var dbConn = new SqlConnection(onlineDBConnectString))
+                    string sqlString = "INSERT INTO [dbo].[EVSEOnlineRecord] (\"ChargeBoxId\",\"OnlineTime\",\"OfflineTime\")" +
+                       "VALUES( @ChargeBoxId,@OnlineTime,@OfflineTime); ";
+                    using (var dbConn = onlineLogDbConnectionFactory.Create())
                     {
-                        //dbConn.Open();
-
-                        //var cmd = new SqlCommand(sqlString,dbConn);
-                        //cmd.Parameters.AddWithValue("@OfflineTime", updateItem.OfflineTime);
-                        //cmd.Parameters.AddWithValue("@TotalMinute", updateItem.TotalMinute);
-                        //cmd.Parameters.AddWithValue("@customerId", updateItem.CustomerId);
-                        //cmd.Parameters.AddWithValue("@chargeBoxId", updateItem.ChargeBoxId);
-                        //cmd.Parameters.AddWithValue("@OnlineTime", updateItem.OnlineTime);
-                        //await cmd.ExecuteNonQueryAsync();
-                        var param = new DynamicParameters();
-                        param.Add("OfflineTime", updateItem.OfflineTime, DbType.Date);
-                        param.Add("TotalMinute", updateItem.TotalMinute, DbType.Int32);
-                        param.Add("customerId", updateItem.CustomerId, DbType.Guid);
-                        param.Add("chargeBoxId", updateItem.ChargeBoxId, DbType.String, ParameterDirection.Input, 36);
-                        param.Add("OnlineTime", updateItem.OnlineTime, DbType.Date);
-                        await dbConn.ExecuteAsync(sqlString, param);
-                    }
+                        var parameters = new DynamicParameters();
+                        parameters.Add("@ChargeBoxId", chargeBoxId, System.Data.DbType.String);
+                        parameters.Add("@OnlineTime", hearbeatDt, System.Data.DbType.DateTime);
+                        parameters.Add("@OfflineTime", DefaultSetting.DefaultNullTime, System.Data.DbType.DateTime);
 
+                        await dbConn.ExecuteAsync(sqlString, parameters);
+                    }
                 }
-
-                for (int i = 0; i < insertItems.Count; i++)
+                else
                 {
-                    string sqlString = string.Format("INSERT INTO [dbo].[EVSEOnlineRecord_{0}] (\"CustomerId\",\"StationId\",\"ChargeBoxId\",\"HourIndex\",\"TotalMinute\",\"OnlineTime\",\"OfflineTime\")" +
-                    "VALUES(@CustomerId,@StationId, @ChargeBoxId,@HourIndex,@TotalMinute,@OnlineTime,@OfflineTime); ", insertItems[i].OnlineTime.Date.ToString("yyMMdd"));
-                    using (var dbConn = new SqlConnection(onlineDBConnectString))
+                    if (rowId.HasValue)
+                    {
+                        string sqlString = "UPDATE [dbo].[EVSEOnlineRecord] SET OfflineTime=@OfflineTime  WHERE Id=@Id";
+                        using (var dbConn = mainDbConnectionFactory.Create())
+                        {
+                            var parameters = new DynamicParameters();
+                            parameters.Add("@OfflineTime", hearbeatDt, System.Data.DbType.DateTime);
+                            parameters.Add("@Id", rowId.Value, System.Data.DbType.Int64);
+
+                            await dbConn.ExecuteAsync(sqlString, parameters);
+                        }
+                    }
+                    else
                     {
-                        //dbConn.Open();
-                        await dbConn.ExecuteAsync(sqlString, insertItems[i]);
+                        logger.LogError("Can't find update row id from " + chargeBoxId);
                     }
 
                 }
             }
             catch (Exception ex)
             {
-                logger.LogError("Update Data Error " + ex.ToString());
+                logger.LogError(string.Format("UpdateOnlineRecords Exception:{0}", ex.ToString()));
             }
+
+
+
+
         }
 
 
 
-        async private Task<List<EVSEOnlineRecord>> GetOnlineRecords(DateTime pickDate, string customerId, string chargeBoxId, int startHourCondition, int stopHourCondition)
+        async private Task<EVSEOnlineRecord> GetOnlineRecord(string chargeBoxId)
         {
-            List<EVSEOnlineRecord> records = new List<EVSEOnlineRecord>();
+            EVSEOnlineRecord lastrow = new EVSEOnlineRecord();
             try
             {
-                string sqlString = string.Format("SELECT * FROM [dbo].[EVSEOnlineRecord_{0}] WHERE customerId=@customerId and chargeBoxId=@chargeBoxId and " +
-                    "HourIndex >= @startHourCondition and HourIndex <= @stopHourCondition and OfflineTime=@OfflineTime", pickDate.ToString("yyMMdd"));
-                using (var dbConn = new SqlConnection(onlineDBConnectString))
+                string sqlString = string.Format("SELECT Id FROM [dbo].[EVSEOnlineRecord] WHERE chargeBoxId=@chargeBoxId Order by OnlineTime desc");
+                using (var dbConn = onlineLogDbConnectionFactory.Create())
                 {
-                    //dbConn.Open();
                     var parameters = new DynamicParameters();
-                    parameters.Add("customerId", new Guid(customerId), DbType.Guid);
-                    parameters.Add("chargeBoxId", chargeBoxId, DbType.String, ParameterDirection.Input, 36);
-                    parameters.Add("startHourCondition", startHourCondition, DbType.Int32);
-                    parameters.Add("stopHourCondition", stopHourCondition, DbType.Int32);
-                    parameters.Add("OfflineTime", DefaultSetting.DefaultNullTime, DbType.Date);
+                    parameters.Add("@chargeBoxId", chargeBoxId, System.Data.DbType.String);
 
-                    var result = await dbConn.QueryAsync<EVSEOnlineRecord>(sqlString, parameters);
-                    records = result.ToList();
-                }
 
-            }
-            catch (Exception ex)
-            {
-                logger.LogError("Query Data Error " + ex.ToString());
-            }
-            return records;
-        }
-
-        private void CreateEVSEOnlineRecordTable()
-        {
-            try
-            {
-                string sqlString = string.Format("SELECT COUNT(*) FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME ='EVSEOnlineRecord_{0}'", latestHeartbeatTime.ToString("yyMMdd"));
-                using (var dbConn = new SqlConnection(onlineDBConnectString))
-                {
-                    bool exists = dbConn.ExecuteScalar<bool>(sqlString);
-                    if (!exists)
-                    {
-                        dbConn.Execute(string.Format(@"
-                            CREATE TABLE [dbo].[EVSEOnlineRecord_{0}] (
-                            [CustomerId] [UNIQUEIDENTIFIER] NOT NULL,
-	                        [StationId] [nvarchar](36) NOT NULL,
-	                        [ChargeBoxId] [nvarchar](36) NOT NULL,
-	                        [HourIndex] [int] NOT NULL,
-	                        [TotalMinute] [int] NOT NULL,
-	                        [OnlineTime] [datetime] NOT NULL,
-	                        [OfflineTime] [datetime] NOT NULL
-                        ) ON [PRIMARY]
-                            ", latestHeartbeatTime.ToString("yyMMdd")));
-                    }
+                    var result = await dbConn.QueryAsync<EVSEOnlineRecord>(sqlString, parameters);
+                    lastrow = result.FirstOrDefault();
                 }
 
             }
@@ -406,18 +219,10 @@ namespace EVCB_OCPP.TaskScheduler.Jobs
             {
                 logger.LogError("Query Data Error " + ex.ToString());
             }
+            return lastrow;
         }
 
 
-        private void ClearCache()
-        {
-            updateData?.Clear();
-
-            insertData?.Clear();
-        }
-
-
-
         private bool IsOnlineNow(EVSECurrentStatus currentEVSE)
         {
             bool isOnline = false;

EVCB_OCPP.TaskScheduler/Models/EVSEOnlineRecord.cs

@@ -8,28 +8,24 @@ namespace EVCB_OCPP.TaskScheduler.Models
 {
     public class EVSEOnlineRecord
     {
-      
+
 
         public EVSEOnlineRecord()
         {
-            TotalMinute = 0;
-            OfflineTime= new DateTime(1991, 1, 1);
-            StationId = "0";
+
+            OfflineTime = new DateTime(1991, 1, 1);
+            OnlineTime = new DateTime(1991, 1, 1);
         }
-        public Guid CustomerId { set; get; }
 
-        public string StationId { set; get; }
+        public Int64 Id { set; get; }
+        public Guid CustomerId { set; get; }
 
         public string ChargeBoxId { set; get; }
 
-        public int HourIndex { set; get; }
-
-        public int TotalMinute { set; get; }
-
         public DateTime OnlineTime { set; get; }
 
         public DateTime OfflineTime { set; get; }
 
-     
+
     }
 }

EVCB_OCPP.TaskScheduler/OuterHttpClient.cs

@@ -16,9 +16,9 @@ namespace EVCB_OCPP.TaskScheduler
     public class OuterHttpClient
     {
         private HttpClientService httpClient = new HttpClientService();
-        private ILogger logger;// = NLog.LogManager.GetCurrentClassLogger();
+        private ILogger _logger;// = NLog.LogManager.GetCurrentClassLogger();
 
-        public OuterHttpClient(ILogger _logger)
+        public OuterHttpClient(ILogger logger)
         {
             _logger = logger;// serviceProvider.GetService<ILogger<OuterHttpClient>>();
         }
@@ -31,7 +31,7 @@ namespace EVCB_OCPP.TaskScheduler
             {
                 if(url.Contains("commands/results"))
                 {
-                    logger.LogDebug(url);
+                    _logger.LogDebug(url);
                 }
                 string body = PreAction(url, ref headers, requestBody, saltkey);
                 var _response = await httpClient.PostJsonAsync(url, body, headers);
@@ -39,8 +39,8 @@ namespace EVCB_OCPP.TaskScheduler
 
                 if (url.Contains("commands/results"))
                 {
-                    logger.LogDebug(body);
-                    logger.LogDebug(JsonConvert.SerializeObject(_response));
+                    _logger.LogDebug(body);
+                    _logger.LogDebug(JsonConvert.SerializeObject(_response));
                 }
                 result.Response = _response.Response;
                 result.Status = _response.StatusCode;

EVCB_OCPP.TaskScheduler/Program.cs

@@ -1,4 +1,5 @@
 
+using EVCB_OCPP.TaskScheduler.Helper;
 using EVCB_OCPP.TaskScheduler.Jobs;
 using EVCB_OCPP.TaskScheduler.Services;
 using Microsoft.Extensions.Configuration;
@@ -33,6 +34,9 @@ namespace EVCB_OCPP.TaskScheduler
                 .UseNLog()
                 .ConfigureServices((context, services) => {
 
+                    services.AddMainDbContext(context.Configuration);
+                    services.AddOnlineLogDBContext(context.Configuration);
+
                     services.AddTransient<ICustomerService, CommonCustomerService>();
                     services.AddSingleton<ICustomersService, CustomersService>();
 

EVCB_OCPP.TaskScheduler/Services/DatabaseService.cs

@@ -1,5 +1,7 @@
 using Dapper;
 using Dapper.Transaction;
+using EVCB_OCPP.Domain;
+using EVCB_OCPP.TaskScheduler.Helper;
 using EVCB_OCPP.TaskScheduler.Models;
 using Microsoft.Data.SqlClient;
 using Microsoft.Extensions.Configuration;
@@ -22,16 +24,24 @@ namespace EVCB_OCPP.TaskScheduler.Services
 {
     public class DatabaseService
     {
-        private ILogger logger;
-        private readonly string mainDBConnectString;
-        private readonly string onlineDBConnectString;
+        private readonly ILogger logger;
+        private readonly SqlConnectionFactory<MainDBContext> mainDbConnectionFactory;
+        private readonly SqlConnectionFactory<OnlineLogDBContext> onlineLogDbConnectionFactory;
 
-        public DatabaseService(IConfiguration configuration,ILogger<DatabaseService> logger)
+        //private readonly string mainDBConnectString;
+        //private readonly string onlineDBConnectString;
+
+        public DatabaseService(
+            ILogger<DatabaseService> logger,
+            SqlConnectionFactory<MainDBContext> mainDbConnectionFactory,
+            SqlConnectionFactory<OnlineLogDBContext> onlineLogDbConnectionFactory)
         {
             this.logger = logger;
+            this.mainDbConnectionFactory = mainDbConnectionFactory;
+            this.onlineLogDbConnectionFactory = onlineLogDbConnectionFactory;
 
-            mainDBConnectString = configuration.GetConnectionString("MainDBContext");
-            onlineDBConnectString = configuration.GetConnectionString("OnlineLogDBContext");
+            //mainDBConnectString = configuration.GetConnectionString("MainDBContext");
+            //onlineDBConnectString = configuration.GetConnectionString("OnlineLogDBContext");
         }
 
         internal async Task<string> GetCustomerName(Guid customerId)
@@ -39,9 +49,8 @@ namespace EVCB_OCPP.TaskScheduler.Services
             string name = string.Empty;
             try
             {
-                using (var dbConn = new SqlConnection(mainDBConnectString))
+                using (var dbConn = mainDbConnectionFactory.Create())
                 {
-                    //dbConn.Open();
                     var parameters = new DynamicParameters();
                     parameters.Add("@Id", customerId, DbType.Guid);
                     name = await dbConn.QueryFirstOrDefaultAsync<string>("SELECT Name FROM [dbo].[Customer] where Id=@Id  ", parameters);
@@ -62,7 +71,7 @@ namespace EVCB_OCPP.TaskScheduler.Services
             bool result = false;
             try
             {
-                using (var dbConn = new SqlConnection(mainDBConnectString))
+                using (var dbConn = mainDbConnectionFactory.Create())
                 {
                     //dbConn.Open();
                     var parameters = new DynamicParameters();
@@ -87,7 +96,7 @@ namespace EVCB_OCPP.TaskScheduler.Services
             string key = string.Empty;
             var parameters = new DynamicParameters();
             parameters.Add("@Id", partnerId, DbType.Guid, ParameterDirection.Input);
-            using (SqlConnection conn = new SqlConnection(mainDBConnectString))
+            using (SqlConnection conn = mainDbConnectionFactory.Create())
             {
                 string strSql = "Select ApiKey, ApiUrl from [dbo].[Customer] where Id=@Id; ";
                 result = conn.Query<CustomerConnectionDto>(strSql, parameters).FirstOrDefault();
@@ -102,7 +111,7 @@ namespace EVCB_OCPP.TaskScheduler.Services
             List<Guid> result = new List<Guid>();
             try
             {
-                using (var dbConn = new SqlConnection(mainDBConnectString))
+                using (var dbConn = mainDbConnectionFactory.Create())
                 {
                     //dbConn.Open();
                     result = dbConn.Query<Guid>("SELECT Id FROM [dbo].[Customer] where CallPartnerApiOnSchedule=1").ToList();
@@ -122,7 +131,7 @@ namespace EVCB_OCPP.TaskScheduler.Services
             List<Guid> result = new List<Guid>();
             try
             {
-                using (var dbConn = new SqlConnection(mainDBConnectString))
+                using (var dbConn = mainDbConnectionFactory.Create())
                 {
                     //dbConn.Open();
                     result = dbConn.Query<Guid>("SELECT Id FROM [dbo].[Customer] where CallPartnerApiOnSchedule=1 and InstantStopTxReport=0").ToList();
@@ -143,7 +152,7 @@ namespace EVCB_OCPP.TaskScheduler.Services
             List<Transaction> result = new List<Transaction>();
             try
             {
-                using (var dbConn = new SqlConnection(mainDBConnectString))
+                using (var dbConn = mainDbConnectionFactory.Create())
                 {
                     //dbConn.Open();
                     var parameters = new DynamicParameters();
@@ -184,7 +193,7 @@ namespace EVCB_OCPP.TaskScheduler.Services
             List<MachineOperateRecord> result = new List<MachineOperateRecord>();
             try
             {
-                using (var dbConn = new SqlConnection(mainDBConnectString))
+                using (var dbConn = mainDbConnectionFactory.Create())
                 {
                     //dbConn.Open();
                     var parameters = new DynamicParameters();                  
@@ -211,7 +220,7 @@ namespace EVCB_OCPP.TaskScheduler.Services
 
             try
             {
-                using (var dbConn = new SqlConnection(mainDBConnectString))
+                using (var dbConn = mainDbConnectionFactory.Create())
                 {
                     foreach (var kv in reportResults)
                     {
@@ -238,9 +247,9 @@ namespace EVCB_OCPP.TaskScheduler.Services
 
             try
             {
-                using (var dbConn = new SqlConnection(mainDBConnectString))
+                using (var dbConn = mainDbConnectionFactory.Create())
                 {
-                    await dbConn.OpenAsync();
+                    //await dbConn.OpenAsync();
                     using (var trans = await dbConn.BeginTransactionAsync())
                     {
                         //dbConn.Open();
@@ -272,7 +281,7 @@ namespace EVCB_OCPP.TaskScheduler.Services
 
             try
             {
-                using (var dbConn = new SqlConnection(mainDBConnectString))
+                using (var dbConn = mainDbConnectionFactory.Create())
                 {
                     //dbConn.Open();
                     await dbConn.ExecuteAsync("CheckUnCommitMachineOperateCommand", new { @TimeoutIntervalSeconds = intervalSeconds }, null, null, commandType: CommandType.StoredProcedure);
@@ -291,9 +300,9 @@ namespace EVCB_OCPP.TaskScheduler.Services
         {
             try
             {
-                using (var dbConn = new SqlConnection(mainDBConnectString))
+                using (var dbConn = mainDbConnectionFactory.Create())
                 {
-                    await dbConn.OpenAsync();
+                    //await dbConn.OpenAsync();
                     using (var trans = await dbConn.BeginTransactionAsync())
                     {
                         //dbConn.Open();

EVCB_OCPP.TaskScheduler/Services/TestService.cs

@@ -1,4 +1,5 @@
-using Microsoft.Extensions.DependencyInjection;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using System;
 using System.Collections.Generic;
@@ -15,6 +16,8 @@ namespace EVCB_OCPP.TaskScheduler.Services
 
         public TestService(IServiceProvider serviceProvider) {
             this.serviceProvider = serviceProvider;
+
+            var appBuilder = WebApplication.CreateBuilder();
         }
 
         public Task StartAsync(CancellationToken cancellationToken)

EVCB_OCPP.TaskScheduler/appsettings.json

@@ -3,7 +3,7 @@
     "targets": {
       "f": {
         "type": "File",
-        "fileName": "${basedir}/logs/${shortdate}.log",
+        "fileName": "${basedir}/logs/task/${shortdate}.log",
         "layout": "${longdate} ${uppercase:${level}} ${message}"
       },
       "Console": {
@@ -33,7 +33,7 @@
     ]
   },
   "ConnectionStrings": {
-    "OnlineLogDBContext": "data source=172.1.0.131;initial catalog=Docker_OnlineRecord;;persist security info=True;user id=sa;password=B58Py42j/4cj84;MultipleActiveResultSets=True;App=EntityFramework;TrustServerCertificate=true",
-    "MainDBContext": "data source=172.1.0.131;initial catalog=Docker_Main;;persist security info=True;user id=sa;password=B58Py42j/4cj84;MultipleActiveResultSets=True;App=EntityFramework;TrustServerCertificate=true"
+    "OnlineLogDBContext": "data source=zerova-ev-dev.database.windows.net;initial catalog=StandardOCPP_OnlineRecord;;persist security info=True;user id=azdevsoftware;password=1h52dev#az;MultipleActiveResultSets=False;App=EntityFramework;TrustServerCertificate=True;Connection Lifetime=0;Pooling=true;Max Pool Size=500;",
+    "MainDBContext": "data source=zerova-ev-dev.database.windows.net;initial catalog=StandardOCPP_Main;;persist security info=True;user id=azdevsoftware;password=1h52dev#az;MultipleActiveResultSets=False;App=EntityFramework;TrustServerCertificate=true;Pooling=true;Max Pool Size=500;"
   }
 }

build.bat

@@ -0,0 +1,5 @@
+for /f %%i in ('git rev-parse --short HEAD') do set ssha=%%i
+docker build ./ -t 172.1.2.214:5000/task:test --label "git-commit=%ssha%"
+docker push 172.1.2.214:5000/task:test
+docker tag 172.1.2.214:5000/task:test evdevcontainerregistry.azurecr.io/task:test
+docker push evdevcontainerregistry.azurecr.io/task:test