NewLife
/
XCode
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

代码生成时，枚举也支持使用0，默认值使用-1

This commit is contained in:
智能大石头 2025-01-13 16:37:01 +08:00
parent 3a22fd60da
commit 858b8d8082
22 changed files with 48 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
XCode/Code/EntityBuilder.cs
View File

@ -1685,7 +1685,7 @@ public class EntityBuilder : ClassBuilder
foreach (var dc in columns)
{
if (dc.DataType != null && dc.DataType.IsInt())
WriteLine("if ({0} < 0) return null;", dc.CamelName());
WriteLine("if ({0} <= 0) return null;", dc.CamelName());
else if (dc.DataType == typeof(String))
{
if (nullable && dc.Nullable)
@ -1787,7 +1787,7 @@ public class EntityBuilder : ClassBuilder
foreach (var dc in columns)
{
if (dc.DataType != null && dc.DataType.IsInt())
WriteLine("if ({0} < 0) return [];", dc.CamelName(), ClassName);
WriteLine("if ({0} <= 0) return [];", dc.CamelName(), ClassName);
else if (dc.DataType == typeof(String))
{
if (Option.Nullable && dc.Nullable)
@ -1950,7 +1950,7 @@ public class EntityBuilder : ClassBuilder
foreach (var dc in cs)
{
if (dc.DataType.IsInt() && (dc.DataType.IsEnum || !dc.Properties["Type"].IsNullOrEmpty()))
WriteLine("if ({0} > 0) exp &= _.{1} == {0};", dc.CamelName(), dc.Name);
WriteLine("if ({0} >= 0) exp &= _.{1} == {0};", dc.CamelName(), dc.Name);
else if (dc.DataType.IsInt())
WriteLine("if ({0} >= 0) exp &= _.{1} == {0};", dc.CamelName(), dc.Name);
else if (dc.DataType == typeof(Boolean))

4
XCodeTool/CubeBuilder.cs
View File

@ -349,9 +349,9 @@ public class CubeBuilder : ClassBuilder
if (dc.DataType.IsInt())
{
if (dc.DataType.IsEnum)
sb.AppendLine($" var {name} = ({dc.DataType.FullName})p[\"{name}\"].ToInt();");
sb.AppendLine($" var {name} = ({dc.DataType.FullName})p[\"{name}\"].ToInt(-1);");
else if (!dc.Properties["Type"].IsNullOrEmpty())
sb.AppendLine($" var {name} = ({dc.Properties["Type"]})p[\"{name}\"].ToInt();");
sb.AppendLine($" var {name} = ({dc.Properties["Type"]})p[\"{name}\"].ToInt(-1);");
else if (dc.DataType == typeof(Int64))
sb.AppendLine($" var {name} = p[\"{name}\"].ToLong(-1);");
else

2
XUnitTest.XCode/Code/Controllers/controller_parameter.cs
View File

@ -57,7 +57,7 @@ public class Parameter : EntityController<Parameter>
var userId = p["userId"].ToInt(-1);
var category = p["category"];
var name = p["name"];
var kind = (XCode.Membership.ParameterKinds)p["kind"].ToInt();
var kind = (XCode.Membership.ParameterKinds)p["kind"].ToInt(-1);
var enable = p["enable"]?.ToBoolean();
var start = p["dtStart"].ToDateTime();

2
XUnitTest.XCode/Code/Controllers/controller_user.cs
View File

@ -60,7 +60,7 @@ public class User : EntityController<User>
var code = p["code"];
var roleId = p["roleId"].ToInt(-1);
var departmentId = p["departmentId"].ToInt(-1);
var sex = (XCode.Membership.SexKinds)p["sex"].ToInt();
var sex = (XCode.Membership.SexKinds)p["sex"].ToInt(-1);
var mailVerified = p["mailVerified"]?.ToBoolean();
var mobileVerified = p["mobileVerified"]?.ToBoolean();
var areaId = p["areaId"].ToInt(-1);

4
XUnitTest.XCode/Code/Entity/地区.cs
View File

@ -266,7 +266,7 @@ public partial class Area : IArea, IEntity<IArea>
/// <returns>实体对象</returns>
public static Area? FindByID(Int32 id)
{
if (id < 0) return null;
if (id <= 0) return null;
// 实体缓存
if (Meta.Session.Count < 1000) return Meta.Cache.Find(e => e.ID == id);
@ -282,7 +282,7 @@ public partial class Area : IArea, IEntity<IArea>
/// <returns>实体列表</returns>
public static IList<Area> FindAllByParentID(Int32 parentId)
{
if (parentId < 0) return [];
if (parentId <= 0) return [];
// 实体缓存
if (Meta.Session.Count < 1000) return Meta.Cache.FindAll(e => e.ParentID == parentId);

2
XUnitTest.XCode/Code/Entity/字典参数.Biz.cs
View File

@ -144,7 +144,7 @@ public partial class Parameter : Entity<Parameter>
if (userId >= 0) exp &= _.UserID == userId;
if (!category.IsNullOrEmpty()) exp &= _.Category == category;
if (!name.IsNullOrEmpty()) exp &= _.Name == name;
if (kind > 0) exp &= _.Kind == kind;
if (kind >= 0) exp &= _.Kind == kind;
if (enable != null) exp &= _.Enable == enable;
exp &= _.UpdateTime.Between(start, end);
if (!key.IsNullOrEmpty()) exp &= SearchWhereByKeys(key);

8
XUnitTest.XCode/Code/Entity/字典参数.cs
View File

@ -338,7 +338,7 @@ public partial class Parameter : IParameter, IEntity<IParameter>
/// <returns>实体对象</returns>
public static Parameter? FindByID(Int32 id)
{
if (id < 0) return null;
if (id <= 0) return null;
// 实体缓存
if (Meta.Session.Count < 1000) return Meta.Cache.Find(e => e.ID == id);
@ -356,7 +356,7 @@ public partial class Parameter : IParameter, IEntity<IParameter>
/// <returns>实体对象</returns>
public static Parameter? FindByUserIDAndCategoryAndName(Int32 userId, String? category, String? name)
{
if (userId < 0) return null;
if (userId <= 0) return null;
if (category == null) return null;
if (name == null) return null;
@ -371,7 +371,7 @@ public partial class Parameter : IParameter, IEntity<IParameter>
/// <returns>实体列表</returns>
public static IList<Parameter> FindAllByUserID(Int32 userId)
{
if (userId < 0) return [];
if (userId <= 0) return [];
// 实体缓存
if (Meta.Session.Count < 1000) return Meta.Cache.FindAll(e => e.UserID == userId);
@ -385,7 +385,7 @@ public partial class Parameter : IParameter, IEntity<IParameter>
/// <returns>实体列表</returns>
public static IList<Parameter> FindAllByUserIDAndCategory(Int32 userId, String? category)
{
if (userId < 0) return [];
if (userId <= 0) return [];
if (category == null) return [];
// 实体缓存

6
XUnitTest.XCode/Code/Entity/成员日志.cs
View File

@ -289,7 +289,7 @@ public partial class MemberLog : IMemberLog, IEntity<IMemberLog>
/// <returns>实体对象</returns>
public static MemberLog? FindByID(Int64 id)
{
if (id < 0) return null;
if (id <= 0) return null;
return Find(_.ID == id);
}
@ -313,7 +313,7 @@ public partial class MemberLog : IMemberLog, IEntity<IMemberLog>
public static IList<MemberLog> FindAllByCategoryAndLinkID(String? category, Int32 linkId)
{
if (category == null) return [];
if (linkId < 0) return [];
if (linkId <= 0) return [];
return FindAll(_.Category == category & _.LinkID == linkId);
}
@ -323,7 +323,7 @@ public partial class MemberLog : IMemberLog, IEntity<IMemberLog>
/// <returns>实体列表</returns>
public static IList<MemberLog> FindAllByCreateUserID(Int32 createUserId)
{
if (createUserId < 0) return [];
if (createUserId <= 0) return [];
return FindAll(_.CreateUserID == createUserId);
}

6
XUnitTest.XCode/Code/Entity/日志.cs
View File

@ -280,7 +280,7 @@ public partial class Log : ILog, IEntity<ILog>
/// <returns>实体对象</returns>
public static Log? FindByID(Int64 id)
{
if (id < 0) return null;
if (id <= 0) return null;
return Find(_.ID == id);
}
@ -304,7 +304,7 @@ public partial class Log : ILog, IEntity<ILog>
public static IList<Log> FindAllByCategoryAndLinkID(String? category, Int32 linkId)
{
if (category == null) return [];
if (linkId < 0) return [];
if (linkId <= 0) return [];
return FindAll(_.Category == category & _.LinkID == linkId);
}
@ -314,7 +314,7 @@ public partial class Log : ILog, IEntity<ILog>
/// <returns>实体列表</returns>
public static IList<Log> FindAllByCreateUserID(Int32 createUserId)
{
if (createUserId < 0) return [];
if (createUserId <= 0) return [];
return FindAll(_.CreateUserID == createUserId);
}

2
XUnitTest.XCode/Code/Entity/用户.Biz.cs
View File

@ -179,7 +179,7 @@ public partial class User : Entity<User>
if (!mobile.IsNullOrEmpty()) exp &= _.Mobile == mobile;
if (!code.IsNullOrEmpty()) exp &= _.Code == code;
if (roleId >= 0) exp &= _.RoleID == roleId;
if (sex > 0) exp &= _.Sex == sex;
if (sex >= 0) exp &= _.Sex == sex;
if (areaId >= 0) exp &= _.AreaId == areaId;
if (online != null) exp &= _.Online == online;
if (enable != null) exp &= _.Enable == enable;

4
XUnitTest.XCode/Code/Entity/用户.cs
View File

@ -475,7 +475,7 @@ public partial class User : IUser, IEntity<IUser>
/// <returns>实体对象</returns>
public static User? FindByID(Int32 id)
{
if (id < 0) return null;
if (id <= 0) return null;
// 实体缓存
if (Meta.Session.Count < 1000) return Meta.Cache.Find(e => e.ID == id);
@ -546,7 +546,7 @@ public partial class User : IUser, IEntity<IUser>
/// <returns>实体列表</returns>
public static IList<User> FindAllByRoleID(Int32 roleId)
{
if (roleId < 0) return [];
if (roleId <= 0) return [];
// 实体缓存
if (Meta.Session.Count < 1000) return Meta.Cache.FindAll(e => e.RoleID == roleId);

6
XUnitTest.XCode/Code/Entity/用户日志.cs
View File

@ -291,7 +291,7 @@ public partial class UserLog : IUserLog, IEntity<IUserLog>
/// <returns>实体对象</returns>
public static UserLog? FindByID(Int64 id)
{
if (id < 0) return null;
if (id <= 0) return null;
return Find(_.ID == id);
}
@ -315,7 +315,7 @@ public partial class UserLog : IUserLog, IEntity<IUserLog>
public static IList<UserLog> FindAllByCategoryAndLinkID(String? category, Int32 linkId)
{
if (category == null) return [];
if (linkId < 0) return [];
if (linkId <= 0) return [];
return FindAll(_.Category == category & _.LinkID == linkId);
}
@ -325,7 +325,7 @@ public partial class UserLog : IUserLog, IEntity<IUserLog>
/// <returns>实体列表</returns>
public static IList<UserLog> FindAllByCreateUserID(Int32 createUserId)
{
if (createUserId < 0) return [];
if (createUserId <= 0) return [];
return FindAll(_.CreateUserID == createUserId);
}

2
XUnitTest.XCode/Code/Entity/租户.cs
View File

@ -256,7 +256,7 @@ public partial class Tenant : ITenant, IEntity<ITenant>
/// <returns>实体对象</returns>
public static Tenant? FindById(Int32 id)
{
if (id < 0) return null;
if (id <= 0) return null;
// 实体缓存
if (Meta.Session.Count < 1000) return Meta.Cache.Find(e => e.Id == id);

10
XUnitTest.XCode/Code/Entity/租户关系.cs
View File

@ -229,7 +229,7 @@ public partial class TenantUser : ITenantUser, IEntity<ITenantUser>
/// <returns>实体对象</returns>
public static TenantUser? FindById(Int32 id)
{
if (id < 0) return null;
if (id <= 0) return null;
// 实体缓存
if (Meta.Session.Count < 1000) return Meta.Cache.Find(e => e.Id == id);
@ -246,8 +246,8 @@ public partial class TenantUser : ITenantUser, IEntity<ITenantUser>
/// <returns>实体对象</returns>
public static TenantUser? FindByTenantIdAndUserId(Int32 tenantId, Int32 userId)
{
if (tenantId < 0) return null;
if (userId < 0) return null;
if (tenantId <= 0) return null;
if (userId <= 0) return null;
// 实体缓存
if (Meta.Session.Count < 1000) return Meta.Cache.Find(e => e.TenantId == tenantId && e.UserId == userId);
@ -260,7 +260,7 @@ public partial class TenantUser : ITenantUser, IEntity<ITenantUser>
/// <returns>实体列表</returns>
public static IList<TenantUser> FindAllByTenantId(Int32 tenantId)
{
if (tenantId < 0) return [];
if (tenantId <= 0) return [];
// 实体缓存
if (Meta.Session.Count < 1000) return Meta.Cache.FindAll(e => e.TenantId == tenantId);
@ -273,7 +273,7 @@ public partial class TenantUser : ITenantUser, IEntity<ITenantUser>
/// <returns>实体列表</returns>
public static IList<TenantUser> FindAllByUserId(Int32 userId)
{
if (userId < 0) return [];
if (userId <= 0) return [];
// 实体缓存
if (Meta.Session.Count < 1000) return Meta.Cache.FindAll(e => e.UserId == userId);

6
XUnitTest.XCode/Code/Entity/菜单.cs
View File

@ -373,7 +373,7 @@ public partial class Menu : IMenu, IEntity<IMenu>
/// <returns>实体对象</returns>
public static Menu? FindByID(Int32 id)
{
if (id < 0) return null;
if (id <= 0) return null;
// 实体缓存
if (Meta.Session.Count < 1000) return Meta.Cache.Find(e => e.ID == id);
@ -403,7 +403,7 @@ public partial class Menu : IMenu, IEntity<IMenu>
/// <returns>实体对象</returns>
public static Menu? FindByParentIDAndName(Int32 parentId, String name)
{
if (parentId < 0) return null;
if (parentId <= 0) return null;
if (name.IsNullOrEmpty()) return null;
// 实体缓存
@ -417,7 +417,7 @@ public partial class Menu : IMenu, IEntity<IMenu>
/// <returns>实体列表</returns>
public static IList<Menu> FindAllByParentID(Int32 parentId)
{
if (parentId < 0) return [];
if (parentId <= 0) return [];
// 实体缓存
if (Meta.Session.Count < 1000) return Meta.Cache.FindAll(e => e.ParentID == parentId);

2
XUnitTest.XCode/Code/Entity/角色.cs
View File

@ -306,7 +306,7 @@ public partial class Role : IRole, IEntity<IRole>
/// <returns>实体对象</returns>
public static Role? FindByID(Int32 id)
{
if (id < 0) return null;
if (id <= 0) return null;
// 实体缓存
if (Meta.Session.Count < 1000) return Meta.Cache.Find(e => e.ID == id);

6
XUnitTest.XCode/Code/Entity/部门.cs
View File

@ -381,7 +381,7 @@ public partial class Department : IDepartment, IEntity<IDepartment>
/// <returns>实体对象</returns>
public static Department? FindByID(Int32 id)
{
if (id < 0) return null;
if (id <= 0) return null;
// 实体缓存
if (Meta.Session.Count < 1000) return Meta.Cache.Find(e => e.ID == id);
@ -411,7 +411,7 @@ public partial class Department : IDepartment, IEntity<IDepartment>
/// <returns>实体列表</returns>
public static IList<Department> FindAllByParentIDAndName(Int32 parentId, String name)
{
if (parentId < 0) return [];
if (parentId <= 0) return [];
if (name.IsNullOrEmpty()) return [];
// 实体缓存
@ -438,7 +438,7 @@ public partial class Department : IDepartment, IEntity<IDepartment>
/// <returns>实体列表</returns>
public static IList<Department> FindAllByTenantId(Int32 tenantId)
{
if (tenantId < 0) return [];
if (tenantId <= 0) return [];
// 实体缓存
if (Meta.Session.Count < 1000) return Meta.Cache.FindAll(e => e.TenantId == tenantId);

6
XUnitTest.XCode/Code/entity_log_normal.cs
View File

@ -248,7 +248,7 @@ public partial class Log
/// <returns>实体对象</returns>
public static Log? FindByID(Int64 id)
{
if (id < 0) return null;
if (id <= 0) return null;
return Find(_.ID == id);
}
@ -272,7 +272,7 @@ public partial class Log
public static IList<Log> FindAllByCategoryAndLinkID(String? category, Int64 linkId)
{
if (category == null) return [];
if (linkId < 0) return [];
if (linkId <= 0) return [];
return FindAll(_.Category == category & _.LinkID == linkId);
}
@ -282,7 +282,7 @@ public partial class Log
/// <returns>实体列表</returns>
public static IList<Log> FindAllByCreateUserID(Int32 createUserId)
{
if (createUserId < 0) return [];
if (createUserId <= 0) return [];
return FindAll(_.CreateUserID == createUserId);
}

6
XUnitTest.XCode/Code/entity_user_normal.cs
View File

@ -468,7 +468,7 @@ public partial class User
/// <returns>实体对象</returns>
public static User? FindByID(Int32 id)
{
if (id < 0) return null;
if (id <= 0) return null;
// 实体缓存
if (Meta.Session.Count < 1000) return Meta.Cache.Find(e => e.ID == id);
@ -539,7 +539,7 @@ public partial class User
/// <returns>实体列表</returns>
public static IList<User> FindAllByRoleID(Int32 roleId)
{
if (roleId < 0) return [];
if (roleId <= 0) return [];
// 实体缓存
if (Meta.Session.Count < 1000) return Meta.Cache.FindAll(e => e.RoleID == roleId);
@ -552,7 +552,7 @@ public partial class User
/// <returns>实体列表</returns>
public static IList<User> FindAllByDepartmentID(Int32 departmentId)
{
if (departmentId < 0) return [];
if (departmentId <= 0) return [];
// 实体缓存
if (Meta.Session.Count < 1000) return Meta.Cache.FindAll(e => e.DepartmentID == departmentId);

2
XUnitTest.XCode/Code/entity_user_normal_biz.cs
View File

@ -178,7 +178,7 @@ public partial class User : Entity<User>
if (!code.IsNullOrEmpty()) exp &= _.Code == code;
if (roleId >= 0) exp &= _.RoleID == roleId;
if (departmentId >= 0) exp &= _.DepartmentID == departmentId;
if (sex > 0) exp &= _.Sex == sex;
if (sex >= 0) exp &= _.Sex == sex;
if (mailVerified != null) exp &= _.MailVerified == mailVerified;
if (mobileVerified != null) exp &= _.MobileVerified == mobileVerified;
if (areaId >= 0) exp &= _.AreaId == areaId;

4
XUnitTest.XCode/Model/Code/entity_city.cs
View File

@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Runtime.Serialization;
@ -262,7 +262,7 @@ public partial class CorePerson
/// <returns>实体列表</returns>
public static IList<CorePerson> FindAllByBuildID(Int32 buildId)
{
if (buildId < 0) return [];
if (buildId <= 0) return [];
// 实体缓存
if (Meta.Session.Count < 1000) return Meta.Cache.FindAll(e => e.BuildID == buildId);

3
XUnitTest.XCode/XUnitTest.XCode.csproj
View File

@ -116,9 +116,6 @@
<Compile Update="Code\class_user_interface.cs">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Compile>
<Compile Update="Model\Code\entity_city.cs">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Compile>
<Compile Update="Model\Code\entity_city_biz.cs">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Compile>