wenyongda/ZrAdminNetCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

✨ codeFirst实体建表

Browse Source
This commit is contained in:
不做码农
2023-06-09 08:40:35 +08:00
parent 628df80df7
commit b96edfdac7
47 changed files with 688 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ZR.Model/System/Article.cs
+14 -4
View File
@@ -6,7 +6,7 @@ namespace ZR.Model.System
/// <summary>
/// 文章表
/// </summary>
[SugarTable("article")]
[SugarTable("article", "文章管理")]
[Tenant("0")]
public class Article
{
@@ -18,54 +18,64 @@ namespace ZR.Model.System
/// <summary>
/// 文章标题
/// </summary>
[SugarColumn(ColumnDescription = "文章标题", Length = 254, ExtendedAttribute = ProteryConstant.NOTNULL)]
public string Title { get; set; }
/// <summary>
/// 发布时间
/// </summary>
[SugarColumn(ColumnDescription = "发布时间")]
public DateTime? CreateTime { get; set; }
/// <summary>
/// 更新时间
/// </summary>
[SugarColumn(IsOnlyIgnoreInsert = true)]
[SugarColumn(IsOnlyIgnoreInsert = true, ColumnDescription = "更新时间")]
public DateTime? UpdateTime { get; set; }
/// <summary>
/// 文章内容
/// </summary>
[SugarColumn(ColumnDescription = "文章内容", ColumnDataType = "text")]
public string Content { get; set; }
/// <summary>
/// 作者名
/// </summary>
[SugarColumn(ColumnDescription = "作者名", Length = 20, ExtendedAttribute = ProteryConstant.NOTNULL)]
public string AuthorName { get; set; }
/// <summary>
/// 发布者用户id
/// </summary>
[SugarColumn(ColumnDescription = "发布者用户id", ExtendedAttribute = ProteryConstant.NOTNULL)]
public long UserId { get; set; }
/// <summary>
/// 文章状态 1、发布 2、草稿
/// </summary>
[SugarColumn(ColumnDescription = "文章状态 1、发布 2、草稿", Length = 20)]
public string Status { get; set; }
/// <summary>
/// 编辑器类型 markdown,html
/// </summary>
[SugarColumn(ColumnName = "fmt_type")]
[SugarColumn(ColumnDescription = "编辑器类型markdown,html", ColumnName = "fmt_type", Length = 20, IsNullable = true)]
public string FmtType { get; set; }
/// <summary>
/// 文章标签eg：Net5,java
/// </summary>
[SugarColumn(ColumnDescription = "文章标签", Length = 20)]
public string Tags { get; set; }
/// <summary>
/// 点击量
/// </summary>
[SugarColumn(ColumnDescription = "点击量", DefaultValue = "0")]
public int Hits { get; set; }
[SugarColumn(ColumnName = "category_Id")]
[SugarColumn(ColumnDescription = "目录id", ColumnName = "category_Id")]
public int CategoryId { get; set; }
/// <summary>
/// 封面地址
/// </summary>
[SugarColumn(ColumnDescription = "封面地址", Length = 255)]
public string CoverUrl { get; set; }
/// <summary>
/// 是否公开 1、公开 0、不公开
/// </summary>
[SugarColumn(ColumnDescription = "是否公开 1、公开 0、不公开", DefaultValue = "0")]
public int IsPublic { get; set; }
[Navigate(NavigateType.OneToOne, nameof(CategoryId), nameof(ArticleCategory.CategoryId))] //自定义关系映射
ZR.Model/System/ArticleCategory.cs
+6 -4
View File
@@ -8,18 +8,20 @@ namespace ZR.Model.System
/// <summary>
/// 文章目录
/// </summary>
[SugarTable("articleCategory")]
[SugarTable("articleCategory", "文章目录")]
[Tenant("0")]
public class ArticleCategory
{
/// <summary>
/// 目录id
/// </summary>
[SugarColumn(IsPrimaryKey = true, ColumnName = "Category_id")]
[SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnName = "category_id")]
public int CategoryId { get; set; }
[SugarColumn(ColumnDescription = "目录名", Length = 20, ExtendedAttribute = ProteryConstant.NOTNULL)]
public string Name { get; set; }
public int ParentId { get; set; }
[SugarColumn(ColumnName = "create_time", IsNullable = true)]
public int? ParentId { get; set; }
[SugarColumn(ColumnDescription = "创建时间", ColumnName = "create_time")]
public DateTime? CreateTime { get; set; }
[JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
ZR.Model/System/CommonLang.cs
+4 -4
View File
@@ -9,7 +9,7 @@ namespace ZR.Model.Models
/// 多语言配置，数据实体对象
/// </summary>
[Tenant("0")]
[SugarTable("sys_common_lang")]
[SugarTable("sys_common_lang", "多语言配置表")]
public class CommonLang
{
/// <summary>
@@ -23,21 +23,21 @@ namespace ZR.Model.Models
/// 语言code
/// </summary>
[DisplayName("语言code")]
[SugarColumn(ColumnName = "lang_code", IsNullable = false)]
[SugarColumn(ColumnName = "lang_code", Length = 10, ExtendedAttribute = ProteryConstant.NOTNULL)]
public string LangCode { get; set; }
/// <summary>
/// 语言key
/// </summary>
[DisplayName("语言key")]
[SugarColumn(ColumnName = "lang_key")]
[SugarColumn(ColumnName = "lang_key", Length = 100, ExtendedAttribute = ProteryConstant.NOTNULL)]
public string LangKey { get; set; }
/// <summary>
/// 名称
/// </summary>
[DisplayName("名称")]
[SugarColumn(ColumnName = "lang_name", IsNullable = false)]
[SugarColumn(ColumnName = "lang_name", Length = 2000, ExtendedAttribute = ProteryConstant.NOTNULL)]
public string LangName { get; set; }
/// <summary>
ZR.Model/System/LoginUser.cs → ZR.Model/System/Dto/LoginUser.cs
+1 -1
View File
@@ -1,7 +1,7 @@
using System.Collections.Generic;
using System.Linq;
namespace ZR.Model.System
namespace ZR.Model.System.Dto
{
/// <summary>
/// 登录用户信息存储
ZR.Model/System/Dto/MenuDto.cs
+2 -2
View File
@@ -33,11 +33,11 @@ namespace ZR.Model.System.Dto
/// 是否缓存（1缓存 0不缓存）
/// </summary>
[Required(ErrorMessage = "是否缓存不能为空")]
public string IsCache { get; set; }
public int IsCache { get; set; }
/// <summary>
/// 是否外链 1、是 0、否
/// </summary>
public string IsFrame { get; set; }
public int IsFrame { get; set; }
/// <summary>
/// 类型（M目录 C菜单 F按钮 L链接）
ZR.Model/System/Dto/SysRoleDto.cs
+6 -1
View File
@@ -12,10 +12,15 @@ namespace ZR.Model.System.Dto
public string RoleName { get; set; }
public string RoleKey { get; set; }
public int RoleSort { get; set; }
public string Status { get; set; }
public int Status { get; set; }
public int DataScope { get; set; }
public int[] DeptIds { get; set; }
/// <summary>
/// 减少菜单集合
/// </summary>
public List<long> DelMenuIds { get; set; } = new List<long>();
public bool MenuCheckStrictly { get; set; }
public bool DeptCheckStrictly { get; set; }
}
}
ZR.Model/System/Dto/SysUserDto.cs
+21 -1
View File
@@ -1,4 +1,6 @@
namespace ZR.Model.System.Dto
using System;
namespace ZR.Model.System.Dto
{
public class SysUserDto
{
@@ -13,4 +15,22 @@
/// </summary>
public int Sex { get; set; }
}
public class SysUserQueryDto
{
public long UserId { get; set; }
public string UserName { get; set; }
public string NickName { get; set; }
public string Email { get; set; }
public string Remark { get; set; }
public string Phonenumber { get; set; }
/// <summary>
/// 用户性别（0男 1女 2未知）
/// </summary>
public int Sex { get; set; }
public DateTime? BeginTime { get; set; }
public DateTime? EndTime { get; set; }
public int Status { get; set; }
public long DeptId { get; set; }
}
}
ZR.Model/System/Generate/GenTable.cs
+26 -9
View File
@@ -1,38 +1,44 @@
using System.Collections.Generic;
using SqlSugar;
using System.Collections.Generic;
namespace ZR.Model.System.Generate
{
/// <summary>
/// 代码生成表
/// </summary>
[SqlSugar.SugarTable("gen_table")]
[SqlSugar.Tenant("0")]
[SugarTable("gen_table", "代码生成表")]
[Tenant("0")]
public class GenTable : SysBase
{
/// <summary>
/// 表id
/// </summary>
[SqlSugar.SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
public int TableId { get; set; }
[SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
public long TableId { get; set; }
/// <summary>
/// 数据库名
/// </summary>
[SugarColumn(Length = 50)]
public string DbName { get; set; }
/// <summary>
/// 表名
/// </summary>
[SugarColumn(Length = 150)]
public string TableName { get; set; }
/// <summary>
/// 表描述
/// </summary>
[SugarColumn(Length = 150)]
public string TableComment { get; set; }
/// <summary>
/// 关联父表的表名
/// </summary>
[SugarColumn(Length = 150)]
public string SubTableName { get; set; }
/// <summary>
/// 本表关联父表的外键名
/// </summary>
[SugarColumn(Length = 150)]
public string SubTableFkName { get; set; }
/// <summary>
/// csharp类名
@@ -41,18 +47,22 @@ namespace ZR.Model.System.Generate
/// <summary>
/// 使用的模板（crud单表操作 tree树表操作 sub主子表操作）
/// </summary>
[SugarColumn(Length = 50, DefaultValue = "crud")]
public string TplCategory { get; set; }
/// <summary>
/// 基本命名空间前缀
/// </summary>
[SugarColumn(Length = 100)]
public string BaseNameSpace { get; set; }
/// <summary>
/// 生成模块名
/// </summary>
[SugarColumn(Length = 50)]
public string ModuleName { get; set; }
/// <summary>
/// 生成业务名
/// </summary>
[SugarColumn(Length = 50)]
public string BusinessName { get; set; }
/// <summary>
/// 生成功能名
@@ -65,23 +75,30 @@ namespace ZR.Model.System.Generate
/// <summary>
/// 生成代码方式（0zip压缩包 1自定义路径）
/// </summary>
[SugarColumn(Length = 1, DefaultValue = "0")]
public string GenType { get; set; }
/// <summary>
/// 代码生成保存路径
/// </summary>
[SugarColumn(Length = 200, DefaultValue = "/")]
public string GenPath { get; set; }
/// <summary>
/// 其他生成选项
/// </summary>
[SqlSugar.SugarColumn(IsJson = true, ColumnDataType = "nvarchar(4000)")]
[SugarColumn(IsJson = true)]
public Options Options { get; set; }
#region 表额外字段
/** 表列信息 */
[SqlSugar.SugarColumn(IsIgnore = true)]
/// <summary>
/// 表列信息
/// </summary>
[SugarColumn(IsIgnore = true)]
public List<GenTableColumn> Columns { get; set; }
/// <summary>
/// 字表信息
/// </summary>
[SqlSugar.SugarColumn(IsIgnore = true)]
[SugarColumn(IsIgnore = true)]
public GenTable SubTable { get; set; }
#endregion
}
ZR.Model/System/Generate/GenTableColumn.cs
+7 -3
View File
@@ -7,18 +7,21 @@ namespace ZR.Model.System.Generate
/// <summary>
/// 代码生成表字段
/// </summary>
[SugarTable("gen_table_column")]
[SugarTable("gen_table_column", "代码生成表字段")]
[Tenant("0")]
public class GenTableColumn : SysBase
{
/// <summary>
/// 列id
/// </summary>
[SugarColumn(IsIdentity = true, IsPrimaryKey = true)]
public int ColumnId { get; set; }
public long ColumnId { get; set; }
/// <summary>
/// 导入代码生成表列名 首字母转了小写
/// </summary>
public string ColumnName { get; set; }
[SugarColumn(IsOnlyIgnoreUpdate = true)]
public int TableId { get; set; }
public long TableId { get; set; }
[SugarColumn(IsOnlyIgnoreUpdate = true)]
public string TableName { get; set; }
@@ -96,6 +99,7 @@ namespace ZR.Model.System.Generate
/// <summary>
/// 查询类型（等于、不等于、大于、小于、范围）
/// </summary>
[SugarColumn(DefaultValue = "EQ")]
public string QueryType { get; set; } = "EQ";
public int Sort { get; set; }
/// <summary>
ZR.Model/System/SysBase.cs
+3 -8
View File
@@ -8,6 +8,9 @@ namespace ZR.Model.System
//[EpplusTable(PrintHeaders = true, AutofitColumns = true, AutoCalculate = true, ShowTotal = true)]
public class SysBase
{
/// <summary>
/// 创建人
/// </summary>
[SugarColumn(IsOnlyIgnoreUpdate = true, Length = 64, IsNullable = true)]
[JsonProperty(propertyName: "CreateBy")]
[ExcelIgnore]
@@ -31,13 +34,5 @@ namespace ZR.Model.System
public DateTime? Update_time { get; set; }
[SugarColumn(Length = 500)]
public string Remark { get; set; }
[SugarColumn(IsIgnore = true, IsNullable = true)]
[JsonIgnore]
[ExcelIgnore]
public DateTime? BeginTime { get; set; }
[SugarColumn(IsIgnore = true, IsNullable = true)]
[JsonIgnore]
[ExcelIgnore]
public DateTime? EndTime { get; set; }
}
}
ZR.Model/System/SysConfig.cs
+5 -1
View File
@@ -8,7 +8,7 @@ namespace ZR.Model.System
/// @author mr.zhao
/// @date 2021-09-29
/// </summary>
[SugarTable("sys_config")]
[SugarTable("sys_config", "配置表")]
[Tenant("0")]
public class SysConfig : SysBase
{
@@ -20,18 +20,22 @@ namespace ZR.Model.System
/// <summary>
/// 参数名称
/// </summary>
[SugarColumn(Length = 100)]
public string ConfigName { get; set; }
/// <summary>
/// 参数键名
/// </summary>
[SugarColumn(Length = 100)]
public string ConfigKey { get; set; }
/// <summary>
/// 参数键值
/// </summary>
[SugarColumn(Length = 500)]
public string ConfigValue { get; set; }
/// <summary>
/// 系统内置（Y是 N否）
/// </summary>
[SugarColumn(Length = 1)]
public string ConfigType { get; set; }
}
ZR.Model/System/SysDept.cs
+9 -4
View File
@@ -6,9 +6,9 @@ namespace ZR.Model.System
/// <summary>
/// 部门表
/// </summary>
[SugarTable("sys_dept")]
[SugarTable("sys_dept", "部门配置表")]
[Tenant("0")]
public class SysDept: SysBase
public class SysDept : SysBase
{
/// <summary>
/// 部门ID
@@ -29,6 +29,7 @@ namespace ZR.Model.System
/// <summary>
/// 部门名称
/// </summary>
[SugarColumn(Length = 30, ExtendedAttribute = ProteryConstant.NOTNULL)]
public string DeptName { get; set; }
/// <summary>
@@ -39,32 +40,36 @@ namespace ZR.Model.System
/// <summary>
/// 负责人
/// </summary>
[SugarColumn(Length = 30)]
public string Leader { get; set; }
/// <summary>
/// 联系电话
/// </summary>
[SugarColumn(Length = 11)]
public string Phone { get; set; }
/// <summary>
/// 邮箱
/// </summary>
[SugarColumn(Length = 50)]
public string Email { get; set; }
/// <summary>
/// 部门状态:0正常,1停用
/// </summary>
[SugarColumn(Length = 1, DefaultValue = "0")]
public string Status { get; set; }
/// <summary>
/// 删除标志（0代表存在 2代表删除）
/// </summary>
[SugarColumn(IsOnlyIgnoreInsert = true)]
[SugarColumn(Length = 1, DefaultValue = "0")]
public string DelFlag { get; set; }
/// <summary>
/// 子菜单
/// </summary>
public List<SysDept> children = new List<SysDept>();
public List<SysDept> children = new();
}
}
ZR.Model/System/SysDictData.cs
+8 -1
View File
@@ -6,7 +6,7 @@ namespace ZR.Model.System
/// 字典数据表
/// </summary>
[Tenant("0")]
[SugarTable("sys_dict_data")]
[SugarTable("sys_dict_data", "字典数据表")]
public class SysDictData : SysBase
{
/// <summary>
@@ -21,30 +21,37 @@ namespace ZR.Model.System
/// <summary>
/// 字典标签
/// </summary>
[SugarColumn(Length = 100, ExtendedAttribute = ProteryConstant.NOTNULL)]
public string DictLabel { get; set; }
/// <summary>
/// 字典键值
/// </summary>
[SugarColumn(Length = 100, ExtendedAttribute = ProteryConstant.NOTNULL)]
public string DictValue { get; set; }
/// <summary>
/// 字典类型
/// </summary>
[SugarColumn(Length = 100, ExtendedAttribute = ProteryConstant.NOTNULL)]
public string DictType { get; set; }
/// <summary>
/// 样式属性（其他样式扩展）
/// </summary>
[SugarColumn(Length = 100)]
public string CssClass { get; set; } = string.Empty;
/// <summary>
/// 表格回显样式
/// </summary>
[SugarColumn(Length = 100)]
public string ListClass { get; set; } = string.Empty;
/// <summary>
/// 是否默认（Y是 N否）
/// </summary>
[SugarColumn(Length = 1, DefaultValue = "N")]
public string IsDefault { get; set; }
/// <summary>
/// 状态（0正常 1停用）
/// </summary>
[SugarColumn(Length = 1)]
public string Status { get; set; }
}
}
ZR.Model/System/SysDictType.cs
+6 -1
View File
@@ -5,7 +5,8 @@ namespace ZR.Model.System
/// <summary>
/// 字典类型表
/// </summary>
[SugarTable("sys_dict_type")]
[SugarTable("sys_dict_type", "字典类型表")]
[SugarIndex("index_dict_type", nameof(DictType), OrderByType.Asc, true)]
[Tenant("0")]
public class SysDictType : SysBase
{
@@ -17,18 +18,22 @@ namespace ZR.Model.System
/// <summary>
/// 字典名称
/// </summary>
[SugarColumn(Length = 100, ExtendedAttribute = ProteryConstant.NOTNULL)]
public string DictName { get; set; }
/// <summary>
/// 字典类型
/// </summary>
[SugarColumn(Length = 100, ExtendedAttribute = ProteryConstant.NOTNULL)]
public string DictType { get; set; }
/// <summary>
/// 状态 0、正常 1、停用
/// </summary>
[SugarColumn(Length = 1, DefaultValue = "0")]
public string Status { get; set; }
/// <summary>
/// 系统内置 Y是 N否
/// </summary>
[SugarColumn(Length = 1, DefaultValue = "N")]
public string Type { get; set; }
/// <summary>
/// 自定义sql
ZR.Model/System/SysFile.cs
+1 -1
View File
@@ -5,7 +5,7 @@ using System;
namespace ZR.Model.System
{
[Tenant("0")]
[SugarTable("sys_file")]
[SugarTable("sys_file", "文件存储表")]
public class SysFile
{
/// <summary>
ZR.Model/System/SysLogininfor.cs
+7 -6
View File
@@ -6,7 +6,7 @@ namespace ZR.Model.System
/// <summary>
/// sys_logininfor 表
/// </summary>
[SugarTable("sys_logininfor")]
[SugarTable("sys_logininfor", "登录日志表")]
[Tenant("0")]
public class SysLogininfor
{
@@ -21,32 +21,33 @@ namespace ZR.Model.System
/// <summary>
/// 登录状态 0成功 1失败
/// </summary>
[SugarColumn(Length = 1, DefaultValue = "0")]
public string Status { get; set; }
/// <summary>
/// 登录IP地址
/// </summary>
public string Ipaddr { get; set; }
public string Ipaddr { get; set; } = string.Empty;
/// <summary>
/// 登录地点
/// </summary>
public string LoginLocation { get; set; }
public string LoginLocation { get; set; } = string.Empty;
/// <summary>
/// 浏览器类型
/// </summary>
public string Browser { get; set; }
public string Browser { get; set; } = string.Empty;
/// <summary>
/// 操作系统
/// </summary>
public string Os { get; set; }
public string Os { get; set; } = string.Empty;
/// <summary>
/// 提示消息
/// </summary>
public string Msg { get; set; }
public string Msg { get; set; } = string.Empty;
/// <summary>
/// 访问时间
ZR.Model/System/SysMenu.cs
+14 -4
View File
@@ -6,7 +6,7 @@ namespace ZR.Model.System
/// <summary>
/// Sys_menu表
/// </summary>
[SugarTable("sys_menu")]
[SugarTable("sys_menu", "系统菜单表")]
[Tenant("0")]
public class SysMenu : SysBase
{
@@ -18,22 +18,25 @@ namespace ZR.Model.System
/// <summary>
/// 菜单名称
/// </summary>
[SugarColumn(Length = 50, ExtendedAttribute = ProteryConstant.NOTNULL)]
public string MenuName { get; set; }
/// <summary>
/// 父菜单ID
/// </summary>
[SugarColumn(DefaultValue = "0")]
public long ParentId { get; set; }
/// <summary>
/// 显示顺序
/// </summary>
[SugarColumn(DefaultValue = "0")]
public int OrderNum { get; set; }
/// <summary>
/// 路由地址
/// </summary>
public string Path { get; set; } = "#";
public string Path { get; set; } = "";
/// <summary>
/// 组件路径
@@ -43,35 +46,42 @@ namespace ZR.Model.System
/// <summary>
/// 是否缓存（1缓存 0不缓存）
/// </summary>
[SugarColumn(DefaultValue = "0", ColumnDataType = "int")]
public string IsCache { get; set; }
/// <summary>
/// 是否外链 1、是 0、否
/// </summary>
public string IsFrame { get; set; }
[SugarColumn(DefaultValue = "0", ColumnDataType = "int")]
public string IsFrame { get; set; } = "0";
/// <summary>
/// 类型（M目录 C菜单 F按钮 L链接）
/// </summary>
public string MenuType { get; set; }
[SugarColumn(Length = 1)]
public string MenuType { get; set; } = string.Empty;
/// <summary>
/// 显示状态（0显示 1隐藏）
/// </summary>
[SugarColumn(DefaultValue = "0", Length = 1)]
public string Visible { get; set; }
/// <summary>
/// 菜单状态（0正常 1停用）
/// </summary>
[SugarColumn(DefaultValue = "0", Length = 1)]
public string Status { get; set; }
/// <summary>
/// 权限字符串
/// </summary>
[SugarColumn(Length = 100)]
public string Perms { get; set; }
/// <summary>
/// 菜单图标
/// </summary>
[SugarColumn(DefaultValue = "#")]
public string Icon { get; set; } = string.Empty;
/// <summary>
/// 菜单名key
ZR.Model/System/SysNotice.cs
+6 -5
View File
@@ -3,12 +3,12 @@ using SqlSugar;
namespace ZR.Model.System
{
/// <summary>
/// 通知公告表，数据实体对象
/// 通知公告表
///
/// @author zr
/// @date 2021-12-15
/// </summary>
[SugarTable("sys_notice")]
[SugarTable("sys_notice", "通知公告表")]
[Tenant(0)]
public class SysNotice : SysBase
{
@@ -20,21 +20,22 @@ namespace ZR.Model.System
/// <summary>
/// 公告标题
/// </summary>
[SugarColumn(ColumnName = "notice_title")]
[SugarColumn(ColumnName = "notice_title", ExtendedAttribute = ProteryConstant.NOTNULL)]
public string NoticeTitle { get; set; }
/// <summary>
/// 公告类型 (1通知 2公告)
/// </summary>
[SugarColumn(ColumnName = "notice_type")]
[SugarColumn(ColumnName = "notice_type", ExtendedAttribute = ProteryConstant.NOTNULL)]
public int NoticeType { get; set; }
/// <summary>
/// 公告内容
/// </summary>
[SugarColumn(ColumnName = "notice_content")]
[SugarColumn(ColumnName = "notice_content", ColumnDataType = "text")]
public string NoticeContent { get; set; }
/// <summary>
/// 公告状态 (0正常 1关闭)
/// </summary>
[SugarColumn(DefaultValue = "0", ExtendedAttribute = ProteryConstant.NOTNULL)]
public int Status { get; set; }
}
}
ZR.Model/System/SysOperLog.cs
+10 -16
View File
@@ -5,22 +5,24 @@ using System.ComponentModel;
namespace ZR.Model.System
{
[SugarTable("sys_oper_log")]
[SugarTable("sys_oper_log", "操作日志表")]
[Tenant("0")]
public class SysOperLog
{
/// <summary>
/// 操作id
/// </summary>
[SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
public long OperId { get; set; }
/// <summary>
/// 操作模块
/// </summary>
[DisplayName("操作模块")]
public string Title { get; set; }
/// <summary>
/// 业务类型（0其它 1新增 2修改 3删除 4=授权,5=导出,6=导入,7=强退,8=生成代码,9=清空数据）
/// </summary>
[DisplayName("业务类型")]
[SugarColumn(DefaultValue = "0")]
public int BusinessType { get; set; }
/// <summary>
@@ -33,79 +35,71 @@ namespace ZR.Model.System
/// <summary>
/// 请求方法
/// </summary>
[DisplayName("请求方法")]
public string Method { get; set; }
/// <summary>
/// 请求方式
/// </summary>
[DisplayName("请求方式")]
public string RequestMethod { get; set; }
/// <summary>
/// 操作类别（0其它 1后台用户 2手机端用户）
/// </summary>
//@Excel(name = "操作类别", readConverterExp = "0=其它,1=后台用户,2=手机端用户")
[DisplayName("操作类别")]
[SugarColumn(DefaultValue = "0")]
public int OperatorType { get; set; }
/// <summary>
/// 操作人员
/// </summary>
[DisplayName("操作人员")]
public string OperName { get; set; }
/// <summary>
/// 请求url
/// </summary>
[DisplayName("请求地址")]
public string OperUrl { get; set; }
/// <summary>
/// 操作地址
/// </summary>
[DisplayName("操作地址")]
public string OperIp { get; set; }
/// <summary>
/// 操作地点
/// </summary>
[DisplayName("操作地点")]
public string OperLocation { get; set; }
/// <summary>
/// 请求参数
/// </summary>
[DisplayName("请求参数")]
[SugarColumn(Length = 2000)]
public string OperParam { get; set; }
/// <summary>
/// 返回参数
/// </summary>
[DisplayName("返回结果")]
[SugarColumn(ColumnDataType = "text")]
public string JsonResult { get; set; }
/// <summary>
/// 操作状态（0正常 1异常）
/// </summary>
[DisplayName("状态")]
[SugarColumn(DefaultValue = "0")]
public int Status { get; set; }
/// <summary>
/// 错误消息
/// </summary>
[DisplayName("错误消息")]
public string ErrorMsg { get; set; }
/// <summary>
/// 操作时间
/// </summary>
[DisplayName("操作时间")]
public DateTime? OperTime { get; set; }
/// <summary>
/// 操作用时
/// </summary>
[DisplayName("操作用时")]
public long Elapsed { get; set; }
public string DeptName { get; set; }
}
}
ZR.Model/System/SysPost.cs
+5 -1
View File
@@ -2,7 +2,7 @@
namespace ZR.Model.System
{
[SugarTable("sys_post")]
[SugarTable("sys_post", "岗位表")]
[Tenant("0")]
public class SysPost : SysBase
{
@@ -11,9 +11,13 @@ namespace ZR.Model.System
/// </summary>
[SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
public long PostId { get; set; }
[SugarColumn(ExtendedAttribute = ProteryConstant.NOTNULL)]
public string PostCode { get; set; }
[SugarColumn(ExtendedAttribute = ProteryConstant.NOTNULL)]
public string PostName { get; set; }
[SugarColumn(ExtendedAttribute = ProteryConstant.NOTNULL)]
public int PostSort { get; set; }
[SugarColumn(Length = 1)]
public string Status { get; set; }
}
}
ZR.Model/System/SysRole.cs
+9 -3
View File
@@ -5,7 +5,7 @@ namespace ZR.Model.System
/// <summary>
/// 角色表 sys_role
/// </summary>
[SugarTable("sys_role")]
[SugarTable("sys_role", "角色表")]
[Tenant("0")]
public class SysRole : SysBase
{
@@ -18,41 +18,47 @@ namespace ZR.Model.System
/// <summary>
/// 角色名称
/// </summary>
[SugarColumn(Length = 30, ExtendedAttribute = ProteryConstant.NOTNULL)]
public string RoleName { get; set; }
/// <summary>
/// 角色权限
/// </summary>
[SugarColumn(Length = 100, ExtendedAttribute = ProteryConstant.NOTNULL)]
public string RoleKey { get; set; }
/// <summary>
/// 角色排序
/// </summary>
[SugarColumn(ExtendedAttribute = ProteryConstant.NOTNULL)]
public int RoleSort { get; set; }
/// <summary>
/// 帐号状态（0正常 1停用）
/// </summary>
[SugarColumn(DefaultValue = "0")]
public int Status { get; set; }
/// <summary>
/// 删除标志（0代表存在 2代表删除）
/// </summary>
[SugarColumn(DefaultValue = "0")]
public int DelFlag { get; set; }
/// <summary>
/// 数据范围（1：全部数据权限 2：自定数据权限 3：本部门数据权限 4：本部门及以下数据权限））
/// </summary>
[SugarColumn(DefaultValue = "1")]
public int DataScope { get; set; }
/// <summary>
/// 菜单树选择项是否关联显示
/// </summary>
[SugarColumn(ColumnName = "menu_check_strictly")]
public bool MenuCheckStrictly { get; set; }
public bool MenuCheckStrictly { get; set; } = true;
/// <summary>
/// 部门树选择项是否关联显示
/// </summary>
[SugarColumn(ColumnName = "dept_check_strictly")]
public bool DeptCheckStrictly { get; set; }
public bool DeptCheckStrictly { get; set; } = true;
/// <summary>
/// 菜单组
/// </summary>
ZR.Model/System/SysRoleDept.cs
+8 -3
View File
@@ -1,10 +1,15 @@
namespace ZR.Model.System
using SqlSugar;
namespace ZR.Model.System
{
[SqlSugar.SugarTable("sys_role_dept")]
[SqlSugar.Tenant(0)]
[SugarTable("sys_role_dept", "角色部门")]
[Tenant(0)]
public class SysRoleDept
{
[SugarColumn(ExtendedAttribute = ProteryConstant.NOTNULL, IsPrimaryKey = true)]
public long RoleId { get; set; }
[SugarColumn(ExtendedAttribute = ProteryConstant.NOTNULL, IsPrimaryKey = true)]
public long DeptId { get; set; }
}
}
ZR.Model/System/SysRoleMenu.cs
+4 -6
View File
@@ -7,17 +7,15 @@ namespace ZR.Model.System
/// <summary>
/// 角色菜单
/// </summary>
[SugarTable("sys_role_menu")]
[SugarTable("sys_role_menu", "角色菜单")]
[Tenant("0")]
public class SysRoleMenu
public class SysRoleMenu : SysBase
{
[JsonProperty("roleId")]
[SugarColumn(IsPrimaryKey = true)]
[SugarColumn(IsPrimaryKey = true, ExtendedAttribute = ProteryConstant.NOTNULL)]
public long Role_id { get; set; }
[JsonProperty("menuId")]
[SugarColumn(IsPrimaryKey = true)]
[SugarColumn(IsPrimaryKey = true, ExtendedAttribute = ProteryConstant.NOTNULL)]
public long Menu_id { get; set; }
public DateTime Create_time { get; set; }
public string Create_by { get; set; }
}
}
ZR.Model/System/SysRolePost.cs
-15
View File
@@ -1,15 +0,0 @@
using SqlSugar;
namespace ZR.Model.System
{
/// <summary>
/// 角色部门
/// </summary>
[SugarTable("sys_role_post")]
[Tenant("0")]
public class SysRolePost
{
public long RoleId { get; set; }
public long DeptId { get; set; }
}
}
ZR.Model/System/SysTasks.cs
+14 -32
View File
@@ -1,5 +1,4 @@
using Newtonsoft.Json;
using SqlSugar;
using SqlSugar;
using System;
using System.ComponentModel.DataAnnotations;
@@ -8,9 +7,9 @@ namespace ZR.Model.System
///<summary>
///计划任务
///</summary>
[SugarTable("sys_tasks")]
[SugarTable("sys_tasks", "计划任务表")]
[Tenant("0")]
public class SysTasks
public class SysTasks : SysBase
{
public SysTasks()
{
@@ -28,42 +27,42 @@ namespace ZR.Model.System
/// 任务名称
/// </summary>
[Display(Name = "任务名称")]
[SugarColumn(ExtendedAttribute = ProteryConstant.NOTNULL)]
public string Name { get; set; }
/// <summary>
/// 任务分组
/// </summary>
[Display(Name = "任务分组")]
[SugarColumn(ExtendedAttribute = ProteryConstant.NOTNULL)]
public string JobGroup { get; set; }
/// <summary>
/// 运行时间表达式
/// </summary>
[Display(Name = "运行时间表达式")]
[SugarColumn(ExtendedAttribute = ProteryConstant.NOTNULL)]
public string Cron { get; set; }
/// <summary>
/// 程序集名称
/// </summary>
[Display(Name = "程序集名称")]
[SugarColumn(ExtendedAttribute = ProteryConstant.NOTNULL)]
public string AssemblyName { get; set; }
/// <summary>
/// 任务所在类
/// </summary>
[Display(Name = "任务所在类")]
[SugarColumn(ExtendedAttribute = ProteryConstant.NOTNULL)]
public string ClassName { get; set; }
/// <summary>
/// 任务描述
/// </summary>
[Display(Name = "任务描述")]
public string Remark { get; set; }
/// <summary>
/// 执行次数
/// </summary>
[Display(Name = "执行次数")]
[SugarColumn(DefaultValue = "0", ExtendedAttribute = ProteryConstant.NOTNULL)]
public int RunTimes { get; set; }
/// <summary>
@@ -83,6 +82,7 @@ namespace ZR.Model.System
/// 默认 : 1
/// </summary>
[Display(Name = "触发器类型（0、simple 1、cron）")]
[SugarColumn(ExtendedAttribute = ProteryConstant.NOTNULL)]
public int TriggerType { get; set; }
/// <summary>
@@ -90,42 +90,22 @@ namespace ZR.Model.System
/// 默认 : 0
/// </summary>
[Display(Name = "执行间隔时间(单位:秒)")]
[SugarColumn(ExtendedAttribute = ProteryConstant.NOTNULL)]
public int IntervalSecond { get; set; }
/// <summary>
/// 是否启动
/// 默认 : 0
/// </summary>
[Display(Name = "是否启动")]
[SugarColumn(DefaultValue = "0", ExtendedAttribute = ProteryConstant.NOTNULL)]
public int IsStart { get; set; }
/// <summary>
/// 传入参数
/// 默认 :
/// </summary>
[Display(Name = "传入参数")]
public string JobParams { get; set; }
[SugarColumn(IsOnlyIgnoreUpdate = true)]//设置后修改不会有此字段
[JsonProperty(propertyName: "CreateBy")]
public string Create_by { get; set; }
/// <summary>
/// 创建时间
/// </summary>
//[Display(Name = "创建时间")]
[SugarColumn(IsOnlyIgnoreUpdate = true)]//设置后修改不会有此字段
[JsonProperty(propertyName: "CreateTime")]
public DateTime Create_time { get; set; } = DateTime.Now;
[JsonIgnore]
[JsonProperty(propertyName: "UpdateBy")]
[SugarColumn(IsOnlyIgnoreInsert = true)]
public string Update_by { get; set; }
[SugarColumn(IsOnlyIgnoreInsert = true)]//设置后插入数据不会有此字段
[JsonProperty(propertyName: "UpdateTime")]
public DateTime Update_time { get; set; } = DateTime.Now;
/// <summary>
/// 最后运行时间
/// </summary>
@@ -137,6 +117,7 @@ namespace ZR.Model.System
/// <summary>
/// 任务类型 1、程序集 2、网络请求 3、SQL语句
/// </summary>
[SugarColumn(DefaultValue = "1")]
public int TaskType { get; set; }
/// <summary>
@@ -146,6 +127,7 @@ namespace ZR.Model.System
/// <summary>
/// 网络请求方式
/// </summary>
[SugarColumn(Length = 20)]
public string RequestMethod { get; set; }
}
}
ZR.Model/System/SysTasksLog.cs
+11 -1
View File
@@ -6,7 +6,7 @@ namespace ZR.Model.System
/// <summary>
/// 任务日志
/// </summary>
[SugarTable("sys_tasks_log")]
[SugarTable("sys_tasks_log", "任务日志表")]
[Tenant("0")]
public class SysTasksLog
{
@@ -18,12 +18,22 @@ namespace ZR.Model.System
/// <summary>
/// 任务Id
/// </summary>
[SugarColumn(ExtendedAttribute = ProteryConstant.NOTNULL)]
public string JobId { get; set; }
/// <summary>
/// 任务名
/// </summary>
[SugarColumn(ExtendedAttribute = ProteryConstant.NOTNULL)]
public string JobName { get; set; }
/// <summary>
/// 任务分组
/// </summary>
[SugarColumn(ExtendedAttribute = ProteryConstant.NOTNULL)]
public string JobGroup { get; set; }
/// <summary>
/// 执行状态（0正常 1失败）
/// </summary>
[SugarColumn(DefaultValue = "0")]
public string Status { get; set; }
/// <summary>
/// 异常
ZR.Model/System/SysUser.cs
+4 -4
View File
@@ -9,7 +9,7 @@ namespace ZR.Model.System
/// <summary>
/// 用户表
/// </summary>
[SugarTable("sys_user")]
[SugarTable("sys_user", "用户表")]
[Tenant("0")]
public class SysUser : SysBase
{
@@ -21,12 +21,12 @@ namespace ZR.Model.System
/// <summary>
/// 登录用户名
/// </summary>
[SugarColumn(Length = 30, ColumnDescription = "用户账号", IsNullable = false)]
[SugarColumn(Length = 30, ColumnDescription = "用户账号", ExtendedAttribute = ProteryConstant.NOTNULL)]
public string UserName { get; set; }
/// <summary>
/// 用户昵称
/// </summary>
[SugarColumn(Length = 30, ColumnDescription = "用户昵称", IsNullable = false)]
[SugarColumn(Length = 30, ColumnDescription = "用户昵称", ExtendedAttribute = ProteryConstant.NOTNULL)]
public string NickName { get; set; }
/// <summary>
/// 用户类型（00系统用户）
@@ -40,7 +40,7 @@ namespace ZR.Model.System
[JsonIgnore]
[ExcelIgnore]
[SugarColumn(Length = 100, ColumnDescription = "密码", IsNullable = false)]
[SugarColumn(Length = 100, ColumnDescription = "密码", ExtendedAttribute = ProteryConstant.NOTNULL)]
public string Password { get; set; }
/// <summary>
/// 手机号
ZR.Model/System/SysUserPost.cs
+3 -1
View File
@@ -5,11 +5,13 @@ namespace ZR.Model.System
/// <summary>
/// 用户岗位
/// </summary>
[SugarTable("sys_user_post")]
[SugarTable("sys_user_post", "用户与岗位关联表")]
[Tenant("0")]
public class SysUserPost
{
[SugarColumn(IsPrimaryKey = true, ExtendedAttribute = ProteryConstant.NOTNULL)]
public long UserId { get; set; }
[SugarColumn(IsPrimaryKey = true, ExtendedAttribute = ProteryConstant.NOTNULL)]
public long PostId { get; set; }
}
}
ZR.Model/System/SysUserRole.cs
+1 -1
View File
@@ -5,7 +5,7 @@ namespace ZR.Model.System
/// <summary>
/// 用户角色关联表 用户N-1 角色
/// </summary>
[SugarTable("sys_user_role")]
[SugarTable("sys_user_role", "用户和角色关联表")]
[Tenant("0")]
public class SysUserRole
{