From f6dcbeb21844096209b34e88dbbfe1abc2087d59 Mon Sep 17 00:00:00 2001
From: rszn <645583145@qq.com>
Date: Wed, 5 Jun 2024 10:03:27 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E5=88=86=E9=A1=B5=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 HybirdFrameworkCore/Entity/IPage.cs          |  2 +-
 HybirdFrameworkCore/Entity/QueryPageModel.cs |  5 +--
 HybirdFrameworkCore/Entity/Result.cs         | 34 ++++++++------------
 Repository/BaseRepository.cs                 | 20 ++++++++----
 4 files changed, 31 insertions(+), 30 deletions(-)

diff --git a/HybirdFrameworkCore/Entity/IPage.cs b/HybirdFrameworkCore/Entity/IPage.cs
index b9a8d4a..69bcb57 100644
--- a/HybirdFrameworkCore/Entity/IPage.cs
+++ b/HybirdFrameworkCore/Entity/IPage.cs
@@ -13,7 +13,7 @@ public class IPage<T>
     public IPage(int total, QueryPageModel page, List<T>? rows)
     {
         Total = total;
-        PageNum = page.Page;
+        PageNum = page.PageNum;
         PageSize = page.PageSize;
         Rows = rows;
     }
diff --git a/HybirdFrameworkCore/Entity/QueryPageModel.cs b/HybirdFrameworkCore/Entity/QueryPageModel.cs
index b8bfd4a..72e63e6 100644
--- a/HybirdFrameworkCore/Entity/QueryPageModel.cs
+++ b/HybirdFrameworkCore/Entity/QueryPageModel.cs
@@ -5,9 +5,10 @@ public class QueryPageModel
     /// <summary>
     ///页码
     /// </summary>
-    public int Page { get; set; } = 1;
+    public int PageNum { get; set; } = 1;
+
     /// <summary>
     /// 页数
     /// </summary>
     public int PageSize { get; set; } = 10;
-}
\ No newline at end of file
+}
diff --git a/HybirdFrameworkCore/Entity/Result.cs b/HybirdFrameworkCore/Entity/Result.cs
index 3cd3831..ef7d03e 100644
--- a/HybirdFrameworkCore/Entity/Result.cs
+++ b/HybirdFrameworkCore/Entity/Result.cs
@@ -8,12 +8,14 @@
         /// <summary>
         /// 状态码
         /// </summary>
-  
+
         public int Status { get; set; } = 200;
+
         /// <summary>
         /// 操作是否成功
         /// </summary>
         public bool IsSuccess { get; set; } = false;
+
         /// <summary>
         /// 返回信息
         /// </summary>
@@ -29,12 +31,11 @@
         /// </summary>
         /// <param name="msg">消息</param>
         /// <returns></returns>
-        public static Result<T> Success(string msg = "成功")
+        public static Result<T> Success(T t = default)
         {
-            return Message(true, msg, default);
+            return Message(true, "成功", t);
         }
-     
-       
+
 
         /// <summary>
         /// 返回成功
@@ -46,9 +47,8 @@
         {
             return Message(true, msg, data);
         }
-        
-   
-        
+
+
         /// <summary>
         /// 返回失败
         /// </summary>
@@ -58,8 +58,8 @@
         {
             return Message(false, msg, default);
         }
-  
-        
+
+
         /// <summary>
         /// 返回失败
         /// </summary>
@@ -70,7 +70,7 @@
         {
             return Message(false, msg, data);
         }
-        
+
         /// <summary>
         /// 返回消息
         /// </summary>
@@ -82,7 +82,7 @@
         {
             return new Result<T>() { Msg = msg, Data = data, IsSuccess = success };
         }
-        
+
         /// <summary>
         /// 返回消息
         /// </summary>
@@ -90,15 +90,9 @@
         /// <param name="msg">消息</param>
         /// <param name="data">数据</param>
         /// <returns></returns>
-        public static Result<T> Message(bool success,  T data)
+        public static Result<T> Message(bool success, T data)
         {
-            return new Result<T>() { Msg="查询成功", Data = data, IsSuccess = success };
+            return new Result<T>() { Msg = "查询成功", Data = data, IsSuccess = success };
         }
-        
-     
-        
     }
-
-   
-
 }
diff --git a/Repository/BaseRepository.cs b/Repository/BaseRepository.cs
index 770092e..97f2c93 100644
--- a/Repository/BaseRepository.cs
+++ b/Repository/BaseRepository.cs
@@ -29,6 +29,12 @@ public abstract class BaseRepository<T> where T : class, new()
             .InSingle(pkValue);
     }
 
+    public ISugarQueryable<T> Queryable(bool blUseNoLock = false)
+    {
+        return DbBaseClient
+            .Queryable<T>().WithNoLockOrNot(blUseNoLock);
+    }
+
     /// <summary>
     ///     根据主值查询单条数据
     /// </summary>
@@ -109,7 +115,7 @@ public abstract class BaseRepository<T> where T : class, new()
                 .Queryable<T>()
                 .Where(predicate)
                 .WithNoLockOrNot(false)
-                .ToPageList(page.Page, page.PageSize, ref totalCount);
+                .ToPageList(page.PageNum, page.PageSize, ref totalCount);
 
 
 
@@ -135,7 +141,7 @@ public abstract class BaseRepository<T> where T : class, new()
                 .Queryable<T>()
                 .Where(predicate)
                 .WithNoLockOrNot(false)
-                .ToPageListAsync(page.Page, page.PageSize, totalCount);
+                .ToPageListAsync(page.PageNum, page.PageSize, totalCount);
 
 
 
@@ -159,7 +165,7 @@ public abstract class BaseRepository<T> where T : class, new()
         List<T> pageList = DbBaseClient
                 .Queryable<T>()
                 .WithNoLockOrNot(false)
-                .ToPageList(page.Page, page.PageSize, ref totalCount);
+                .ToPageList(page.PageNum, page.PageSize, ref totalCount);
 
         return new IPage<T>(totalCount, page, pageList);
     }
@@ -176,7 +182,7 @@ public abstract class BaseRepository<T> where T : class, new()
         List<T> pageList = await DbBaseClient
             .Queryable<T>()
             .WithNoLockOrNot(false)
-            .ToPageListAsync(page.Page, page.PageSize, totalCount);
+            .ToPageListAsync(page.PageNum, page.PageSize, totalCount);
 
         return new IPage<T>(totalCount, page, pageList);
     }
@@ -725,7 +731,7 @@ public abstract class BaseRepository<T> where T : class, new()
             .ToList();
     }
     /// <summary>
-    /// 
+    ///
     /// </summary>
     /// <typeparam name="T"></typeparam>
     /// <typeparam name="T2"></typeparam>
@@ -779,7 +785,7 @@ public abstract class BaseRepository<T> where T : class, new()
             .Insertable(entity)
             .ExecuteReturnEntity();
     }
-    
+
     /// <summary>
     ///     写入或者更新实体数据
     /// </summary>
@@ -1704,4 +1710,4 @@ public abstract class BaseRepository<T> where T : class, new()
 
 
 
-}
\ No newline at end of file
+}