转mysql

代码/System.Common/Context/BaseContext.cs

@@ -13,7 +13,7 @@ namespace System.Common
             Db = new SqlSugarClient(new ConnectionConfig()
             {
                 ConnectionString = DB_ConnectionString,
-                DbType = DbType.SqlServer,
+                DbType = DbType.MySql,
                 IsAutoCloseConnection = true,
                 InitKeyType = InitKeyType.SystemTable,
                 IsShardSameThread = false

代码/System.Common/IRepositories/IRepository.cs

@@ -44,13 +44,13 @@ namespace System.Common
         /// </summary>
         /// <param name="obj"></param>
         /// <returns></returns>
-        Task<T> AddAndUpdate(T obj);
+        Task<T> AddAndUpdate(T obj,Expression<Func<T, object>> UpdateColumns= null);
         /// <summary>
         /// 插入并返回实体
         /// </summary>
         /// <param name="obj"></param>
         /// <returns></returns>
-        Task<T> AddAndUpdateList(List<T> obj);
+        Task<T> AddAndUpdateList(List<T> obj,Expression<Func<T, object>> UpdateColumns= null);
         /// <summary>
         /// 插入并返回影响行数
         /// </summary>

代码/System.Common/Repositories/BaseMysqlRepository.cs

@@ -121,24 +121,32 @@ namespace System.Common
             return await Db.Insertable<T>(obj).ExecuteReturnIdentityAsync();
             //return CurrentCurrentDB.InsertReturnIdentity(obj);
         }
-
         /// <summary>
         /// 插入并返回实体
         /// </summary>
         /// <param name="obj"></param>
+        /// <param name="UpdateColumns">更新字段  null全部</param>
         /// <returns></returns>
-        public async Task<T> AddAndUpdate(T obj)
+        public async Task<T> AddAndUpdate(T obj, Expression<Func<T, object>> UpdateColumns = null)
         {
-            return await Db.Saveable<T>(obj).ExecuteReturnEntityAsync();
+            if (UpdateColumns == null)
+                return await Db.Saveable<T>(obj).ExecuteReturnEntityAsync();
+            else
+                return await Db.Saveable<T>(obj).UpdateColumns(UpdateColumns).ExecuteReturnEntityAsync();
         }
+
         /// <summary>
         /// 插入并返回实体
         /// </summary>
-        /// <param name="obj"></param>
+        /// <param name="obj">更新插入实体</param>
+        /// <param name="UpdateColumns">更新字段  null全部</param>
         /// <returns></returns>
-        public async Task<T> AddAndUpdateList(List<T> obj)
+        public async Task<T> AddAndUpdateList(List<T> obj, Expression<Func<T, object>> UpdateColumns = null)
         {
-            return await Db.Saveable<T>(obj).ExecuteReturnEntityAsync();
+            if (UpdateColumns == null)
+                return await Db.Saveable<T>(obj).ExecuteReturnEntityAsync();
+            else
+                return await Db.Saveable<T>(obj).UpdateColumns(UpdateColumns).ExecuteReturnEntityAsync();
         }
 
         /// <summary>

代码/System.Common/Repositories/BaseRepository.cs

@@ -137,19 +137,26 @@ namespace System.Common
         /// </summary>
         /// <param name="obj"></param>
         /// <returns></returns>
-        public async Task<T> AddAndUpdate(T obj)
-        {             
-            return await Db.Saveable<T>(obj).ExecuteReturnEntityAsync();
+        public async Task<T> AddAndUpdate(T obj, Expression<Func<T, object>> UpdateColumns = null)
+        {
+            if (UpdateColumns == null)
+                return await Db.Saveable<T>(obj).ExecuteReturnEntityAsync();
+            else
+                return await Db.Saveable<T>(obj).UpdateColumns(UpdateColumns).ExecuteReturnEntityAsync();
         }
 
         /// <summary>
         /// 插入并返回实体
         /// </summary>
-        /// <param name="obj"></param>
+        /// <param name="obj">更新插入实体</param>
+        /// <param name="UpdateColumns">更新字段  null全部</param>
         /// <returns></returns>
-        public async Task<T> AddAndUpdateList(List<T> obj)
+        public async Task<T> AddAndUpdateList(List<T> obj, Expression<Func<T, object>> UpdateColumns=null)
         {
-            return await Db.Saveable<T>(obj).ExecuteReturnEntityAsync();
+            if(UpdateColumns==null)
+                return await Db.Saveable<T>(obj).ExecuteReturnEntityAsync();
+            else
+                return await Db.Saveable<T>(obj).UpdateColumns(UpdateColumns).ExecuteReturnEntityAsync();
         }
         /// <summary>
         /// 添加排除某列

代码/TVShoppingCallCenter_ZLJ/Controllers/hangfire/HangfireController.cs

@@ -375,8 +375,8 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.hangfire
                     };
                     modelRecordList.Add(modelRecord);                  
                 }
