更新代码生成器

NewLifeX · Jul 30, 2024 · 9f3bb62 · 9f3bb62
1 parent 07b527e
commit 9f3bb62
Show file tree

Hide file tree

Showing 18 changed files with 218 additions and 205 deletions.
diff --git a/XCode/Membership/Member.xml b/XCode/Membership/Member.xml
@@ -186,7 +186,7 @@
         <Index Columns="Name" />
       </Indexes>
     </Table>
-    <Table Name="Parameter" Description="字典参数。管理用户或系统全局的名值对数据，常用于参数配置场合" UsingCache="False">
+    <Table Name="Parameter" Description="字典参数。管理用户或系统全局的名值对数据，常用于参数配置场合">
       <Columns>
         <Column Name="ID" DataType="Int32" Identity="True" PrimaryKey="True" Description="编号" />
         <Column Name="UserID" DataType="Int32" Map="User@Id@$" Description="用户。按用户区分参数，用户0表示系统级" />
@@ -248,7 +248,7 @@
         <Index Columns="UpdateTime,ID" />
       </Indexes>
     </Table>
-    <Table Name="Log" Description="日志。应用系统审计日志，记录用户的各种操作，禁止修改和删除" ConnName="Log" InsertOnly="True">
+    <Table Name="Log" Description="日志。应用系统审计日志，记录用户的各种操作，禁止修改和删除" ConnName="Log" InsertOnly="True" UsingCache="False">
       <Columns>
         <Column Name="ID" DataType="Int64" PrimaryKey="True" DataScale="time" Description="编号" />
         <Column Name="Category" DataType="String" Description="类别" />

diff --git a/XCode/Membership/Membership.htm b/XCode/Membership/Membership.htm
@@ -1,37 +1,37 @@
 <style>
-    table {
-        border-collapse: collapse;
-        border: 1px solid;
-        border-color: rgb(211, 202, 221);
-    }
-
-    table thead,
-    table tr {
-        border-top-width: 1px;
-        border-top-style: solid;
-        border-top-color: rgb(211, 202, 221);
-    }
-
-    table {
-        border-bottom-width: 1px;
-        border-bottom-style: solid;
-        border-bottom-color: rgb(211, 202, 221);
-    }
-
-    table td,
-    table th {
-        padding: 5px 10px;
-        font-size: 14px;
-        font-family: Verdana;
-        color: rgb(95, 74, 121);
-    }
-
-    table tr:nth-child(even) {
-        background: rgb(223, 216, 232)
-    }
-
-    table tr:nth-child(odd) {
-        background: #FFF
+    table {
+        border-collapse: collapse;
+        border: 1px solid;
+        border-color: rgb(211, 202, 221);
+    }
+
+    table thead,
+    table tr {
+        border-top-width: 1px;
+        border-top-style: solid;
+        border-top-color: rgb(211, 202, 221);
+    }
+
+    table {
+        border-bottom-width: 1px;
+        border-bottom-style: solid;
+        border-bottom-color: rgb(211, 202, 221);
+    }
+
+    table td,
+    table th {
+        padding: 5px 10px;
+        font-size: 14px;
+        font-family: Verdana;
+        color: rgb(95, 74, 121);
+    }
+
+    table tr:nth-child(even) {
+        background: rgb(223, 216, 232)
+    }
+
+    table tr:nth-child(odd) {
+        background: #FFF
     }
 </style>
 <h3>用户（User）</h3>

diff --git a/XCode/Membership/make.bat → XCode/Membership/xcodetool.bat b/XCode/Membership/make.bat → XCode/Membership/xcodetool.bat
diff --git a/XCode/Membership/xcodetool.exe b/XCode/Membership/xcodetool.exe
diff --git a/XCode/Membership/地区.Biz.cs b/XCode/Membership/地区.Biz.cs
@@ -314,45 +314,6 @@ public static IList<Area> FindAllByParentID(Int32 parentid)
 
         return rs;
     }
