ow
This commit is contained in:
owenchen committed
1 parent
6c86c59bdc
commit
31de6c4cd6
15 files changed
+1001
-666
No files matched your search
@@ -4,175 +4,180 @@ using CloudBuilder.Core.DatabaseAccessor.Entity;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using System.ComponentModel.DataAnnotations.Schema;
|
||||
namespace CloudBuilder.Master.Entity
|
||||
{
|
||||
{
|
||||
[TypeScript]
|
||||
[Table("family_tree_view")]
|
||||
public class FamilyTreeViewEntity : ViewEntityBase
|
||||
{
|
||||
|
||||
public FamilyTreeViewEntity()
|
||||
{
|
||||
}
|
||||
|
||||
[Column("ancestor_person_id")]
|
||||
public string AncestorPersonId { get; set; }
|
||||
[Column("brief")]
|
||||
public string? Brief { get; set; }
|
||||
[Column("common_name")]
|
||||
public string? CommonName { get; set; }
|
||||
[Column("genealogy_name")]
|
||||
public string? GenealogyName { get; set; }
|
||||
[Column("public_indc")]
|
||||
public string PublicIndc { get; set; }
|
||||
[Column("surname")]
|
||||
public string Surname { get; set; }
|
||||
[Column("tree_id")]
|
||||
public string TreeId { get; set; }
|
||||
[Column("tree_name")]
|
||||
public string TreeName { get; set; }
|
||||
|
||||
public const string ANCESTOR_PERSON_ID = "AncestorPersonId";
|
||||
public const string BRIEF = "Brief";
|
||||
public const string COMMON_NAME = "CommonName";
|
||||
public const string GENEALOGY_NAME = "GenealogyName";
|
||||
public const string PUBLIC_INDC = "PublicIndc";
|
||||
public const string SURNAME = "Surname";
|
||||
public const string TREE_ID = "TreeId";
|
||||
public const string TREE_NAME = "TreeName";
|
||||
|
||||
public const string DB_NAME_FAMILY_TREE_VIEW = "family_tree_view";
|
||||
public const string DB_NAME_FIELDS="ancestor_person_id,brief,common_name,genealogy_name,public_indc,surname,tree_id,tree_name";
|
||||
|
||||
public const string DB_ANCESTOR_PERSON_ID = "ancestor_person_id";
|
||||
public const string DB_BRIEF = "brief";
|
||||
public const string DB_COMMON_NAME = "common_name";
|
||||
public const string DB_GENEALOGY_NAME = "genealogy_name";
|
||||
public const string DB_PUBLIC_INDC = "public_indc";
|
||||
public const string DB_SURNAME = "surname";
|
||||
public const string DB_TREE_ID = "tree_id";
|
||||
public const string DB_TREE_NAME = "tree_name";
|
||||
|
||||
private string ProviderName { get; set; }
|
||||
|
||||
public static FamilyTreeViewEntity GetInstance(string providerName)
|
||||
{
|
||||
return new FamilyTreeViewEntity() { ProviderName = providerName };
|
||||
}
|
||||
|
||||
public virtual void CopyFrom(FamilyTreeViewEntity source)
|
||||
{
|
||||
CopyFrom(source, true);
|
||||
}
|
||||
|
||||
public virtual void CopyFrom(FamilyTreeViewEntity source, bool includeSystemFields)
|
||||
{
|
||||
if (source == null)
|
||||
{
|
||||
throw new NullReferenceException("Source entity is null.");
|
||||
}
|
||||
|
||||
this.AncestorPersonId = source.AncestorPersonId;
|
||||
this.Brief = source.Brief;
|
||||
this.CommonName = source.CommonName;
|
||||
this.GenealogyName = source.GenealogyName;
|
||||
this.PublicIndc = source.PublicIndc;
|
||||
this.Surname = source.Surname;
|
||||
this.TreeId = source.TreeId;
|
||||
this.TreeName = source.TreeName;
|
||||
|
||||
if (includeSystemFields)
|
||||
public FamilyTreeViewEntity()
|
||||
{
|
||||
}
|
||||
}
|
||||
|
||||
public override string GetSelectFrom()
|
||||
{
|
||||
if (ProviderName.Contains("MySql"))
|
||||
{
|
||||
return GetSelectFromByMySql();
|
||||
}
|
||||
else if (ProviderName.Contains("SqlServer"))
|
||||
{
|
||||
return GetSelectFromByBySqlServer();
|
||||
}
|
||||
else
|
||||
{
|
||||
throw new NotSupportedException($"不支持的数据库提供程序:{ProviderName}");
|
||||
}
|
||||
}
|
||||
public string GetSelectFromByMySql()
|
||||
{
|
||||
return $" select {DB_NAME_FIELDS} from { DB_NAME_FAMILY_TREE_VIEW} with(nolock) ";
|
||||
}
|
||||
public string GetSelectFromByBySqlServer()
|
||||
{
|
||||
return $" select {DB_NAME_FIELDS} from { DB_NAME_FAMILY_TREE_VIEW} ";
|
||||
}
|
||||
[Column("ancestor_person_id")]
|
||||
public string AncestorPersonId { get; set; }
|
||||
[Column("brief")]
|
||||
public string? Brief { get; set; }
|
||||
[Column("common_name")]
|
||||
public string? CommonName { get; set; }
|
||||
[Column("genealogy_name")]
|
||||
public string? GenealogyName { get; set; }
|
||||
[Column("public_indc")]
|
||||
public string PublicIndc { get; set; }
|
||||
[Column("tree_cover_filename")]
|
||||
public string? TreeCoverFilename { get; set; }
|
||||
[Column("surname")]
|
||||
public string Surname { get; set; }
|
||||
[Column("tree_id")]
|
||||
public string TreeId { get; set; }
|
||||
[Column("tree_name")]
|
||||
public string TreeName { get; set; }
|
||||
|
||||
public override string GetSelectCountFrom(string sqlWhere)
|
||||
{
|
||||
if (ProviderName.Contains("MySql"))
|
||||
{
|
||||
return GetSelectCountFromByMySql(sqlWhere);
|
||||
}
|
||||
else if (ProviderName.Contains("SqlServer"))
|
||||
{
|
||||
return GetSelectCountFromBySqlServer(sqlWhere);
|
||||
}
|
||||
else
|
||||
{
|
||||
throw new NotSupportedException($"不支持的数据库提供程序:{ProviderName}");
|
||||
}
|
||||
}
|
||||
public const string ANCESTOR_PERSON_ID = "AncestorPersonId";
|
||||
public const string BRIEF = "Brief";
|
||||
public const string COMMON_NAME = "CommonName";
|
||||
public const string GENEALOGY_NAME = "GenealogyName";
|
||||
public const string PUBLIC_INDC = "PublicIndc";
|
||||
public const string TREE_COVER_FILENAME = "TreeCoverFilename";
|
||||
public const string SURNAME = "Surname";
|
||||
public const string TREE_ID = "TreeId";
|
||||
public const string TREE_NAME = "TreeName";
|
||||
|
||||
public string GetSelectCountFromByMySql(string sqlWhere)
|
||||
{
|
||||
return $" select count(*) from { DB_NAME_FAMILY_TREE_VIEW} where 1=1 {sqlWhere}";
|
||||
}
|
||||
public string GetSelectCountFromBySqlServer(string sqlWhere)
|
||||
{
|
||||
return $" select count(*) from { DB_NAME_FAMILY_TREE_VIEW} with(nolock) where 1=1 {sqlWhere}";
|
||||
}
|
||||
public const string DB_NAME_FAMILY_TREE_VIEW = "family_tree_view";
|
||||
public const string DB_NAME_FIELDS = "ancestor_person_id,brief,common_name,genealogy_name,public_indc,tree_cover_filename,surname,tree_id,tree_name";
|
||||
|
||||
public override string GetSelectTopFrom(int limit, int start, string orderby, string orderbytag, string sqlWhere)
|
||||
{
|
||||
if (ProviderName.Contains("MySql"))
|
||||
public const string DB_ANCESTOR_PERSON_ID = "ancestor_person_id";
|
||||
public const string DB_BRIEF = "brief";
|
||||
public const string DB_COMMON_NAME = "common_name";
|
||||
public const string DB_GENEALOGY_NAME = "genealogy_name";
|
||||
public const string DB_PUBLIC_INDC = "public_indc";
|
||||
public const string DB_TREE_COVER_FILENAME = "tree_cover_filename";
|
||||
public const string DB_SURNAME = "surname";
|
||||
public const string DB_TREE_ID = "tree_id";
|
||||
public const string DB_TREE_NAME = "tree_name";
|
||||
|
||||
private string ProviderName { get; set; }
|
||||
|
||||
public static FamilyTreeViewEntity GetInstance(string providerName)
|
||||
{
|
||||
return GetSelectTopFromByMySql(limit, start, orderby, orderbytag, sqlWhere);
|
||||
return new FamilyTreeViewEntity() { ProviderName = providerName };
|
||||
}
|
||||
else if (ProviderName.Contains("SqlServer"))
|
||||
|
||||
public virtual void CopyFrom(FamilyTreeViewEntity source)
|
||||
{
|
||||
return GetSelectTopFromBySqlServer(limit, start, orderby, orderbytag, sqlWhere);
|
||||
CopyFrom(source, true);
|
||||
}
|
||||
else
|
||||
|
||||
public virtual void CopyFrom(FamilyTreeViewEntity source, bool includeSystemFields)
|
||||
{
|
||||
throw new NotSupportedException($"不支持的数据库提供程序:{ProviderName}");
|
||||
if (source == null)
|
||||
{
|
||||
throw new NullReferenceException("Source entity is null.");
|
||||
}
|
||||
|
||||
this.AncestorPersonId = source.AncestorPersonId;
|
||||
this.Brief = source.Brief;
|
||||
this.CommonName = source.CommonName;
|
||||
this.GenealogyName = source.GenealogyName;
|
||||
this.PublicIndc = source.PublicIndc;
|
||||
this.TreeCoverFilename = source.TreeCoverFilename;
|
||||
this.Surname = source.Surname;
|
||||
this.TreeId = source.TreeId;
|
||||
this.TreeName = source.TreeName;
|
||||
|
||||
if (includeSystemFields)
|
||||
{
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public string GetSelectTopFromByMySql(int limit, int start,string orderby,string orderbytag, string sqlWhere)
|
||||
{
|
||||
if (string.IsNullOrEmpty(orderbytag) || orderbytag.Trim() != "desc") orderbytag = "asc";
|
||||
|
||||
if (string.IsNullOrEmpty(orderby) || !DB_NAME_FIELDS.Contains(orderby)) orderby = DB_ANCESTOR_PERSON_ID ; int offset = limit * (start - 1);
|
||||
return $" select {DB_NAME_FIELDS} from (select {DB_NAME_FIELDS} ,row_number() over(order by {orderby} {orderbytag}) as num from { DB_NAME_FAMILY_TREE_VIEW} where 1=1 {sqlWhere} ) a where num> {offset} LIMIT {limit} ";
|
||||
}
|
||||
public override string GetSelectFrom()
|
||||
{
|
||||
if (ProviderName.Contains("MySql"))
|
||||
{
|
||||
return GetSelectFromByMySql();
|
||||
}
|
||||
else if (ProviderName.Contains("SqlServer"))
|
||||
{
|
||||
return GetSelectFromByBySqlServer();
|
||||
}
|
||||
else
|
||||
{
|
||||
throw new NotSupportedException($"不支持的数据库提供程序:{ProviderName}");
|
||||
}
|
||||
}
|
||||
public string GetSelectFromByMySql()
|
||||
{
|
||||
return $" select {DB_NAME_FIELDS} from {DB_NAME_FAMILY_TREE_VIEW} with(nolock) ";
|
||||
}
|
||||
public string GetSelectFromByBySqlServer()
|
||||
{
|
||||
return $" select {DB_NAME_FIELDS} from {DB_NAME_FAMILY_TREE_VIEW} ";
|
||||
}
|
||||
|
||||
public string GetSelectTopFromBySqlServer(int limit, int start,string orderby,string orderbytag, string sqlWhere)
|
||||
{
|
||||
if (string.IsNullOrEmpty(orderbytag) || orderbytag.Trim() != "desc") orderbytag = "asc";
|
||||
|
||||
if (string.IsNullOrEmpty(orderby) || !DB_NAME_FIELDS.Contains(orderby)) orderby = DB_ANCESTOR_PERSON_ID ; string top = limit > 0 ? $"top {limit}" : "";
|
||||
return $" select {top} {DB_NAME_FIELDS} from (select {DB_NAME_FIELDS} ,row_number() over(order by {orderby} {orderbytag}) as num from { DB_NAME_FAMILY_TREE_VIEW} with(nolock) where 1=1 {sqlWhere} ) a where num> {limit * (start - 1)}";
|
||||
}
|
||||
public override string GetSelectCountFrom(string sqlWhere)
|
||||
{
|
||||
if (ProviderName.Contains("MySql"))
|
||||
{
|
||||
return GetSelectCountFromByMySql(sqlWhere);
|
||||
}
|
||||
else if (ProviderName.Contains("SqlServer"))
|
||||
{
|
||||
return GetSelectCountFromBySqlServer(sqlWhere);
|
||||
}
|
||||
else
|
||||
{
|
||||
throw new NotSupportedException($"不支持的数据库提供程序:{ProviderName}");
|
||||
}
|
||||
}
|
||||
|
||||
public FamilyTreeViewEntity Clone()
|
||||
{
|
||||
FamilyTreeViewEntity result = new FamilyTreeViewEntity();
|
||||
result.CopyFrom(this);
|
||||
public string GetSelectCountFromByMySql(string sqlWhere)
|
||||
{
|
||||
return $" select count(*) from {DB_NAME_FAMILY_TREE_VIEW} where 1=1 {sqlWhere}";
|
||||
}
|
||||
public string GetSelectCountFromBySqlServer(string sqlWhere)
|
||||
{
|
||||
return $" select count(*) from {DB_NAME_FAMILY_TREE_VIEW} with(nolock) where 1=1 {sqlWhere}";
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
public override string GetSelectTopFrom(int limit, int start, string orderby, string orderbytag, string sqlWhere)
|
||||
{
|
||||
if (ProviderName.Contains("MySql"))
|
||||
{
|
||||
return GetSelectTopFromByMySql(limit, start, orderby, orderbytag, sqlWhere);
|
||||
}
|
||||
else if (ProviderName.Contains("SqlServer"))
|
||||
{
|
||||
return GetSelectTopFromBySqlServer(limit, start, orderby, orderbytag, sqlWhere);
|
||||
}
|
||||
else
|
||||
{
|
||||
throw new NotSupportedException($"不支持的数据库提供程序:{ProviderName}");
|
||||
}
|
||||
}
|
||||
|
||||
public string GetSelectTopFromByMySql(int limit, int start, string orderby, string orderbytag, string sqlWhere)
|
||||
{
|
||||
if (string.IsNullOrEmpty(orderbytag) || orderbytag.Trim() != "desc") orderbytag = "asc";
|
||||
|
||||
if (string.IsNullOrEmpty(orderby) || !DB_NAME_FIELDS.Contains(orderby)) orderby = DB_ANCESTOR_PERSON_ID; int offset = limit * (start - 1);
|
||||
return $" select {DB_NAME_FIELDS} from (select {DB_NAME_FIELDS} ,row_number() over(order by {orderby} {orderbytag}) as num from {DB_NAME_FAMILY_TREE_VIEW} where 1=1 {sqlWhere} ) a where num> {offset} LIMIT {limit} ";
|
||||
}
|
||||
|
||||
public string GetSelectTopFromBySqlServer(int limit, int start, string orderby, string orderbytag, string sqlWhere)
|
||||
{
|
||||
if (string.IsNullOrEmpty(orderbytag) || orderbytag.Trim() != "desc") orderbytag = "asc";
|
||||
|
||||
if (string.IsNullOrEmpty(orderby) || !DB_NAME_FIELDS.Contains(orderby)) orderby = DB_ANCESTOR_PERSON_ID; string top = limit > 0 ? $"top {limit}" : "";
|
||||
return $" select {top} {DB_NAME_FIELDS} from (select {DB_NAME_FIELDS} ,row_number() over(order by {orderby} {orderbytag}) as num from {DB_NAME_FAMILY_TREE_VIEW} with(nolock) where 1=1 {sqlWhere} ) a where num> {limit * (start - 1)}";
|
||||
}
|
||||
|
||||
public FamilyTreeViewEntity Clone()
|
||||
{
|
||||
FamilyTreeViewEntity result = new FamilyTreeViewEntity();
|
||||
result.CopyFrom(this);
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
@@ -24,5 +24,8 @@ namespace CloudBuilder.Master.Policy
|
||||
|
||||
/// <summary>文章正文/配图目录（article_filename.file_name 对应，前端上传 FilePath 头须一致）</summary>
|
||||
public const string ARTICLE_IMAGE = "ArticleImage";
|
||||
|
||||
/// <summary>族谱封面目录（family_tree.tree_cover_filename 对应，前端上传 FilePath 头须一致）</summary>
|
||||
public const string TREE_COVER = "TreeCover";
|
||||
}
|
||||
}
|
||||
+9
-1
@@ -22,8 +22,16 @@ namespace CloudBuilder.Security.Service.Subscriber
|
||||
SecurityUserActorEntity ent = new SecurityUserActorEntity();
|
||||
ent.UserName = ((SecurityUserEntity)eventData.EventSource).UserName;
|
||||
ent.ActorName = SecurityUserPolicy.SECURITY_USER_BASE_ACTOR;
|
||||
|
||||
repository.InsertNow(ent);
|
||||
|
||||
//第一个注册用户就是管理员
|
||||
if (ent.UserName == SecurityPrefixPolicy.SECURITY_USER_FORMAT.Substring(0, SecurityPrefixPolicy.SECURITY_USER_FORMAT.Length - 1) + "1")
|
||||
{
|
||||
ent = new SecurityUserActorEntity();
|
||||
ent.UserName = ((SecurityUserEntity)eventData.EventSource).UserName;
|
||||
ent.ActorName = SecurityUserPolicy.SYSTEM_ACTOR;
|
||||
repository.InsertNow(ent);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -14,6 +14,7 @@ namespace CloudBuilder.Security.Policy
|
||||
/// 普通用户首次注册给予的角色
|
||||
/// </summary>
|
||||
public const string SECURITY_USER_BASE_ACTOR = "SecurityUserBaseActor";
|
||||
public const string SYSTEM_ACTOR = "system_actor";
|
||||
|
||||
/// <summary>
|
||||
/// 用户登录可以出错的次数
|
||||
|
||||
@@ -1017,6 +1017,7 @@ SET @saved_cs_client = @@character_set_client;
|
||||
1 AS `tree_id`,
|
||||
1 AS `public_indc`,
|
||||
1 AS `brief`,
|
||||
1 AS `tree_cover_filename`,
|
||||
1 AS `ancestor_person_id`,
|
||||
1 AS `surname`,
|
||||
1 AS `genealogy_name`,
|
||||
@@ -2601,7 +2602,7 @@ SET character_set_client = @saved_cs_client;
|
||||
/*!50001 SET collation_connection = utf8mb4_0900_ai_ci */;
|
||||
/*!50001 CREATE ALGORITHM=UNDEFINED */
|
||||
/*!50013 SQL SECURITY DEFINER */
|
||||
/*!50001 VIEW `family_tree_view` AS select `tree`.`tree_name` AS `tree_name`,`tree`.`tree_id` AS `tree_id`,`tree`.`public_indc` AS `public_indc`,`tree`.`brief` AS `brief`,`tree`.`ancestor_person_id` AS `ancestor_person_id`,`p`.`surname` AS `surname`,`p`.`genealogy_name` AS `genealogy_name`,`p`.`common_name` AS `common_name` from (`family_tree` `tree` join `family_person` `p` on((`p`.`person_id` = `tree`.`ancestor_person_id`))) */;
|
||||
/*!50001 VIEW `family_tree_view` AS select `tree`.`tree_name` AS `tree_name`,`tree`.`tree_id` AS `tree_id`,`tree`.`public_indc` AS `public_indc`,`tree`.`brief` AS `brief`,`tree`.`tree_cover_filename` AS `tree_cover_filename`,`tree`.`ancestor_person_id` AS `ancestor_person_id`,`p`.`surname` AS `surname`,`p`.`genealogy_name` AS `genealogy_name`,`p`.`common_name` AS `common_name` from (`family_tree` `tree` join `family_person` `p` on((`p`.`person_id` = `tree`.`ancestor_person_id`))) */;
|
||||
/*!50001 SET character_set_client = @saved_cs_client */;
|
||||
/*!50001 SET character_set_results = @saved_cs_results */;
|
||||
/*!50001 SET collation_connection = @saved_col_connection */;
|
||||
|
||||
Reference in new issue
Block a user