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

ServiceCore下Model命名空间转换

Browse Source
This commit is contained in:
wenyongda
2023-09-25 16:47:37 +08:00
parent cacb525b3a
commit 4199736bc7
145 changed files with 283 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ZR.ServiceCore/Model/Article.cs
+3 -1
View File
@@ -1,4 +1,6 @@
namespace ZR.Model.System
using ZR.Model.System;
namespace ZR.ServiceCore.Model
{
/// <summary>
/// 文章表
ZR.ServiceCore/Model/ArticleCategory.cs
+1 -6
View File
@@ -1,9 +1,4 @@
using Newtonsoft.Json;
using SqlSugar;
using System;
using System.Collections.Generic;
namespace ZR.Model.System
namespace ZR.ServiceCore.Model
{
/// <summary>
/// 文章目录
ZR.ServiceCore/Model/CommonLang.cs
+1 -4
View File
@@ -1,9 +1,6 @@
using Newtonsoft.Json;
using SqlSugar;
using System;
using System.ComponentModel;
namespace ZR.Model.Models
namespace ZR.ServiceCore.Model
{
/// <summary>
/// 多语言配置，数据实体对象
ZR.ServiceCore/Model/Dto/ArticleCategoryDto.cs
+2 -2
View File
@@ -1,7 +1,7 @@
using System;
using System.ComponentModel.DataAnnotations;
using ZR.Model;
namespace ZR.Model.Dto
namespace ZR.ServiceCore.Model.Dto
{
/// <summary>
/// 文章目录输入对象
ZR.ServiceCore/Model/Dto/ArticleDto.cs
+3 -3
View File
@@ -1,7 +1,7 @@
using System;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations;
using ZR.Model;
namespace ZR.Model.System.Dto
namespace ZR.ServiceCore.Model.Dto
{
public class ArticleQueryDto : PagerInfo
{
ZR.ServiceCore/Model/Dto/CommonLangDto.cs
+2 -3
View File
@@ -1,7 +1,6 @@
using System;
using System.Collections.Generic;
using ZR.Model;
namespace ZR.Model.Dto
namespace ZR.ServiceCore.Model.Dto
{
/// <summary>
/// 多语言配置输入对象
ZR.ServiceCore/Model/Dto/GenTableDto.cs
+2 -3
View File
@@ -1,7 +1,6 @@
using System.Collections.Generic;
using ZR.Model.System.Generate;
using ZR.ServiceCore.Model.Generate;
namespace ZR.Model.System.Dto
namespace ZR.ServiceCore.Model.Dto
{
public class GenTableDto
{
ZR.ServiceCore/Model/Dto/LockUserDto.cs
+1 -1
View File
@@ -1,4 +1,4 @@
namespace ZR.Model.System.Dto
namespace ZR.ServiceCore.Model.Dto
{
public class LockUserDto
{
ZR.ServiceCore/Model/Dto/LoginBodyDto.cs
+1 -1
View File
@@ -1,6 +1,6 @@
using System.ComponentModel.DataAnnotations;
namespace ZR.Model.System.Dto
namespace ZR.ServiceCore.Model.Dto
{
public class LoginBodyDto
{
ZR.ServiceCore/Model/Dto/MenuDto.cs
+3 -5
View File
@@ -1,9 +1,7 @@
using MiniExcelLibs.Attributes;
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations;
using MiniExcelLibs.Attributes;
namespace ZR.Model.System.Dto
namespace ZR.ServiceCore.Model.Dto
{
public class MenuDto
{
ZR.ServiceCore/Model/Dto/RegisterDto.cs
+1 -1
View File
@@ -1,6 +1,6 @@
using System.ComponentModel.DataAnnotations;
namespace ZR.Model.System.Dto
namespace ZR.ServiceCore.Model.Dto
{
public class RegisterDto
{
ZR.ServiceCore/Model/Dto/RoleMenuExportDto.cs
+2 -2
View File
@@ -1,8 +1,8 @@
using MiniExcelLibs.Attributes;
using SqlSugar.DbConvert;
using ZR.Model.System.Enums;
using ZR.ServiceCore.Model.Enums;
namespace ZR.Model.System.Dto
namespace ZR.ServiceCore.Model.Dto
{
public class RoleMenuExportDto
{
ZR.ServiceCore/Model/Dto/RoleUserDto.cs
+3 -3
View File
@@ -1,7 +1,7 @@
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations;
using ZR.Model;
namespace ZR.Model.System.Dto
namespace ZR.ServiceCore.Model.Dto
{
public class RoleUserQueryDto : PagerInfo
{
ZR.ServiceCore/Model/Dto/ScanDto.cs
+1 -1
View File
@@ -1,4 +1,4 @@
namespace ZR.Model.System.Dto
namespace ZR.ServiceCore.Model.Dto
{
public class ScanDto
{
ZR.ServiceCore/Model/Dto/SqlDiffLogDto.cs
+2 -1
View File
@@ -1,7 +1,8 @@
using System.ComponentModel.DataAnnotations;
using MiniExcelLibs.Attributes;
using ZR.Model;
namespace ZR.Model.System.Dto
namespace ZR.ServiceCore.Model.Dto
{
/// <summary>
/// 数据差异日志查询对象
ZR.ServiceCore/Model/Dto/SysConfigDto.cs
+2 -2
View File
@@ -1,6 +1,6 @@
using System;
using ZR.Model;
namespace ZR.Model.System.Dto
namespace ZR.ServiceCore.Model.Dto
{
/// <summary>
/// 参数配置输入对象模型
ZR.ServiceCore/Model/Dto/SysDeptDto.cs
+3 -1
View File
@@ -1,4 +1,6 @@
namespace ZR.Model.System.Dto
using ZR.Model;
namespace ZR.ServiceCore.Model.Dto
{
public class SysDeptQueryDto : PagerInfo
{
ZR.ServiceCore/Model/Dto/SysdictDataDto.cs → ZR.ServiceCore/Model/Dto/SysDictDataDto.cs
+2 -4
View File
@@ -1,8 +1,6 @@
using System.Collections.Generic;
namespace ZR.Model.System.Dto
namespace ZR.ServiceCore.Model.Dto
{
public class SysdictDataDto
public class SysDictDataDto
{
public string DictType { get; set; }
public string ColumnName { get; set; }
ZR.ServiceCore/Model/Dto/SysDictTypeDto.cs
+1 -1
View File
@@ -1,6 +1,6 @@
using System.ComponentModel.DataAnnotations;
namespace ZR.Model.System.Dto
namespace ZR.ServiceCore.Model.Dto
{
public class SysDictTypeDto
{
ZR.ServiceCore/Model/Dto/SysFileQueryDto.cs
+2 -2
View File
@@ -1,6 +1,6 @@
using System;
using ZR.Model;
namespace ZR.Model.System.Dto
namespace ZR.ServiceCore.Model.Dto
{
/// <summary>
/// 文件存储输入对象
ZR.ServiceCore/Model/Dto/SysLogininfoDto.cs
+1 -1
View File
@@ -1,4 +1,4 @@
namespace ZR.Model.System.Dto
namespace ZR.ServiceCore.Model.Dto
{
public class SysLogininfoDto : SysBase
{
ZR.ServiceCore/Model/Dto/SysNoticeDto.cs
+2 -1
View File
@@ -1,6 +1,7 @@
using System.ComponentModel.DataAnnotations;
using ZR.Model;
namespace ZR.Model.System.Dto
namespace ZR.ServiceCore.Model.Dto
{
/// <summary>
/// 通知公告表输入对象
ZR.ServiceCore/Model/Dto/SysOperLogDto.cs
+2 -2
View File
@@ -1,6 +1,6 @@
using System;
using ZR.Model;
namespace ZR.Model.System.Dto
namespace ZR.ServiceCore.Model.Dto
{
public class SysOperLogQueryDto : PagerInfo
{
ZR.ServiceCore/Model/Dto/SysRoleDto.cs
+1 -3
View File
@@ -1,6 +1,4 @@
using System.Collections.Generic;
namespace ZR.Model.System.Dto
namespace ZR.ServiceCore.Model.Dto
{
public class SysRoleDto : SysBase
{
ZR.ServiceCore/Model/Dto/SysRoleMenuDto.cs
+1 -4
View File
@@ -1,7 +1,4 @@
using System;
using System.Collections.Generic;
namespace ZR.Model.System.Dto
namespace ZR.ServiceCore.Model.Dto
{
public class SysRoleMenuDto
{
ZR.ServiceCore/Model/Dto/SysUserDto.cs
+1 -3
View File
@@ -1,6 +1,4 @@
using System;
namespace ZR.Model.System.Dto
namespace ZR.ServiceCore.Model.Dto
{
public class SysUserDto
{
ZR.ServiceCore/Model/Dto/TasksDto.cs
+3 -3
View File
@@ -1,7 +1,7 @@
using System;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations;
using ZR.Model;
namespace ZR.Model.System.Dto
namespace ZR.ServiceCore.Model.Dto
{
public class TasksQueryDto : PagerInfo
{
ZR.ServiceCore/Model/Dto/TasksLogDto.cs
+1 -3
View File
@@ -1,6 +1,4 @@
using System;
namespace ZR.Model.System.Dto
namespace ZR.ServiceCore.Model.Dto
{
public class TasksLogQueryDto
{
ZR.ServiceCore/Model/Enums/MenuStatus.cs
+1 -1
View File
@@ -1,6 +1,6 @@
using System.ComponentModel;
namespace ZR.Model.System.Enums
namespace ZR.ServiceCore.Model.Enums
{
/// <summary>
/// 菜单状态（0正常 1停用）
ZR.ServiceCore/Model/Generate/GenTable.cs
+1 -4
View File
@@ -1,7 +1,4 @@
using SqlSugar;
using System.Collections.Generic;
namespace ZR.Model.System.Generate
namespace ZR.ServiceCore.Model.Generate
{
/// <summary>
/// 代码生成表
ZR.ServiceCore/Model/Generate/GenTableColumn.cs
+1 -5
View File
@@ -1,8 +1,4 @@
using SqlSugar;
using System;
using System.Linq;
namespace ZR.Model.System.Generate
namespace ZR.ServiceCore.Model.Generate
{
/// <summary>
/// 代码生成表字段
ZR.ServiceCore/Model/SqlDiffLog.cs
+1 -1
View File
@@ -1,4 +1,4 @@
namespace ZR.Model.System
namespace ZR.ServiceCore.Model
{
[SugarTable("SqlDiffLog", "数据差异日志")]
[Tenant("0")]
ZR.ServiceCore/Model/SysBase.cs
+1 -4
View File
@@ -1,9 +1,6 @@
using MiniExcelLibs.Attributes;
using Newtonsoft.Json;
using SqlSugar;
using System;
namespace ZR.Model.System
namespace ZR.ServiceCore.Model
{
//[EpplusTable(PrintHeaders = true, AutofitColumns = true, AutoCalculate = true, ShowTotal = true)]
public class SysBase
ZR.ServiceCore/Model/SysConfig.cs
+2 -2
View File
@@ -1,6 +1,6 @@
using SqlSugar;
using ZR.Model.System;
namespace ZR.Model.System
namespace ZR.ServiceCore.Model
{
/// <summary>
/// 参数配置，数据实体对象
ZR.ServiceCore/Model/SysDept.cs
+3 -1
View File
@@ -1,4 +1,6 @@
namespace ZR.Model.System
using ZR.Model.System;
namespace ZR.ServiceCore.Model
{
/// <summary>
/// 部门表
ZR.ServiceCore/Model/SysDictData.cs
+2 -2
View File
@@ -1,6 +1,6 @@
using SqlSugar;
using ZR.Model.System;
namespace ZR.Model.System
namespace ZR.ServiceCore.Model
{
/// <summary>
/// 字典数据表
ZR.ServiceCore/Model/SysDictType.cs
+2 -2
View File
@@ -1,6 +1,6 @@
using SqlSugar;
using ZR.Model.System;
namespace ZR.Model.System
namespace ZR.ServiceCore.Model
{
/// <summary>
/// 字典类型表
ZR.ServiceCore/Model/SysField.cs
+14
View File
@@ -0,0 +1,14 @@
namespace ZR.ServiceCore.Model;
[SugarTable("sys_field")]
[Tenant("0")]
public class SysField
{
[JsonConverter(typeof(ValueToStringConverter))]
[SugarColumn(IsPrimaryKey = true)]
public long Id { get; set; }
public string FieldName { get; set; }
public string FullName { get; set; }
}
ZR.ServiceCore/Model/SysFile.cs
+1 -5
View File
@@ -1,8 +1,4 @@
using Newtonsoft.Json;
using SqlSugar;
using System;
namespace ZR.Model.System
namespace ZR.ServiceCore.Model
{
[Tenant("0")]
[SugarTable("sys_file", "文件存储表")]
ZR.ServiceCore/Model/SysLogininfor.cs
+1 -4
View File
@@ -1,7 +1,4 @@
using SqlSugar;
using System;
namespace ZR.Model.System
namespace ZR.ServiceCore.Model
{
/// <summary>
/// sys_logininfor 表
ZR.ServiceCore/Model/SysMenu.cs
+2 -3
View File
@@ -1,7 +1,6 @@
using SqlSugar;
using System.Collections.Generic;
using ZR.Model.System;
namespace ZR.Model.System
namespace ZR.ServiceCore.Model
{
/// <summary>
/// Sys_menu表
ZR.ServiceCore/Model/SysNotice.cs
+2 -2
View File
@@ -1,6 +1,6 @@
using SqlSugar;
using ZR.Model.System;
namespace ZR.Model.System
namespace ZR.ServiceCore.Model
{
/// <summary>
/// 通知公告表
ZR.ServiceCore/Model/SysOperLog.cs
+1 -4
View File
@@ -1,9 +1,6 @@
using MiniExcelLibs.Attributes;
using SqlSugar;
using System;
using System.ComponentModel;
namespace ZR.Model.System
namespace ZR.ServiceCore.Model
{
[SugarTable("sys_oper_log", "操作日志表")]
[Tenant("0")]
ZR.ServiceCore/Model/SysPost.cs
+2 -2
View File
@@ -1,6 +1,6 @@
using SqlSugar;
using ZR.Model.System;
namespace ZR.Model.System
namespace ZR.ServiceCore.Model
{
[SugarTable("sys_post", "岗位表")]
[Tenant("0")]
ZR.ServiceCore/Model/SysRole.cs
+2 -2
View File
@@ -1,6 +1,6 @@
using SqlSugar;
using ZR.Model.System;
namespace ZR.Model.System
namespace ZR.ServiceCore.Model
{
/// <summary>
/// 角色表 sys_role
ZR.ServiceCore/Model/SysRoleDept.cs
+1 -3
View File
@@ -1,6 +1,4 @@
using SqlSugar;
namespace ZR.Model.System
namespace ZR.ServiceCore.Model
{
[SugarTable("sys_role_dept", "角色部门")]
[Tenant(0)]
ZR.ServiceCore/Model/SysRoleField.cs
+10
View File
@@ -0,0 +1,10 @@
namespace ZR.ServiceCore.Model;
[SugarTable("sys_role_field")]
[Tenant("0")]
public class SysRoleField
{
public long FieldId { get; set; }
public long RoleId { get; set; }
}
ZR.ServiceCore/Model/SysRoleMenu.cs
+1 -4
View File
@@ -1,7 +1,4 @@
using Newtonsoft.Json;
using SqlSugar;
namespace ZR.Model.System
namespace ZR.ServiceCore.Model
{
/// <summary>
/// 角色菜单
ZR.ServiceCore/Model/SysTasks.cs
+3 -4
View File
@@ -1,8 +1,7 @@
using SqlSugar;
using System;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations;
using ZR.Model.System;
namespace ZR.Model.System
namespace ZR.ServiceCore.Model
{
///<summary>
///计划任务
ZR.ServiceCore/Model/SysTasksLog.cs
+1 -4
View File
@@ -1,7 +1,4 @@
using SqlSugar;
using System;
namespace ZR.Model.System
namespace ZR.ServiceCore.Model
{
/// <summary>
/// 任务日志
ZR.ServiceCore/Model/SysUser.cs
+2 -5
View File
@@ -1,10 +1,7 @@
using MiniExcelLibs.Attributes;
using Newtonsoft.Json;
using SqlSugar;
using System;
using System.Collections.Generic;
using ZR.Model.System;
namespace ZR.Model.System
namespace ZR.ServiceCore.Model
{
/// <summary>
/// 用户表
ZR.ServiceCore/Model/SysUserPost.cs
+1 -3
View File
@@ -1,6 +1,4 @@
using SqlSugar;
namespace ZR.Model.System
namespace ZR.ServiceCore.Model
{
/// <summary>
/// 用户岗位
ZR.ServiceCore/Model/SysUserRole.cs
+1 -3
View File
@@ -1,6 +1,4 @@
using SqlSugar;
namespace ZR.Model.System
namespace ZR.ServiceCore.Model
{
/// <summary>
/// 用户角色关联表 用户N-1 角色
ZR.ServiceCore/Model/UserConstants.cs
+1 -1
View File
@@ -1,4 +1,4 @@
namespace ZR.Model.System
namespace ZR.ServiceCore.Model
{
public class UserConstants
{
ZR.ServiceCore/Model/Vo/RouterVo.cs
+1 -4
View File
@@ -1,7 +1,4 @@
using Newtonsoft.Json;
using System.Collections.Generic;
namespace ZR.Model.System.Vo
namespace ZR.ServiceCore.Model.Vo
{
/// <summary>
/// 路由展示
ZR.ServiceCore/Model/Vo/TreeSelectVo.cs
+1 -1
View File
@@ -1,4 +1,4 @@
namespace ZR.Model.System.Vo
namespace ZR.ServiceCore.Model.Vo
{
/// <summary>
/// Treeselect树结构实体类