-
-    /// <summary>根据拼音查找</summary>
-    /// <param name="pinYin">拼音</param>
-    /// <returns>实体列表</returns>
-    public static IList<Area> FindAllByPinYin(String pinYin)
-    {
-        if (pinYin.IsNullOrEmpty()) return new List<Area>();
-
-        // 实体缓存
-        if (Meta.Session.Count < 1000) return Meta.Cache.FindAll(e => e.PinYin.EqualIgnoreCase(pinYin));
-
-        return FindAll(_.PinYin == pinYin);
-    }
-
-    /// <summary>根据简拼查找</summary>
-    /// <param name="jianPin">简拼</param>
-    /// <returns>实体列表</returns>
-    public static IList<Area> FindAllByJianPin(String jianPin)
-    {
-        if (jianPin.IsNullOrEmpty()) return new List<Area>();
-
-        // 实体缓存
-        if (Meta.Session.Count < 1000) return Meta.Cache.FindAll(e => e.JianPin.EqualIgnoreCase(jianPin));
-
-        return FindAll(_.JianPin == jianPin);
-    }
-
-    /// <summary>根据地址编码查找</summary>
-    /// <param name="geoHash">地址编码</param>
-    /// <returns>实体列表</returns>
-    public static IList<Area> FindAllByGeoHash(String geoHash)
-    {
-        if (geoHash.IsNullOrEmpty()) return new List<Area>();
-
-        // 实体缓存
-        if (Meta.Session.Count < 1000) return Meta.Cache.FindAll(e => e.GeoHash.EqualIgnoreCase(geoHash));
-
-        return FindAll(_.GeoHash == geoHash);
-    }
     #endregion
 
     #region 高级查询

diff --git a/XCode/Membership/地区.cs b/XCode/Membership/地区.cs
@@ -261,6 +261,44 @@ public override Object? this[String name]
     #endregion
 
     #region 扩展查询
+    /// <summary>根据拼音查找</summary>
+    /// <param name="pinYin">拼音</param>
+    /// <returns>实体列表</returns>
+    public static IList<Area> FindAllByPinYin(String? pinYin)
+    {
+        if (pinYin == null) return [];
+
+        // 实体缓存
+        if (Meta.Session.Count < 1000) return Meta.Cache.FindAll(e => e.PinYin.EqualIgnoreCase(pinYin));
+
+        return FindAll(_.PinYin == pinYin);
+    }
+
+    /// <summary>根据简拼查找</summary>
+    /// <param name="jianPin">简拼</param>
+    /// <returns>实体列表</returns>
+    public static IList<Area> FindAllByJianPin(String? jianPin)
+    {
+        if (jianPin == null) return [];
+
+        // 实体缓存
+        if (Meta.Session.Count < 1000) return Meta.Cache.FindAll(e => e.JianPin.EqualIgnoreCase(jianPin));
+
+        return FindAll(_.JianPin == jianPin);
+    }
+
+    /// <summary>根据地址编码查找</summary>
+    /// <param name="geoHash">地址编码</param>
+    /// <returns>实体列表</returns>
+    public static IList<Area> FindAllByGeoHash(String? geoHash)
+    {
+        if (geoHash == null) return [];
+
+        // 实体缓存
+        if (Meta.Session.Count < 1000) return Meta.Cache.FindAll(e => e.GeoHash.EqualIgnoreCase(geoHash));
+
+        return FindAll(_.GeoHash == geoHash);
+    }
     #endregion
 
     #region 字段名

diff --git a/XCode/Membership/字典参数.Biz.cs b/XCode/Membership/字典参数.Biz.cs
@@ -73,32 +73,6 @@ public static IList<Parameter> FindAllByUserID(Int32 userId, String? category)
             ? Meta.Cache.FindAll(e => e.UserID == userId && e.Category == category)
             : FindAll(_.UserID == userId & _.Category == category);
     }
