Merge branch 'master' of http://192.168.1.181/root/Ftt_Common

Tools/MyData/DBHelper.cs

@@ -114,11 +114,11 @@ namespace Tools.MyData
         /// <summary>
         ///  执行SQL语句：这里的多条语句采用同一事务处理，方便出错时回滚，保证数据统一
         /// </summary>
-        /// <param name="strExecSqlList">带执行的SQL列表</param>
+        /// <param name="sqls">带执行的SQL列表</param>
         /// <returns></returns>
-        public bool ExecNonSql(List<string> strExecSqlList)
+        public bool ExecNonSql(params string[] sqls)
         {
-            return this._db.ExecNonSql(this._link, strExecSqlList);
+            return this._db.ExecNonSql(this._link, sqls);
         }
         /// <summary>
         /// 是否存在
@@ -205,11 +205,11 @@ namespace Tools.MyData
         /// <summary>
         /// SQL批量执行（异步）
         /// </summary>
-        /// <param name="strExecSqlList"></param>
+        /// <param name="sqls"></param>
         /// <returns></returns>
-        public Task<bool> ExecNonSqlAsync(List<string> strExecSqlList)
+        public Task<bool> ExecNonSqlAsync(params string[] sqls)
         {
-            return Task.Run(() => ExecNonSql(strExecSqlList));
+            return Task.Run(() => ExecNonSql(sqls));
         }
         /// <summary>
         /// 是否存在（异步）

Tools/MyData/SmpDB.cs

@@ -351,9 +351,9 @@ namespace Tools.MyData
         ///  执行SQL语句：这里的多条语句采用同一事务处理，方便出错时回滚，保证数据统一
         /// </summary>
         /// <param name="strLink">数据库连接</param>
-        /// <param name="strExecSqlList">带执行的SQL列表</param>
+        /// <param name="sqls">带执行的SQL列表</param>
         /// <returns></returns>
-        public bool ExecNonSql(string strLink, List<string> strExecSqlList)
+        public bool ExecNonSql(string strLink, params string[] sqls)
         {
             SqlConnection conn = null;
             SqlCommand cmd = null;
@@ -370,7 +370,7 @@ namespace Tools.MyData
                 cmd.Transaction = tran;//绑定事务
 
                 //批量处理命令
-                foreach (string cmdText in strExecSqlList)
+                foreach (string cmdText in sqls)
                 {
                     cmd.CommandText = cmdText;
                     cmd.CommandType = CommandType.Text;
@@ -532,11 +532,11 @@ namespace Tools.MyData
         /// SQL批量执行（异步）
         /// </summary>
         /// <param name="strLink"></param>
-        /// <param name="strExecSqlList"></param>
+        /// <param name="sqls"></param>
         /// <returns></returns>
-        public Task<bool> ExecNonSqlAsync(string strLink, List<string> strExecSqlList)
+        public Task<bool> ExecNonSqlAsync(string strLink, params string[] sqls)
         {
-            return Task.Run(() => ExecNonSql(strLink, strExecSqlList));
+            return Task.Run(() => ExecNonSql(strLink, sqls));
         }
         /// <summary>
         /// 是否存在（异步）

Tools/UI/wAppModelEdit.cs

@@ -100,12 +100,12 @@ namespace Tools.UI
             if (_model == null)//新增
             {
                 model.ID = txtID.Text;
-                this._db.ExecNonSql(new List<string>() { AppModel.GetSql(model, 1) });
+                this._db.ExecNonSql(AppModel.GetSql(model, 1));
             }
             else//修改
             {
                 model.ID = _model.ID;
-                this._db.ExecNonSql(new List<string>() { AppModel.GetSql(model, 2) });
+                this._db.ExecNonSql(AppModel.GetSql(model, 2));
             }
 
             this.Close();

Tools/UI/wDBTools.cs

@@ -228,7 +228,7 @@ namespace Tools.UI
                     fs.Write(bytes, 0, bytes.Length);
                 }
                 //执行SQL
-                this._db.ExecNonSql(new List<string> { sql });
+                this._db.ExecNonSql(sql);
                 //Utils.Tip("Sql生成并执行成功！");
                 Utils.OpenFileWithNotepad(sqlFileName);
             }
@@ -462,7 +462,7 @@ namespace Tools.UI
                 }
             }
             //执行SQL语句
-            this._db.ExecNonSql(sqlist);
+            this._db.ExecNonSql(sqlist.ToArray());
         }
         /// <summary>
         /// 初始化默认路径

Tools/UI/wDbAnlysis.cs

@@ -64,7 +64,7 @@ namespace Tools.UI
                         SELECT COUNT(*) FROM {objName}
                     END";
                     stopwatch.Restart();
-                    this._db.ExecNonSql(new List<string> { anlysisSql });
+                    this._db.ExecNonSql(anlysisSql);
                     stopwatch.Stop();
                     result.Add($"{stopwatch.ElapsedMilliseconds / 1000F}秒\t{objName}");
                 }

Tools/UI/wSysChecker.cs

@@ -166,7 +166,7 @@ namespace Tools.UI
             {
                 using (SmpDB tmpdb = new SmpDB())
                 {
-                    tmpdb.ExecNonSql(localLink, sqlist);
+                    tmpdb.ExecNonSql(localLink, sqlist.ToArray());
                 }
             }
             catch (Exception ex)