-                T_Call_CallRecords modelreturn= await busCallRecordsRepository.AddAndUpdateList(modelRecordList);
-
+                //T_Call_CallRecords modelreturn= await busCallRecordsRepository.AddAndUpdateList(modelRecordList,s=>new {s.EndTime,s.TalkEndTime,s.IvrEndTime });
+                T_Call_CallRecords modelreturn = await busCallRecordsRepository.AddAndUpdateList(modelRecordList);
             }
             return Success($"同步情况  成功/总数 = {n}/{totle}");
         }

代码/TVShoppingCallCenter_ZLJ/Startup.cs

@@ -95,7 +95,7 @@ namespace TVShoppingCallCenter_ZLJ
             });
             #endregion
             #region 配置数据库
-            BaseContext.DB_ConnectionString = Configuration.GetConnectionString("DefaultConnection");
+            BaseContext.DB_ConnectionString = Configuration.GetConnectionString("MySqlConnection");
             BaseMysqlContext.DB_ConnectionString = Configuration.GetConnectionString("MySqlConnection");
             #endregion
 
@@ -146,19 +146,19 @@ namespace TVShoppingCallCenter_ZLJ
             services.AddTransient<IBus_SMSTemplateRepository, Bus_SMSTemplateRepository>();
             services.AddTransient<ICall_CallRecordsRepository, Call_CallRecordsRepository>();
             services.AddTransient<ICDRRepository, CDRRepository>();
-            //services.AddHangfire(x => x.UseStorage(new MySqlStorage(BaseMysqlContext.DB_ConnectionString, new MySqlStorageOptions
-            //{
-            //    TransactionIsolationLevel = IsolationLevel.ReadCommitted,
-            //    QueuePollInterval = TimeSpan.FromSeconds(15),
-            //    JobExpirationCheckInterval = TimeSpan.FromHours(1),
-            //    CountersAggregateInterval = TimeSpan.FromMinutes(5),
-            //    PrepareSchemaIfNecessary = true,
-            //    DashboardJobListLimit = 50000,
-            //    TransactionTimeout = TimeSpan.FromMinutes(1),
-            //    TablePrefix = "Hangfire"
-            //})));
+            services.AddHangfire(x => x.UseStorage(new MySqlStorage(BaseMysqlContext.DB_ConnectionString, new MySqlStorageOptions
+            {
+                TransactionIsolationLevel = IsolationLevel.ReadCommitted,
+                QueuePollInterval = TimeSpan.FromSeconds(15),
+                JobExpirationCheckInterval = TimeSpan.FromHours(1),
+                CountersAggregateInterval = TimeSpan.FromMinutes(5),
+                PrepareSchemaIfNecessary = true,
+                DashboardJobListLimit = 50000,
+                TransactionTimeout = TimeSpan.FromMinutes(1),
+                TablePrefix = "Hangfire_"
+            })));
             //GlobalConfiguration.Configuration.UseStorage(
-            //      new MySqlStorage(BaseContext.DB_ConnectionString, new MySqlStorageOptions
+            //      new MySqlStorage(BaseMysqlContext.DB_ConnectionString, new MySqlStorageOptions
             //      {
             //          TransactionIsolationLevel = IsolationLevel.ReadCommitted,
             //          QueuePollInterval = TimeSpan.FromSeconds(15),
@@ -167,9 +167,9 @@ namespace TVShoppingCallCenter_ZLJ
             //          PrepareSchemaIfNecessary = true,
             //          DashboardJobListLimit = 50000,
             //          TransactionTimeout = TimeSpan.FromMinutes(1),
-            //          TablePrefix = "Hangfire"
+            //          TablePrefix = "Hangfire_"
             //      }));
-            services.AddHangfire(x => x.UseSqlServerStorage(BaseContext.DB_ConnectionString));
+            //services.AddHangfire(x => x.UseSqlServerStorage(BaseContext.DB_ConnectionString));
 
             services.AddTransient<ICus_VipInfoRepository, Cus_VipInfoRepository>();
             services.AddTransient<ICus_VipLabelInfoRepository, Cus_VipLabelInfoRepository>();
@@ -238,7 +238,7 @@ namespace TVShoppingCallCenter_ZLJ
             {
                 Queues = new[] { "birthday", "minutely" },//队列名称，只能为小写
                 WorkerCount = Environment.ProcessorCount * 3, //并发任务数
-                ServerName = "hangfire1",//服务器名称
+                ServerName = "hangfireMysql",//服务器名称
             });//启动Hangfire服务  有可选参数
             app.UseHangfireDashboard("/hangfire",
                 new DashboardOptions

代码/TVShoppingCallCenter_ZLJ/appsettings.json

@@ -17,7 +17,7 @@
   },
   "ConnectionStrings": {
     "DefaultConnection": "Data Source=192.168.8.3;User ID=sa;pwd=800100;Initial Catalog=TVCallCenter_ZLJ;MultipleActiveResultSets=true;Pooling=true;Min Pool Size=15;Max Pool Size=100;",
-    "MySqlConnection": "server=192.168.8.18;User ID=root;Password=mysql;database=freeswitch;charset=utf8mb4;Allow User Variables=true;"
+    "MySqlConnection": "server=192.168.8.18;User ID=root;Password=mysql;database=TVCallCenter_ZLJ;charset=utf8mb4;Allow User Variables=true;"
   },
   "Jwt": {
     "Issuer": "HnjySignToken",