-
-    /// <summary>根据类别、名称查找</summary>
-    /// <param name="category">类别</param>
-    /// <param name="name">名称</param>
-    /// <returns>实体列表</returns>
-    public static IList<Parameter> FindAllByCategoryAndName(String category, String name)
-    {
-
-        // 实体缓存
-        if (Meta.Session.Count < 1000) return Meta.Cache.FindAll(e => e.Category.EqualIgnoreCase(category) && e.Name.EqualIgnoreCase(name));
-
-        return FindAll(_.Category == category & _.Name == name);
-    }
-
-    /// <summary>根据用户、类别、名称查找</summary>
-    /// <param name="userId">用户</param>
-    /// <param name="category">类别</param>
-    /// <param name="name">名称</param>
-    /// <returns>实体对象</returns>
-    public static Parameter FindByUserIDAndCategoryAndName(Int32 userId, String category, String name)
-    {
-        // 实体缓存
-        if (Meta.Session.Count < 1000) return Meta.Cache.Find(e => e.UserID == userId && e.Category.EqualIgnoreCase(category) && e.Name.EqualIgnoreCase(name));
-
-        return Find(_.UserID == userId & _.Category == category & _.Name == name);
-    }
     #endregion
 
     #region 高级查询

diff --git a/XCode/Membership/字典参数.cs b/XCode/Membership/字典参数.cs
@@ -333,17 +333,52 @@ public override Object? this[String name]
     #endregion
 
     #region 扩展查询
+    /// <summary>根据用户、类别、名称查找</summary>
+    /// <param name="userId">用户</param>
+    /// <param name="category">类别</param>
+    /// <param name="name">名称</param>
+    /// <returns>实体对象</returns>
+    public static Parameter? FindByUserIDAndCategoryAndName(Int32 userId, String? category, String name)
+    {
+        if (userId < 0) return null;
+        if (category == null) return null;
+        if (name.IsNullOrEmpty()) return null;
+
+        // 实体缓存
+        if (Meta.Session.Count < 1000) return Meta.Cache.Find(e => e.UserID == userId && e.Category.EqualIgnoreCase(category) && e.Name.EqualIgnoreCase(name));
+
+        return Find(_.UserID == userId & _.Category == category & _.Name == name);
+    }
+
     /// <summary>根据用户、类别查找</summary>
     /// <param name="userId">用户</param>
     /// <param name="category">类别</param>
     /// <returns>实体列表</returns>
-    public static IList<Parameter> FindAllByUserIDAndCategory(Int32 userId, String category)
+    public static IList<Parameter> FindAllByUserIDAndCategory(Int32 userId, String? category)
     {
         if (userId < 0) return [];
         if (category == null) return [];
 
+        // 实体缓存
+        if (Meta.Session.Count < 1000) return Meta.Cache.FindAll(e => e.UserID == userId && e.Category.EqualIgnoreCase(category));
+
         return FindAll(_.UserID == userId & _.Category == category);
     }
+
+    /// <summary>根据类别、名称查找</summary>
+    /// <param name="category">类别</param>
+    /// <param name="name">名称</param>
+    /// <returns>实体列表</returns>
+    public static IList<Parameter> FindAllByCategoryAndName(String? category, String name)
+    {
+        if (category == null) return [];
+        if (name.IsNullOrEmpty()) return [];
+
+        // 实体缓存
+        if (Meta.Session.Count < 1000) return Meta.Cache.FindAll(e => e.Category.EqualIgnoreCase(category) && e.Name.EqualIgnoreCase(name));
+
+        return FindAll(_.Category == category & _.Name == name);
+    }
     #endregion
 
     #region 字段名

diff --git a/XCode/Membership/日志.Biz.cs b/XCode/Membership/日志.Biz.cs
@@ -192,30 +192,6 @@ public static IList<Log> FindAllByCreateUserIDAndID(Int32 createUserId, Int64 id
         return FindAll(_.CreateUserID == createUserId & _.ID == id);
     }
 
-    /// <summary>根据操作、类别查找</summary>
-    /// <param name="action">操作</param>
-    /// <param name="category">类别</param>
-    /// <returns>实体列表</returns>
-    public static IList<Log> FindAllByActionAndCategory(String action, String category)
-    {
-        // 实体缓存
-        if (Meta.Session.Count < 1000) return Meta.Cache.FindAll(e => e.Action.EqualIgnoreCase(action) && e.Category.EqualIgnoreCase(category));
-
-        return FindAll(_.Action == action & _.Category == category);
-    }
-
-    /// <summary>根据类别、链接查找</summary>
-    /// <param name="category">类别</param>
-    /// <param name="linkId">链接</param>
-    /// <returns>实体列表</returns>
-    public static IList<Log> FindAllByCategoryAndLinkID(String category, Int64 linkId)
-    {
-        // 实体缓存
-        if (Meta.Session.Count < 1000) return Meta.Cache.FindAll(e => e.Category.EqualIgnoreCase(category) && e.LinkID == linkId);
-
-        return FindAll(_.Category == category & _.LinkID == linkId);
-    }
-
     /// <summary>根据创建用户查找</summary>
     /// <param name="createUserId">创建用户</param>
     /// <returns>实体列表</returns>
