mssql版本生成的数据库文档

代码/System.Common/Helpers/NPOIHelper.cs

@@ -721,10 +721,12 @@ namespace System.Common.Helpers
                     {
                         foreach (var item in colname)
                         {
+                            int itemcount = 0;
                             for (int j = 0; j < objs.Columns.Count; j++)
                             {
                                 if (objs.Columns[j].ColumnName == item)
                                 {
+                                    itemcount++;
                                     string strsj = string.Empty;
                                     if (objs.Rows[i][j] != null)
                                     {
@@ -734,8 +736,16 @@ namespace System.Common.Helpers
                                     cell.SetCellValue(strsj);
                                     cell.CellStyle = cellStyle;
                                     iCellIndex++;
+                                    break;
                                 }
                             }
+                            if (itemcount == 0)
+                            {
+                                ICell cell = irow.CreateCell(iCellIndex);
+                                cell.SetCellValue("a/N");
+                                cell.CellStyle = cellStyle;
+                                iCellIndex++;
+                            }
                         }
                     }
                     else

代码/TVShoppingCallCenter_ZLJ/Controllers/System/DictionaryController.cs

@@ -63,7 +63,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.System
             List<IConditionalModel> conModels = new List<IConditionalModel>();
             #region 条件筛选
             conModels.Add(new ConditionalModel() { FieldName = "F_State", ConditionalType = ConditionalType.Equal, FieldValue = ((int)EnumDelState.Enabled).ToString() });
-            conModels.Add(new ConditionalModel() { FieldName = "F_IsLeaf", ConditionalType = ConditionalType.Equal, FieldValue = isleaf.ToString() });
+            conModels.Add(new ConditionalModel() { FieldName = "F_IsLeaf", ConditionalType = ConditionalType.Equal, FieldValue = isleaf==true?"1":"0" });
             if(!string.IsNullOrEmpty(code))
                 conModels.Add(new ConditionalModel() { FieldName = "F_ValueCode", ConditionalType = ConditionalType.Equal, FieldValue = code });
             if (!string.IsNullOrEmpty(keyword))

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

@@ -337,6 +337,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.hangfire
             List<cdr> modellist=  await busCdrRepository.GetListALL(q=>q.id>maxid||q.end_time>= dtime);
             int totle = 0;
             int n = 0;
+            int n1 = 0;
             if (modellist != null && modellist.Count > 0)
             {
 
@@ -373,12 +374,22 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.hangfire
                         CallId = modelcdr.uuid,
                         CdrId= modelcdr.id
                     };
-                    modelRecordList.Add(modelRecord);                  
+                    n++;
+                    n1++;
+                    modelRecordList.Add(modelRecord);
+                    if (n >= 500)
+                    { 
+                        await busCallRecordsRepository.AddAndUpdateList(modelRecordList);
+                        modelRecordList.Clear();
+                        n = 0;
+                    }
+                    
                 }
                 //T_Call_CallRecords modelreturn= await busCallRecordsRepository.AddAndUpdateList(modelRecordList,s=>new {s.EndTime,s.TalkEndTime,s.IvrEndTime });
-                T_Call_CallRecords modelreturn = await busCallRecordsRepository.AddAndUpdateList(modelRecordList);
+                //T_Call_CallRecords modelreturn = 
+                    await busCallRecordsRepository.AddAndUpdateList(modelRecordList);
             }
-            return Success($"同步情况  成功/总数 = {n}/{totle}");
+            return Success($"同步情况  成功/总数 = {n1}/{totle}");
         }
         #endregion
     }

代码/TVShoppingCallCenter_ZLJ/Startup.cs

@@ -95,7 +95,7 @@ namespace TVShoppingCallCenter_ZLJ
             });
             #endregion
             #region 配置数据库
-            BaseContext.DB_ConnectionString = Configuration.GetConnectionString("MySqlConnection");
+            BaseContext.DB_ConnectionString = Configuration.GetConnectionString("DefaultConnection");
             BaseMysqlContext.DB_ConnectionString = Configuration.GetConnectionString("MySqlConnection");
             #endregion
 
@@ -146,7 +146,7 @@ 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
+            services.AddHangfire(x => x.UseStorage(new MySqlStorage(BaseContext.DB_ConnectionString, new MySqlStorageOptions
             {
                 TransactionIsolationLevel = IsolationLevel.ReadCommitted,
                 QueuePollInterval = TimeSpan.FromSeconds(15),

代码/TVShoppingCallCenter_ZLJ/appsettings.json

@@ -16,8 +16,9 @@
     "stock1": "41.07.011" //新乡仓
   },
   "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=TVCallCenter_ZLJ;charset=utf8mb4;Allow User Variables=true;"
+    //"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;",
+    "DefaultConnection": "server=192.168.8.18;User ID=root;Password=mysql;database=TVCallCenter_ZLJ;charset=utf8mb4;Allow User Variables=true;",
+    "MySqlConnection": "server=192.168.8.18;User ID=root;Password=mysql;database=freeswitch;charset=utf8mb4;Allow User Variables=true;"
   },
   "Jwt": {
     "Issuer": "HnjySignToken",
@@ -32,8 +33,8 @@
     "ordertrackkey": "F_Id,F_TrackingNo,ProductNumberName",
     "ordertracktvalue": "订单号,运单号,物流状态",
 
-    "vipkey": "F_Name,F_Birthday,F_Age,F_Sex,F_ShoeSize,F_Mobile,F_Mobile1,F_Phone,F_Recommender,F_Label,F_Note,F_Nickname,F_RegTime,F_Province,F_City,F_Area,F_Town,F_Postcode,F_Address,F_Address1,F_Score,F_Money,F_TotalScore,F_Saleperson,F_Contact,F_Type",
-    "vipvalue": "姓名,生日,年龄,性别,鞋码,手机号1,手机号2,固定电话,推荐人,标签,备注,昵称,注册时间,省份,城市,县区,乡镇,邮编,地址,备用地址,会员积分,累计消费,累计积分,销售负责人,最近联系时间,会员类型"
+    "vipkey": "F_Name,F_Birthday,F_Age,F_Sex,F_ShoeSize,F_Mobile,F_Mobile1,F_Phone,F_Recommender,F_Label,F_Note,F_Nickname,F_CreateOn,F_Province,F_City,F_Area,F_Town,F_Postcode,F_Address,F_Address1,F_Score,F_Money,F_TotalScore,F_Saleperson,F_Type",
+    "vipvalue": "姓名,生日,年龄,性别,鞋码,手机号1,手机号2,固定电话,推荐人,标签,备注,昵称,注册时间,省份,城市,县区,乡镇,邮编,地址,备用地址,会员积分,累计消费,累计积分,销售负责人,会员类型"
 
     //在这里可以成对配置导入模板的 表头与对象属性名对应关系 备用省份,备用城市,备用县区,备用乡镇,备用邮编, F_Province1,F_City1,F_Area1,F_Town1,F_Postcode1,
   },