From f9c23221d46cbdae8ec1259710e438c59dcf1ae7 Mon Sep 17 00:00:00 2001
From: JianWeie <jianweie@live.com>
Date: Wed, 11 May 2022 15:30:32 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=96=B0=E5=A2=9E=E3=80=91=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0sqlserver=E5=AD=98=E5=82=A8=E8=BF=87=E7=A8=8B=E7=9A=84?=
 =?UTF-8?q?=E8=B0=83=E7=94=A8=E6=96=B9=E6=B3=95=E5=B0=81=E8=A3=85=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CoreCms.Net.IRepository/IBaseRepository.cs | 23 ++++++++++++++++-
 CoreCms.Net.IServices/IBaseServices.cs     | 21 ++++++++++++++++
 CoreCms.Net.Repository/BaseRepository.cs   | 29 ++++++++++++++++++++++
 CoreCms.Net.Services/BaseServices.cs       | 29 ++++++++++++++++++++++
 4 files changed, 101 insertions(+), 1 deletion(-)

diff --git a/CoreCms.Net.IRepository/IBaseRepository.cs b/CoreCms.Net.IRepository/IBaseRepository.cs
index 53eccce7..7170583d 100644
--- a/CoreCms.Net.IRepository/IBaseRepository.cs
+++ b/CoreCms.Net.IRepository/IBaseRepository.cs
@@ -10,6 +10,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Data;
 using System.Linq.Expressions;
 using System.Threading.Tasks;
 using CoreCms.Net.Model.ViewModels.Basics;
@@ -21,7 +22,7 @@ namespace CoreCms.Net.IRepository
     ///     仓储通用接口类
     /// </summary>
     /// <typeparam name="T">泛型实体类</typeparam>
-    public interface IBaseRepository<T> where T : class, new()
+    public interface IBaseRepository<T> where T : class
     {
         /// <summary>
         ///     根据主值查询单条数据
@@ -817,5 +818,25 @@ namespace CoreCms.Net.IRepository
         /// <param name="sql"></param>
         /// <returns></returns>
         Task<List<T>> SqlQueryable(string sql);
+
+
+        /// <summary>
+        ///     执行调用存储过程（返回DataTable）
+        /// </summary>
+        /// <param name="useStoredProcedureName">存储过程名称</param>
+        /// <param name="parameters">参数</param>
+        /// <returns></returns>
+        Task<DataTable> SqlQueryDataTableByStoredProcedure(string useStoredProcedureName,
+            List<SugarParameter> parameters);
+
+        /// <summary>
+        ///     执行调用存储过程（返回List<T>）
+        /// </summary>
+        /// <typeparam name="T">返回类型</typeparam>
+        /// <param name="useStoredProcedureName">存储过程名称</param>
+        /// <param name="parameters">参数</param>
+        /// <returns></returns>
+        Task<List<T>> SqlQueryableByStoredProcedure(string useStoredProcedureName, List<SugarParameter> parameters);
+
     }
 }
\ No newline at end of file
diff --git a/CoreCms.Net.IServices/IBaseServices.cs b/CoreCms.Net.IServices/IBaseServices.cs
index 71b0f191..07489178 100644
--- a/CoreCms.Net.IServices/IBaseServices.cs
+++ b/CoreCms.Net.IServices/IBaseServices.cs
@@ -11,6 +11,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Data;
 using System.Linq.Expressions;
 using System.Threading.Tasks;
 using CoreCms.Net.Model.ViewModels.Basics;
@@ -815,5 +816,25 @@ namespace CoreCms.Net.IServices
         /// <param name="sql"></param>
         /// <returns></returns>
         Task<List<T>> SqlQueryable(string sql);
+
+        /// <summary>
+        ///     执行调用存储过程（返回DataTable）
+        /// </summary>
+        /// <param name="useStoredProcedureName">存储过程名称</param>
+        /// <param name="parameters">参数</param>
+        /// <returns></returns>
+        Task<DataTable> SqlQueryDataTableByStoredProcedure(string useStoredProcedureName,
+            List<SugarParameter> parameters);
+
+        /// <summary>
+        ///     执行调用存储过程（返回List<T>）
+        /// </summary>
+        /// <typeparam name="T">返回类型</typeparam>
+        /// <param name="useStoredProcedureName">存储过程名称</param>
+        /// <param name="parameters">参数</param>
+        /// <returns></returns>
+        Task<List<T>> SqlQueryableByStoredProcedure(string useStoredProcedureName, List<SugarParameter> parameters);
+
+
     }
 }