@@ -256,17 +232,4 @@ public static IList<Log> FindAllByCreateUserID(Int32 createUserId)
     /// <returns></returns>
     public override String ToString() => $"{Category} {Action} {UserName} {CreateTime:yyyy-MM-dd HH:mm:ss} {Remark}";
     #endregion
-}
-
-///// <summary>日志接口</summary>
-//public partial interface ILog
-//{
-//    /// <summary>保存</summary>
-//    /// <returns></returns>
-//    Int32 Save();
-
-//    /// <summary>异步保存</summary>
-//    /// <param name="msDelay">延迟保存的时间。默认0ms近实时保存</param>
-//    /// <returns></returns>
-//    Boolean SaveAsync(Int32 msDelay = 0);
-//}
+}
diff --git a/XCode/Membership/日志.cs b/XCode/Membership/日志.cs
@@ -273,6 +273,29 @@ public override Object? this[String name]
     #endregion
 
     #region 扩展查询
+    /// <summary>根据操作、类别查找</summary>
+    /// <param name="action">操作</param>
+    /// <param name="category">类别</param>
+    /// <returns>实体列表</returns>
+    public static IList<Log> FindAllByActionAndCategory(String action, String? category)
+    {
+        if (action.IsNullOrEmpty()) return [];
+        if (category == null) return [];
+
+        return FindAll(_.Action == action & _.Category == category);
+    }
+
+    /// <summary>根据类别、链接查找</summary>
+    /// <param name="category">类别</param>
+    /// <param name="linkId">链接</param>
+    /// <returns>实体列表</returns>
+    public static IList<Log> FindAllByCategoryAndLinkID(String? category, Int64 linkId)
+    {
+        if (category == null) return [];
+        if (linkId < 0) return [];
+
+        return FindAll(_.Category == category & _.LinkID == linkId);
+    }
     #endregion
 
     #region 数据清理

diff --git a/XCode/Membership/用户.Biz.cs b/XCode/Membership/用户.Biz.cs
@@ -218,45 +218,6 @@ public static User FindForLogin(String account)
         return user;
     }
 
-    /// <summary>根据邮件查找</summary>
-    /// <param name="mail">邮件</param>
-    /// <returns>实体列表</returns>
-    public static IList<User> FindAllByMail(String mail)
-    {
-        if (mail.IsNullOrEmpty()) return new List<User>();
-
-        // 实体缓存
-        if (Meta.Session.Count < 1000) return Meta.Cache.FindAll(e => e.Mail.EqualIgnoreCase(mail));
-
-        return FindAll(_.Mail == mail);
-    }
-
-    /// <summary>根据手机查找</summary>
-    /// <param name="mobile">手机</param>
-    /// <returns>实体列表</returns>
-    public static IList<User> FindAllByMobile(String mobile)
-    {
-        if (mobile.IsNullOrEmpty()) return new List<User>();
-
-        // 实体缓存
-        if (Meta.Session.Count < 1000) return Meta.Cache.FindAll(e => e.Mobile.EqualIgnoreCase(mobile));
-
-        return FindAll(_.Mobile == mobile);
-    }
-
-    /// <summary>根据代码查找</summary>
-    /// <param name="code">代码</param>
-    /// <returns>实体列表</returns>
-    public static IList<User> FindAllByCode(String code)
-    {
-        if (code.IsNullOrEmpty()) return new List<User>();
-
-        // 实体缓存
-        if (Meta.Session.Count < 1000) return Meta.Cache.FindAll(e => e.Code.EqualIgnoreCase(code));
-
-        return FindAll(_.Code == code);
-    }
-
     /// <summary>根据角色查找</summary>
     /// <param name="roleId">角色</param>
     /// <returns>实体列表</returns>