\ No newline at end of file
diff --git a/CoreCms.Net.Repository/BaseRepository.cs b/CoreCms.Net.Repository/BaseRepository.cs
index 6d877abc..bd96d025 100644
--- a/CoreCms.Net.Repository/BaseRepository.cs
+++ b/CoreCms.Net.Repository/BaseRepository.cs
@@ -10,6 +10,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Data;
 using System.Linq.Expressions;
 using System.Threading.Tasks;
 using CoreCms.Net.IRepository;
@@ -1299,5 +1300,33 @@ namespace CoreCms.Net.Repository
             var list = await DbBaseClient.SqlQueryable<T>(sql).ToListAsync();
             return list;
         }
+
+
+        /// <summary>
+        ///     执行调用存储过程（返回DataTable）
+        /// </summary>
+        /// <param name="useStoredProcedureName">存储过程名称</param>
+        /// <param name="parameters">参数</param>
+        /// <returns></returns>
+        public async Task<DataTable> SqlQueryDataTableByStoredProcedure(string useStoredProcedureName, List<SugarParameter> parameters)
+        {
+            var list = await DbBaseClient.Ado.UseStoredProcedure().GetDataTableAsync(useStoredProcedureName, parameters);//返回DataTable
+            return list;
+        }
+
+
+        /// <summary>
+        ///     执行调用存储过程（返回List<T>）
+        /// </summary>
+        /// <typeparam name="T">返回类型</typeparam>
+        /// <param name="useStoredProcedureName">存储过程名称</param>
+        /// <param name="parameters">参数</param>
+        /// <returns></returns>
+        public async Task<List<T>> SqlQueryableByStoredProcedure(string useStoredProcedureName, List<SugarParameter> parameters)
+        {
+            var list = await DbBaseClient.Ado.UseStoredProcedure().SqlQueryAsync<T>(useStoredProcedureName, parameters);//返回List
+            return list;
+        }
+
     }
 }
\ No newline at end of file
diff --git a/CoreCms.Net.Services/BaseServices.cs b/CoreCms.Net.Services/BaseServices.cs
index 2ccbfb44..84c8adc1 100644
--- a/CoreCms.Net.Services/BaseServices.cs
+++ b/CoreCms.Net.Services/BaseServices.cs
@@ -10,6 +10,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Data;
 using System.Linq.Expressions;
 using System.Threading.Tasks;
 using CoreCms.Net.IRepository;
@@ -1093,5 +1094,33 @@ namespace CoreCms.Net.Services
         {
             return await BaseDal.SqlQueryable(sql);
         }
+
+
+        /// <summary>
+        ///     执行调用存储过程（返回DataTable）
+        /// </summary>
+        /// <param name="useStoredProcedureName">存储过程名称</param>
+        /// <param name="parameters">参数</param>
+        /// <returns></returns>
+        public async Task<DataTable> SqlQueryDataTableByStoredProcedure(string useStoredProcedureName, List<SugarParameter> parameters)
+        {
+            var list = await BaseDal.SqlQueryDataTableByStoredProcedure(useStoredProcedureName, parameters);//返回DataTable
+            return list;
+        }
+
+
+        /// <summary>
+        ///     执行调用存储过程（返回List<T>）
+        /// </summary>
+        /// <typeparam name="T">返回类型</typeparam>
+        /// <param name="useStoredProcedureName">存储过程名称</param>
+        /// <param name="parameters">参数</param>
+        /// <returns></returns>
+        public async Task<List<T>> SqlQueryableByStoredProcedure(string useStoredProcedureName, List<SugarParameter> parameters)
+        {
+            var list = await BaseDal.SqlQueryableByStoredProcedure(useStoredProcedureName, parameters);//返回List
+            return list;
+        }
+
     }
 }
\ No newline at end of file