Przeglądaj źródła

分页过滤实体更改为数据Dto

zhontai 3 lat temu
rodzic
commit
4965fa0acd
51 zmienionych plików z 397 dodań i 242 usunięć
  1. 11 0
      src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.Domain/Api/Dto/ApiGetPageDto.cs
  2. 16 0
      src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.Domain/Dictionary/Dto/DictionaryGetPageDto.cs
  3. 11 0
      src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.Domain/DictionaryType/Dto/DictionaryTypeGetPageDto.cs
  4. 10 0
      src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.Domain/LogAbstract/Dto/LogGetPageDto.cs
  5. 0 0
      src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.Domain/LogAbstract/LogAbstract.cs
  6. 10 0
      src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.Domain/Role/Dto/RoleGetPageDto.cs
  7. 11 0
      src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.Domain/Tenant/Dto/TenantGetPageDto.cs
  8. 10 0
      src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.Domain/View/Dto/ViewGetPageDto.cs
  9. 175 135
      src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.Domain/ZhonTai.Plate.Admin.Domain.xml
  10. 4 4
      src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.HttpApi/Controllers/ApiController.cs
  11. 4 4
      src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.HttpApi/Controllers/DictionaryController.cs
  12. 4 4
      src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.HttpApi/Controllers/DictionaryTypeController.cs
  13. 4 4
      src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.HttpApi/Controllers/LoginLogController.cs
  14. 4 4
      src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.HttpApi/Controllers/OprationLogController.cs
  15. 4 4
      src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.HttpApi/Controllers/RoleController.cs
  16. 4 3
      src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.HttpApi/Controllers/TenantController.cs
  17. 1 2
      src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.HttpApi/Controllers/UserController.cs
  18. 4 4
      src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.HttpApi/Controllers/ViewController.cs
  19. 17 18
      src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.HttpApi/ZhonTai.Plate.Admin.HttpApi.xml
  20. 3 3
      src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.Service.Contracts/Api/IApiService.cs
  21. 2 2
      src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.Service.Contracts/Dictionary/IDictionaryService.cs
  22. 2 2
      src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.Service.Contracts/DictionaryType/IDictionaryTypeService.cs
  23. 2 2
      src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.Service.Contracts/LoginLog/ILoginLogService.cs
  24. 2 2
      src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.Service.Contracts/OprationLog/IOprationLogService.cs
  25. 2 2
      src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.Service.Contracts/Role/IRoleService.cs
  26. 2 2
      src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.Service.Contracts/Tenant/ITenantService.cs
  27. 1 2
      src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.Service.Contracts/User/IUserService.cs
  28. 2 2
      src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.Service.Contracts/View/IViewService.cs
  29. 2 2
      src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.Service.Contracts/ZhonTai.Plate.Admin.Service.Contracts.xml
  30. 2 1
      src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.Service/Api/ApiService.cs
  31. 2 1
      src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.Service/Dictionary/DictionaryService.cs
  32. 2 1
      src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.Service/DictionaryType/DictionaryTypeService.cs
  33. 2 1
      src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.Service/LoginLog/LoginLogService.cs
  34. 2 1
      src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.Service/OprationLog/OprationLogService.cs
  35. 2 1
      src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.Service/Role/RoleService.cs
  36. 2 1
      src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.Service/Tenant/TenantService.cs
  37. 1 1
      src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.Service/User/UserService.cs
  38. 2 1
      src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.Service/View/ViewService.cs
  39. 10 0
      src/plates/ZhonTai.Plate.Personal/ZhonTai.Plate.Personnel.Domain/Position/Dto/PositionDataOutput.cs
  40. 5 0
      src/plates/ZhonTai.Plate.Personal/ZhonTai.Plate.Personnel.Domain/ZhonTai.Plate.Personnel.Domain.xml
  41. 1 2
      src/plates/ZhonTai.Plate.Personal/ZhonTai.Plate.Personnel.HttpApi/Controllers/EmployeeController.cs
  42. 4 4
      src/plates/ZhonTai.Plate.Personal/ZhonTai.Plate.Personnel.HttpApi/Controllers/PositionController.cs
  43. 1 0
      src/plates/ZhonTai.Plate.Personal/ZhonTai.Plate.Personnel.HttpApi/ZhonTai.Plate.Personnel.HttpApi.csproj
  44. 3 3
      src/plates/ZhonTai.Plate.Personal/ZhonTai.Plate.Personnel.HttpApi/ZhonTai.Plate.Personnel.HttpApi.xml
  45. 1 1
      src/plates/ZhonTai.Plate.Personal/ZhonTai.Plate.Personnel.Service.Contracts/Employee/IEmployeeService.cs
  46. 2 2
      src/plates/ZhonTai.Plate.Personal/ZhonTai.Plate.Personnel.Service.Contracts/Position/IPositionService.cs
  47. 1 0
      src/plates/ZhonTai.Plate.Personal/ZhonTai.Plate.Personnel.Service.Contracts/ZhonTai.Plate.Personnel.Service.Contracts.csproj
  48. 1 1
      src/plates/ZhonTai.Plate.Personal/ZhonTai.Plate.Personnel.Service/Employee/EmployeeService.cs
  49. 2 1
      src/plates/ZhonTai.Plate.Personal/ZhonTai.Plate.Personnel.Service/Position/PositionService.cs
  50. 12 5
      src/shared/ZhonTai.Common/Domain/Dto/PageInput.cs
  51. 13 7
      src/shared/ZhonTai.Common/ZhonTai.Common.xml

+ 11 - 0
src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.Domain/Api/Dto/ApiGetPageDto.cs

@@ -0,0 +1,11 @@
+
+namespace ZhonTai.Plate.Admin.Domain.Api.Dto
+{
+    public class ApiGetPageDto
+    {
+        /// <summary>
+        /// 接口名称
+        /// </summary>
+        public string Label { get; set; }
+    }
+}

+ 16 - 0
src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.Domain/Dictionary/Dto/DictionaryGetPageDto.cs

@@ -0,0 +1,16 @@
+
+namespace ZhonTai.Plate.Admin.Domain.Dictionary.Dto
+{
+    public partial class DictionaryGetPageDto
+    {
+        /// <summary>
+        /// 字典类型Id
+        /// </summary>
+        public long DictionaryTypeId { get; set; }
+
+        /// <summary>
+        /// 字典名称
+        /// </summary>
+        public string Name { get; set; }
+    }
+}

+ 11 - 0
src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.Domain/DictionaryType/Dto/DictionaryTypeGetPageDto.cs

@@ -0,0 +1,11 @@
+
+namespace ZhonTai.Plate.Admin.Domain.DictionaryType.Dto
+{
+    public partial class DictionaryTypeGetPageDto
+    {
+        /// <summary>
+        /// 字典名称
+        /// </summary>
+        public string Name { get; set; }
+    }
+}

+ 10 - 0
src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.Domain/LogAbstract/Dto/LogGetPageDto.cs

@@ -0,0 +1,10 @@
+namespace ZhonTai.Plate.Admin.Domain
+{
+    public abstract class LogGetPageDto
+    {
+        /// <summary>
+        /// 创建者
+        /// </summary>
+        public string CreatedUserName { get; set; }
+    }
+}

+ 0 - 0
src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.Domain/Abstractions/LogAbstract.cs → src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.Domain/LogAbstract/LogAbstract.cs


+ 10 - 0
src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.Domain/Role/Dto/RoleGetPageDto.cs

@@ -0,0 +1,10 @@
+namespace ZhonTai.Plate.Admin.Domain.Role.Dto
+{
+    public partial class RoleGetPageDto
+    {
+        /// <summary>
+        /// 名称
+        /// </summary>
+        public string Name { get; set; }
+    }
+}

+ 11 - 0
src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.Domain/Tenant/Dto/TenantGetPageDto.cs

@@ -0,0 +1,11 @@
+
+namespace ZhonTai.Plate.Admin.Domain.Tenant.Dto
+{
+    public class TenantGetPageDto
+    {
+        /// <summary>
+        /// 企业名称
+        /// </summary>
+        public string Name { get; set; }
+    }
+}

+ 10 - 0
src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.Domain/View/Dto/ViewGetPageDto.cs

@@ -0,0 +1,10 @@
+namespace ZhonTai.Plate.Admin.Domain.View.Dto
+{
+    public class ViewGetPageDto
+    {
+        /// <summary>
+        /// 视图名称
+        /// </summary>
+        public string Label { get; set; }
+    }
+}

+ 175 - 135
src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.Domain/ZhonTai.Plate.Admin.Domain.xml

@@ -4,66 +4,6 @@
         <name>ZhonTai.Plate.Admin.Domain</name>
     </assembly>
     <members>
-        <member name="T:ZhonTai.Plate.Admin.Domain.LogAbstract">
-            <summary>
-            日志
-            </summary>
-        </member>
-        <member name="P:ZhonTai.Plate.Admin.Domain.LogAbstract.TenantId">
-            <summary>
-            租户Id
-            </summary>
-        </member>
-        <member name="P:ZhonTai.Plate.Admin.Domain.LogAbstract.NickName">
-            <summary>
-            昵称
-            </summary>
-        </member>
-        <member name="P:ZhonTai.Plate.Admin.Domain.LogAbstract.IP">
-            <summary>
-            IP
-            </summary>
-        </member>
-        <member name="P:ZhonTai.Plate.Admin.Domain.LogAbstract.Browser">
-            <summary>
-            浏览器
-            </summary>
-        </member>
-        <member name="P:ZhonTai.Plate.Admin.Domain.LogAbstract.Os">
-            <summary>
-            操作系统
-            </summary>
-        </member>
-        <member name="P:ZhonTai.Plate.Admin.Domain.LogAbstract.Device">
-            <summary>
-            设备
-            </summary>
-        </member>
-        <member name="P:ZhonTai.Plate.Admin.Domain.LogAbstract.BrowserInfo">
-            <summary>
-            浏览器信息
-            </summary>
-        </member>
-        <member name="P:ZhonTai.Plate.Admin.Domain.LogAbstract.ElapsedMilliseconds">
-            <summary>
-            耗时(毫秒)
-            </summary>
-        </member>
-        <member name="P:ZhonTai.Plate.Admin.Domain.LogAbstract.Status">
-            <summary>
-            操作状态
-            </summary>
-        </member>
-        <member name="P:ZhonTai.Plate.Admin.Domain.LogAbstract.Msg">
-            <summary>
-            操作消息
-            </summary>
-        </member>
-        <member name="P:ZhonTai.Plate.Admin.Domain.LogAbstract.Result">
-            <summary>
-            操作结果
-            </summary>
-        </member>
         <member name="T:ZhonTai.Plate.Admin.Domain.Api.ApiEntity">
             <summary>
             接口管理
@@ -109,56 +49,61 @@
             启用
             </summary>
         </member>
-        <member name="P:ZhonTai.Plate.Admin.Domain.Api.Dtos.ApiDataOutput.TenantId">
+        <member name="P:ZhonTai.Plate.Admin.Domain.Api.Dto.ApiDataOutput.TenantId">
             <summary>
             租户Id
             </summary>
         </member>
-        <member name="P:ZhonTai.Plate.Admin.Domain.Api.Dtos.ApiDataOutput.Id">
+        <member name="P:ZhonTai.Plate.Admin.Domain.Api.Dto.ApiDataOutput.Id">
             <summary>
             接口Id
             </summary>
         </member>
-        <member name="P:ZhonTai.Plate.Admin.Domain.Api.Dtos.ApiDataOutput.ParentId">
+        <member name="P:ZhonTai.Plate.Admin.Domain.Api.Dto.ApiDataOutput.ParentId">
             <summary>
             父级Id
             </summary>
         </member>
-        <member name="P:ZhonTai.Plate.Admin.Domain.Api.Dtos.ApiDataOutput.Name">
+        <member name="P:ZhonTai.Plate.Admin.Domain.Api.Dto.ApiDataOutput.Name">
             <summary>
             接口命名
             </summary>
         </member>
-        <member name="P:ZhonTai.Plate.Admin.Domain.Api.Dtos.ApiDataOutput.Label">
+        <member name="P:ZhonTai.Plate.Admin.Domain.Api.Dto.ApiDataOutput.Label">
             <summary>
             接口名称
             </summary>
         </member>
-        <member name="P:ZhonTai.Plate.Admin.Domain.Api.Dtos.ApiDataOutput.Path">
+        <member name="P:ZhonTai.Plate.Admin.Domain.Api.Dto.ApiDataOutput.Path">
             <summary>
             接口地址
             </summary>
         </member>
-        <member name="P:ZhonTai.Plate.Admin.Domain.Api.Dtos.ApiDataOutput.HttpMethods">
+        <member name="P:ZhonTai.Plate.Admin.Domain.Api.Dto.ApiDataOutput.HttpMethods">
             <summary>
             接口提交方法
             </summary>
         </member>
-        <member name="P:ZhonTai.Plate.Admin.Domain.Api.Dtos.ApiDataOutput.Description">
+        <member name="P:ZhonTai.Plate.Admin.Domain.Api.Dto.ApiDataOutput.Description">
             <summary>
             说明
             </summary>
         </member>
-        <member name="P:ZhonTai.Plate.Admin.Domain.Api.Dtos.ApiDataOutput.Sort">
+        <member name="P:ZhonTai.Plate.Admin.Domain.Api.Dto.ApiDataOutput.Sort">
             <summary>
             排序
             </summary>
         </member>
-        <member name="P:ZhonTai.Plate.Admin.Domain.Api.Dtos.ApiDataOutput.Enabled">
+        <member name="P:ZhonTai.Plate.Admin.Domain.Api.Dto.ApiDataOutput.Enabled">
             <summary>
             启用
             </summary>
         </member>
+        <member name="P:ZhonTai.Plate.Admin.Domain.Api.Dto.ApiGetPageDto.Label">
+            <summary>
+            接口名称
+            </summary>
+        </member>
         <member name="T:ZhonTai.Plate.Admin.Domain.AppLog.AppLogEntity">
             <summary>
             应用程序日志
@@ -226,7 +171,7 @@
             <param name="appConfig"></param>
             <returns></returns>
         </member>
-        <member name="M:ZhonTai.Plate.Admin.Domain.IdleBusExtesions.CreateFreeSql(ZhonTai.Common.Auth.IUser,ZhonTai.Common.Configs.AppConfig,ZhonTai.Common.Configs.DbConfig,ZhonTai.Plate.Admin.Domain.Tenant.Dtos.CreateFreeSqlTenantDto)">
+        <member name="M:ZhonTai.Plate.Admin.Domain.IdleBusExtesions.CreateFreeSql(ZhonTai.Common.Auth.IUser,ZhonTai.Common.Configs.AppConfig,ZhonTai.Common.Configs.DbConfig,ZhonTai.Plate.Admin.Domain.Tenant.Dto.CreateFreeSqlTenantDto)">
             <summary>
             创建FreeSql实例
             </summary>
@@ -301,46 +246,51 @@
             排序
             </summary>
         </member>
-        <member name="T:ZhonTai.Plate.Admin.Domain.DictionaryType.Dtos.DictionaryTypeDataOutput">
+        <member name="T:ZhonTai.Plate.Admin.Domain.DictionaryType.Dto.DictionaryTypeDataOutput">
             <summary>
             数据字典类型导出
             </summary>
         </member>
-        <member name="P:ZhonTai.Plate.Admin.Domain.DictionaryType.Dtos.DictionaryTypeDataOutput.TenantId">
+        <member name="P:ZhonTai.Plate.Admin.Domain.DictionaryType.Dto.DictionaryTypeDataOutput.TenantId">
             <summary>
             租户Id
             </summary>
         </member>
-        <member name="P:ZhonTai.Plate.Admin.Domain.DictionaryType.Dtos.DictionaryTypeDataOutput.Id">
+        <member name="P:ZhonTai.Plate.Admin.Domain.DictionaryType.Dto.DictionaryTypeDataOutput.Id">
             <summary>
             字典类型Id
             </summary>
         </member>
-        <member name="P:ZhonTai.Plate.Admin.Domain.DictionaryType.Dtos.DictionaryTypeDataOutput.Name">
+        <member name="P:ZhonTai.Plate.Admin.Domain.DictionaryType.Dto.DictionaryTypeDataOutput.Name">
             <summary>
             字典名称
             </summary>
         </member>
-        <member name="P:ZhonTai.Plate.Admin.Domain.DictionaryType.Dtos.DictionaryTypeDataOutput.Code">
+        <member name="P:ZhonTai.Plate.Admin.Domain.DictionaryType.Dto.DictionaryTypeDataOutput.Code">
             <summary>
             字典编码
             </summary>
         </member>
-        <member name="P:ZhonTai.Plate.Admin.Domain.DictionaryType.Dtos.DictionaryTypeDataOutput.Description">
+        <member name="P:ZhonTai.Plate.Admin.Domain.DictionaryType.Dto.DictionaryTypeDataOutput.Description">
             <summary>
             描述
             </summary>
         </member>
-        <member name="P:ZhonTai.Plate.Admin.Domain.DictionaryType.Dtos.DictionaryTypeDataOutput.Enabled">
+        <member name="P:ZhonTai.Plate.Admin.Domain.DictionaryType.Dto.DictionaryTypeDataOutput.Enabled">
             <summary>
             启用
             </summary>
         </member>
-        <member name="P:ZhonTai.Plate.Admin.Domain.DictionaryType.Dtos.DictionaryTypeDataOutput.Sort">
+        <member name="P:ZhonTai.Plate.Admin.Domain.DictionaryType.Dto.DictionaryTypeDataOutput.Sort">
             <summary>
             排序
             </summary>
         </member>
+        <member name="P:ZhonTai.Plate.Admin.Domain.DictionaryType.Dto.DictionaryTypeGetPageDto.Name">
+            <summary>
+            字典名称
+            </summary>
+        </member>
         <member name="T:ZhonTai.Plate.Admin.Domain.Dictionary.DictionaryEntity">
             <summary>
             数据字典
@@ -391,56 +341,66 @@
             排序
             </summary>
         </member>
-        <member name="T:ZhonTai.Plate.Admin.Domain.Dictionary.Dtos.DictionaryDataOutput">
+        <member name="T:ZhonTai.Plate.Admin.Domain.Dictionary.Dto.DictionaryDataOutput">
             <summary>
             数据字典导出
             </summary>
         </member>
-        <member name="P:ZhonTai.Plate.Admin.Domain.Dictionary.Dtos.DictionaryDataOutput.TenantId">
+        <member name="P:ZhonTai.Plate.Admin.Domain.Dictionary.Dto.DictionaryDataOutput.TenantId">
             <summary>
             租户Id
             </summary>
         </member>
-        <member name="P:ZhonTai.Plate.Admin.Domain.Dictionary.Dtos.DictionaryDataOutput.Id">
+        <member name="P:ZhonTai.Plate.Admin.Domain.Dictionary.Dto.DictionaryDataOutput.Id">
             <summary>
             字典Id
             </summary>
         </member>
-        <member name="P:ZhonTai.Plate.Admin.Domain.Dictionary.Dtos.DictionaryDataOutput.DictionaryTypeId">
+        <member name="P:ZhonTai.Plate.Admin.Domain.Dictionary.Dto.DictionaryDataOutput.DictionaryTypeId">
             <summary>
             字典类型Id
             </summary>
         </member>
-        <member name="P:ZhonTai.Plate.Admin.Domain.Dictionary.Dtos.DictionaryDataOutput.Name">
+        <member name="P:ZhonTai.Plate.Admin.Domain.Dictionary.Dto.DictionaryDataOutput.Name">
             <summary>
             字典名称
             </summary>
         </member>
-        <member name="P:ZhonTai.Plate.Admin.Domain.Dictionary.Dtos.DictionaryDataOutput.Code">
+        <member name="P:ZhonTai.Plate.Admin.Domain.Dictionary.Dto.DictionaryDataOutput.Code">
             <summary>
             字典编码
             </summary>
         </member>
-        <member name="P:ZhonTai.Plate.Admin.Domain.Dictionary.Dtos.DictionaryDataOutput.Value">
+        <member name="P:ZhonTai.Plate.Admin.Domain.Dictionary.Dto.DictionaryDataOutput.Value">
             <summary>
             字典值
             </summary>
         </member>
-        <member name="P:ZhonTai.Plate.Admin.Domain.Dictionary.Dtos.DictionaryDataOutput.Description">
+        <member name="P:ZhonTai.Plate.Admin.Domain.Dictionary.Dto.DictionaryDataOutput.Description">
             <summary>
             描述
             </summary>
         </member>
-        <member name="P:ZhonTai.Plate.Admin.Domain.Dictionary.Dtos.DictionaryDataOutput.Enabled">
+        <member name="P:ZhonTai.Plate.Admin.Domain.Dictionary.Dto.DictionaryDataOutput.Enabled">
             <summary>
             启用
             </summary>
         </member>
-        <member name="P:ZhonTai.Plate.Admin.Domain.Dictionary.Dtos.DictionaryDataOutput.Sort">
+        <member name="P:ZhonTai.Plate.Admin.Domain.Dictionary.Dto.DictionaryDataOutput.Sort">
             <summary>
             排序
             </summary>
         </member>
+        <member name="P:ZhonTai.Plate.Admin.Domain.Dictionary.Dto.DictionaryGetPageDto.DictionaryTypeId">
+            <summary>
+            字典类型Id
+            </summary>
+        </member>
+        <member name="P:ZhonTai.Plate.Admin.Domain.Dictionary.Dto.DictionaryGetPageDto.Name">
+            <summary>
+            字典名称
+            </summary>
+        </member>
         <member name="T:ZhonTai.Plate.Admin.Domain.DocumentImage.DocumentImageEntity">
             <summary>
             文档图片
@@ -541,6 +501,71 @@
             主键Id
             </summary>
         </member>
+        <member name="P:ZhonTai.Plate.Admin.Domain.LogGetPageDto.CreatedUserName">
+            <summary>
+            创建者
+            </summary>
+        </member>
+        <member name="T:ZhonTai.Plate.Admin.Domain.LogAbstract">
+            <summary>
+            日志
+            </summary>
+        </member>
+        <member name="P:ZhonTai.Plate.Admin.Domain.LogAbstract.TenantId">
+            <summary>
+            租户Id
+            </summary>
+        </member>
+        <member name="P:ZhonTai.Plate.Admin.Domain.LogAbstract.NickName">
+            <summary>
+            昵称
+            </summary>
+        </member>
+        <member name="P:ZhonTai.Plate.Admin.Domain.LogAbstract.IP">
+            <summary>
+            IP
+            </summary>
+        </member>
+        <member name="P:ZhonTai.Plate.Admin.Domain.LogAbstract.Browser">
+            <summary>
+            浏览器
+            </summary>
+        </member>
+        <member name="P:ZhonTai.Plate.Admin.Domain.LogAbstract.Os">
+            <summary>
+            操作系统
+            </summary>
+        </member>
+        <member name="P:ZhonTai.Plate.Admin.Domain.LogAbstract.Device">
+            <summary>
+            设备
+            </summary>
+        </member>
+        <member name="P:ZhonTai.Plate.Admin.Domain.LogAbstract.BrowserInfo">
+            <summary>
+            浏览器信息
+            </summary>
+        </member>
+        <member name="P:ZhonTai.Plate.Admin.Domain.LogAbstract.ElapsedMilliseconds">
+            <summary>
+            耗时(毫秒)
+            </summary>
+        </member>
+        <member name="P:ZhonTai.Plate.Admin.Domain.LogAbstract.Status">
+            <summary>
+            操作状态
+            </summary>
+        </member>
+        <member name="P:ZhonTai.Plate.Admin.Domain.LogAbstract.Msg">
+            <summary>
+            操作消息
+            </summary>
+        </member>
+        <member name="P:ZhonTai.Plate.Admin.Domain.LogAbstract.Result">
+            <summary>
+            操作结果
+            </summary>
+        </member>
         <member name="T:ZhonTai.Plate.Admin.Domain.LoginLog.LoginLogEntity">
             <summary>
             操作日志
@@ -596,92 +621,92 @@
             接口
             </summary>
         </member>
-        <member name="P:ZhonTai.Plate.Admin.Domain.Permission.Dtos.PermissionDataOutput.TenantId">
+        <member name="P:ZhonTai.Plate.Admin.Domain.Permission.Dto.PermissionDataOutput.TenantId">
             <summary>
             租户Id
             </summary>
         </member>
-        <member name="P:ZhonTai.Plate.Admin.Domain.Permission.Dtos.PermissionDataOutput.Id">
+        <member name="P:ZhonTai.Plate.Admin.Domain.Permission.Dto.PermissionDataOutput.Id">
             <summary>
             权限Id
             </summary>
         </member>
-        <member name="P:ZhonTai.Plate.Admin.Domain.Permission.Dtos.PermissionDataOutput.ParentId">
+        <member name="P:ZhonTai.Plate.Admin.Domain.Permission.Dto.PermissionDataOutput.ParentId">
             <summary>
             父级节点
             </summary>
         </member>
-        <member name="P:ZhonTai.Plate.Admin.Domain.Permission.Dtos.PermissionDataOutput.Label">
+        <member name="P:ZhonTai.Plate.Admin.Domain.Permission.Dto.PermissionDataOutput.Label">
             <summary>
             权限名称
             </summary>
         </member>
-        <member name="P:ZhonTai.Plate.Admin.Domain.Permission.Dtos.PermissionDataOutput.Code">
+        <member name="P:ZhonTai.Plate.Admin.Domain.Permission.Dto.PermissionDataOutput.Code">
             <summary>
             权限编码
             </summary>
         </member>
-        <member name="P:ZhonTai.Plate.Admin.Domain.Permission.Dtos.PermissionDataOutput.Type">
+        <member name="P:ZhonTai.Plate.Admin.Domain.Permission.Dto.PermissionDataOutput.Type">
             <summary>
             权限类型
             </summary>
         </member>
-        <member name="P:ZhonTai.Plate.Admin.Domain.Permission.Dtos.PermissionDataOutput.ViewId">
+        <member name="P:ZhonTai.Plate.Admin.Domain.Permission.Dto.PermissionDataOutput.ViewId">
             <summary>
             视图
             </summary>
         </member>
-        <member name="P:ZhonTai.Plate.Admin.Domain.Permission.Dtos.PermissionDataOutput.Path">
+        <member name="P:ZhonTai.Plate.Admin.Domain.Permission.Dto.PermissionDataOutput.Path">
             <summary>
             访问地址
             </summary>
         </member>
-        <member name="P:ZhonTai.Plate.Admin.Domain.Permission.Dtos.PermissionDataOutput.Icon">
+        <member name="P:ZhonTai.Plate.Admin.Domain.Permission.Dto.PermissionDataOutput.Icon">
             <summary>
             图标
             </summary>
         </member>
-        <member name="P:ZhonTai.Plate.Admin.Domain.Permission.Dtos.PermissionDataOutput.ApiPath">
+        <member name="P:ZhonTai.Plate.Admin.Domain.Permission.Dto.PermissionDataOutput.ApiPath">
             <summary>
             接口路径
             </summary>
         </member>
-        <member name="P:ZhonTai.Plate.Admin.Domain.Permission.Dtos.PermissionDataOutput.Closable">
+        <member name="P:ZhonTai.Plate.Admin.Domain.Permission.Dto.PermissionDataOutput.Closable">
             <summary>
             可关闭
             </summary>
         </member>
-        <member name="P:ZhonTai.Plate.Admin.Domain.Permission.Dtos.PermissionDataOutput.Opened">
+        <member name="P:ZhonTai.Plate.Admin.Domain.Permission.Dto.PermissionDataOutput.Opened">
             <summary>
             组打开
             </summary>
         </member>
-        <member name="P:ZhonTai.Plate.Admin.Domain.Permission.Dtos.PermissionDataOutput.NewWindow">
+        <member name="P:ZhonTai.Plate.Admin.Domain.Permission.Dto.PermissionDataOutput.NewWindow">
             <summary>
             打开新窗口
             </summary>
         </member>
-        <member name="P:ZhonTai.Plate.Admin.Domain.Permission.Dtos.PermissionDataOutput.External">
+        <member name="P:ZhonTai.Plate.Admin.Domain.Permission.Dto.PermissionDataOutput.External">
             <summary>
             链接外显
             </summary>
         </member>
-        <member name="P:ZhonTai.Plate.Admin.Domain.Permission.Dtos.PermissionDataOutput.Hidden">
+        <member name="P:ZhonTai.Plate.Admin.Domain.Permission.Dto.PermissionDataOutput.Hidden">
             <summary>
             隐藏
             </summary>
         </member>
-        <member name="P:ZhonTai.Plate.Admin.Domain.Permission.Dtos.PermissionDataOutput.Sort">
+        <member name="P:ZhonTai.Plate.Admin.Domain.Permission.Dto.PermissionDataOutput.Sort">
             <summary>
             排序
             </summary>
         </member>
-        <member name="P:ZhonTai.Plate.Admin.Domain.Permission.Dtos.PermissionDataOutput.Enabled">
+        <member name="P:ZhonTai.Plate.Admin.Domain.Permission.Dto.PermissionDataOutput.Enabled">
             <summary>
             启用
             </summary>
         </member>
-        <member name="P:ZhonTai.Plate.Admin.Domain.Permission.Dtos.PermissionDataOutput.Description">
+        <member name="P:ZhonTai.Plate.Admin.Domain.Permission.Dto.PermissionDataOutput.Description">
             <summary>
             描述
             </summary>
@@ -811,46 +836,51 @@
             权限
             </summary>
         </member>
-        <member name="T:ZhonTai.Plate.Admin.Domain.Role.Dtos.RoleDataOutput">
+        <member name="T:ZhonTai.Plate.Admin.Domain.Role.Dto.RoleDataOutput">
             <summary>
             角色导出
             </summary>
         </member>
-        <member name="P:ZhonTai.Plate.Admin.Domain.Role.Dtos.RoleDataOutput.TenantId">
+        <member name="P:ZhonTai.Plate.Admin.Domain.Role.Dto.RoleDataOutput.TenantId">
             <summary>
             租户Id
             </summary>
         </member>
-        <member name="P:ZhonTai.Plate.Admin.Domain.Role.Dtos.RoleDataOutput.Id">
+        <member name="P:ZhonTai.Plate.Admin.Domain.Role.Dto.RoleDataOutput.Id">
             <summary>
             用户Id
             </summary>
         </member>
-        <member name="P:ZhonTai.Plate.Admin.Domain.Role.Dtos.RoleDataOutput.Name">
+        <member name="P:ZhonTai.Plate.Admin.Domain.Role.Dto.RoleDataOutput.Name">
             <summary>
             名称
             </summary>
         </member>
-        <member name="P:ZhonTai.Plate.Admin.Domain.Role.Dtos.RoleDataOutput.Code">
+        <member name="P:ZhonTai.Plate.Admin.Domain.Role.Dto.RoleDataOutput.Code">
             <summary>
             编码
             </summary>
         </member>
-        <member name="P:ZhonTai.Plate.Admin.Domain.Role.Dtos.RoleDataOutput.Description">
+        <member name="P:ZhonTai.Plate.Admin.Domain.Role.Dto.RoleDataOutput.Description">
             <summary>
             说明
             </summary>
         </member>
-        <member name="P:ZhonTai.Plate.Admin.Domain.Role.Dtos.RoleDataOutput.Enabled">
+        <member name="P:ZhonTai.Plate.Admin.Domain.Role.Dto.RoleDataOutput.Enabled">
             <summary>
             启用
             </summary>
         </member>
-        <member name="P:ZhonTai.Plate.Admin.Domain.Role.Dtos.RoleDataOutput.Sort">
+        <member name="P:ZhonTai.Plate.Admin.Domain.Role.Dto.RoleDataOutput.Sort">
             <summary>
             排序
             </summary>
         </member>
+        <member name="P:ZhonTai.Plate.Admin.Domain.Role.Dto.RoleGetPageDto.Name">
+            <summary>
+            名称
+            </summary>
+        </member>
         <member name="T:ZhonTai.Plate.Admin.Domain.Role.RoleEntity">
             <summary>
             角色
@@ -911,21 +941,26 @@
             权限
             </summary>
         </member>
-        <member name="P:ZhonTai.Plate.Admin.Domain.Tenant.Dtos.CreateFreeSqlTenantDto.DbType">
+        <member name="P:ZhonTai.Plate.Admin.Domain.Tenant.Dto.CreateFreeSqlTenantDto.DbType">
             <summary>
             数据库
             </summary>
         </member>
-        <member name="P:ZhonTai.Plate.Admin.Domain.Tenant.Dtos.CreateFreeSqlTenantDto.ConnectionString">
+        <member name="P:ZhonTai.Plate.Admin.Domain.Tenant.Dto.CreateFreeSqlTenantDto.ConnectionString">
             <summary>
             连接字符串
             </summary>
         </member>
-        <member name="P:ZhonTai.Plate.Admin.Domain.Tenant.Dtos.CreateFreeSqlTenantDto.IdleTime">
+        <member name="P:ZhonTai.Plate.Admin.Domain.Tenant.Dto.CreateFreeSqlTenantDto.IdleTime">
             <summary>
             空闲时间(分)
             </summary>
         </member>
+        <member name="P:ZhonTai.Plate.Admin.Domain.Tenant.Dto.TenantGetPageDto.Name">
+            <summary>
+            企业名称
+            </summary>
+        </member>
         <member name="T:ZhonTai.Plate.Admin.Domain.Tenant.TenantEntity">
             <summary>
             租户
@@ -1016,47 +1051,47 @@
             角色Id
             </summary>
         </member>
-        <member name="T:ZhonTai.Plate.Admin.Domain.User.Dtos.UserDataOutput">
+        <member name="T:ZhonTai.Plate.Admin.Domain.User.Dto.UserDataOutput">
             <summary>
             用户导出
             </summary>
         </member>
-        <member name="P:ZhonTai.Plate.Admin.Domain.User.Dtos.UserDataOutput.TenantId">
+        <member name="P:ZhonTai.Plate.Admin.Domain.User.Dto.UserDataOutput.TenantId">
             <summary>
             租户Id
             </summary>
         </member>
-        <member name="P:ZhonTai.Plate.Admin.Domain.User.Dtos.UserDataOutput.Id">
+        <member name="P:ZhonTai.Plate.Admin.Domain.User.Dto.UserDataOutput.Id">
             <summary>
             用户Id
             </summary>
         </member>
-        <member name="P:ZhonTai.Plate.Admin.Domain.User.Dtos.UserDataOutput.UserName">
+        <member name="P:ZhonTai.Plate.Admin.Domain.User.Dto.UserDataOutput.UserName">
             <summary>
             账号
             </summary>
         </member>
-        <member name="P:ZhonTai.Plate.Admin.Domain.User.Dtos.UserDataOutput.Password">
+        <member name="P:ZhonTai.Plate.Admin.Domain.User.Dto.UserDataOutput.Password">
             <summary>
             密码
             </summary>
         </member>
-        <member name="P:ZhonTai.Plate.Admin.Domain.User.Dtos.UserDataOutput.NickName">
+        <member name="P:ZhonTai.Plate.Admin.Domain.User.Dto.UserDataOutput.NickName">
             <summary>
             昵称
             </summary>
         </member>
-        <member name="P:ZhonTai.Plate.Admin.Domain.User.Dtos.UserDataOutput.Avatar">
+        <member name="P:ZhonTai.Plate.Admin.Domain.User.Dto.UserDataOutput.Avatar">
             <summary>
             头像
             </summary>
         </member>
-        <member name="P:ZhonTai.Plate.Admin.Domain.User.Dtos.UserDataOutput.Status">
+        <member name="P:ZhonTai.Plate.Admin.Domain.User.Dto.UserDataOutput.Status">
             <summary>
             状态
             </summary>
         </member>
-        <member name="P:ZhonTai.Plate.Admin.Domain.User.Dtos.UserDataOutput.Remark">
+        <member name="P:ZhonTai.Plate.Admin.Domain.User.Dto.UserDataOutput.Remark">
             <summary>
             备注
             </summary>
@@ -1101,46 +1136,51 @@
             备注
             </summary>
         </member>
-        <member name="P:ZhonTai.Plate.Admin.Domain.View.Dtos.ViewDataOutput.TenantId">
+        <member name="P:ZhonTai.Plate.Admin.Domain.View.Dto.ViewDataOutput.TenantId">
             <summary>
             租户Id
             </summary>
         </member>
-        <member name="P:ZhonTai.Plate.Admin.Domain.View.Dtos.ViewDataOutput.Id">
+        <member name="P:ZhonTai.Plate.Admin.Domain.View.Dto.ViewDataOutput.Id">
             <summary>
             视图Id
             </summary>
         </member>
-        <member name="P:ZhonTai.Plate.Admin.Domain.View.Dtos.ViewDataOutput.ParentId">
+        <member name="P:ZhonTai.Plate.Admin.Domain.View.Dto.ViewDataOutput.ParentId">
             <summary>
             视图父级
             </summary>
         </member>
-        <member name="P:ZhonTai.Plate.Admin.Domain.View.Dtos.ViewDataOutput.Name">
+        <member name="P:ZhonTai.Plate.Admin.Domain.View.Dto.ViewDataOutput.Name">
             <summary>
             视图命名
             </summary>
         </member>
-        <member name="P:ZhonTai.Plate.Admin.Domain.View.Dtos.ViewDataOutput.Label">
+        <member name="P:ZhonTai.Plate.Admin.Domain.View.Dto.ViewDataOutput.Label">
             <summary>
             视图名称
             </summary>
         </member>
-        <member name="P:ZhonTai.Plate.Admin.Domain.View.Dtos.ViewDataOutput.Path">
+        <member name="P:ZhonTai.Plate.Admin.Domain.View.Dto.ViewDataOutput.Path">
             <summary>
             视图路径
             </summary>
         </member>
-        <member name="P:ZhonTai.Plate.Admin.Domain.View.Dtos.ViewDataOutput.Enabled">
+        <member name="P:ZhonTai.Plate.Admin.Domain.View.Dto.ViewDataOutput.Enabled">
             <summary>
             启用
             </summary>
         </member>
-        <member name="P:ZhonTai.Plate.Admin.Domain.View.Dtos.ViewDataOutput.Description">
+        <member name="P:ZhonTai.Plate.Admin.Domain.View.Dto.ViewDataOutput.Description">
             <summary>
             说明
             </summary>
         </member>
+        <member name="P:ZhonTai.Plate.Admin.Domain.View.Dto.ViewGetPageDto.Label">
+            <summary>
+            视图名称
+            </summary>
+        </member>
         <member name="T:ZhonTai.Plate.Admin.Domain.View.ViewEntity">
             <summary>
             视图管理

+ 4 - 4
src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.HttpApi/Controllers/ApiController.cs

@@ -2,8 +2,8 @@
 using System.Threading.Tasks;
 using ZhonTai.Common.Domain.Dto;
 using ZhonTai.Plate.Admin.Service.Api;
-using ZhonTai.Plate.Admin.Domain.Api;
 using ZhonTai.Plate.Admin.Service.Api.Input;
+using ZhonTai.Plate.Admin.Domain.Api.Dto;
 
 namespace ZhonTai.Plate.Admin.HttpApi
 {
@@ -44,12 +44,12 @@ namespace ZhonTai.Plate.Admin.HttpApi
         /// <summary>
         /// 查询分页接口
         /// </summary>
-        /// <param name="model">分页模型</param>
+        /// <param name="input">分页模型</param>
         /// <returns></returns>
         [HttpPost]
-        public async Task<IResultOutput> GetPage(PageInput<ApiEntity> model)
+        public async Task<IResultOutput> GetPage(PageInput<ApiGetPageDto> input)
         {
-            return await _apiService.GetPageAsync(model);
+            return await _apiService.GetPageAsync(input);
         }
 
         /// <summary>

+ 4 - 4
src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.HttpApi/Controllers/DictionaryController.cs

@@ -1,7 +1,7 @@
 using Microsoft.AspNetCore.Mvc;
 using System.Threading.Tasks;
 using ZhonTai.Common.Domain.Dto;
-using ZhonTai.Plate.Admin.Domain.Dictionary;
+using ZhonTai.Plate.Admin.Domain.Dictionary.Dto;
 using ZhonTai.Plate.Admin.Service.Dictionary;
 using ZhonTai.Plate.Admin.Service.Dictionary.Input;
 
@@ -33,12 +33,12 @@ namespace ZhonTai.Plate.Admin.HttpApi
         /// <summary>
         /// 查询分页数据字典
         /// </summary>
-        /// <param name="model"></param>
+        /// <param name="input"></param>
         /// <returns></returns>
         [HttpPost]
-        public async Task<IResultOutput> GetPage(PageInput<DictionaryEntity> model)
+        public async Task<IResultOutput> GetPage(PageInput<DictionaryGetPageDto> input)
         {
-            return await _dictionaryService.GetPageAsync(model);
+            return await _dictionaryService.GetPageAsync(input);
         }
 
         /// <summary>

+ 4 - 4
src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.HttpApi/Controllers/DictionaryTypeController.cs

@@ -3,7 +3,7 @@ using System.Threading.Tasks;
 using ZhonTai.Common.Domain.Dto;
 using ZhonTai.Plate.Admin.Service.DictionaryType;
 using ZhonTai.Plate.Admin.Service.DictionaryType.Input;
-using ZhonTai.Plate.Admin.Domain.DictionaryType;
+using ZhonTai.Plate.Admin.Domain.DictionaryType.Dto;
 
 namespace ZhonTai.Plate.Admin.HttpApi
 {
@@ -33,12 +33,12 @@ namespace ZhonTai.Plate.Admin.HttpApi
         /// <summary>
         /// 查询分页数据字典类型
         /// </summary>
-        /// <param name="model"></param>
+        /// <param name="input"></param>
         /// <returns></returns>
         [HttpPost]
-        public async Task<IResultOutput> GetPage(PageInput<DictionaryTypeEntity> model)
+        public async Task<IResultOutput> GetPage(PageInput<DictionaryTypeGetPageDto> input)
         {
-            return await _DictionaryTypeService.GetPageAsync(model);
+            return await _DictionaryTypeService.GetPageAsync(input);
         }
 
         /// <summary>

+ 4 - 4
src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.HttpApi/Controllers/LoginLogController.cs

@@ -1,7 +1,7 @@
 using Microsoft.AspNetCore.Mvc;
 using System.Threading.Tasks;
 using ZhonTai.Common.Domain.Dto;
-using ZhonTai.Plate.Admin.Domain.LoginLog;
+using ZhonTai.Plate.Admin.Domain;
 using ZhonTai.Plate.Admin.Service.LoginLog;
 
 namespace ZhonTai.Plate.Admin.HttpApi
@@ -21,12 +21,12 @@ namespace ZhonTai.Plate.Admin.HttpApi
         /// <summary>
         /// 查询分页登录日志
         /// </summary>
-        /// <param name="model"></param>
+        /// <param name="input"></param>
         /// <returns></returns>
         [HttpPost]
-        public async Task<IResultOutput> GetPage(PageInput<LoginLogEntity> model)
+        public async Task<IResultOutput> GetPage(PageInput<LogGetPageDto> input)
         {
-            return await _loginLogService.GetPageAsync(model);
+            return await _loginLogService.GetPageAsync(input);
         }
     }
 }

+ 4 - 4
src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.HttpApi/Controllers/OprationLogController.cs

@@ -1,7 +1,7 @@
 using Microsoft.AspNetCore.Mvc;
 using System.Threading.Tasks;
 using ZhonTai.Common.Domain.Dto;
-using ZhonTai.Plate.Admin.Domain.OprationLog;
+using ZhonTai.Plate.Admin.Domain;
 using ZhonTai.Plate.Admin.Service.OprationLog;
 
 namespace ZhonTai.Plate.Admin.HttpApi
@@ -21,12 +21,12 @@ namespace ZhonTai.Plate.Admin.HttpApi
         /// <summary>
         /// 查询分页操作日志
         /// </summary>
-        /// <param name="model"></param>
+        /// <param name="input"></param>
         /// <returns></returns>
         [HttpPost]
-        public async Task<IResultOutput> GetPage(PageInput<OprationLogEntity> model)
+        public async Task<IResultOutput> GetPage(PageInput<LogGetPageDto> input)
         {
-            return await _oprationLogService.GetPageAsync(model);
+            return await _oprationLogService.GetPageAsync(input);
         }
     }
 }

+ 4 - 4
src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.HttpApi/Controllers/RoleController.cs

@@ -1,7 +1,7 @@
 using Microsoft.AspNetCore.Mvc;
 using System.Threading.Tasks;
 using ZhonTai.Common.Domain.Dto;
-using ZhonTai.Plate.Admin.Domain.Role;
+using ZhonTai.Plate.Admin.Domain.Role.Dto;
 using ZhonTai.Plate.Admin.Service.Role;
 using ZhonTai.Plate.Admin.Service.Role.Input;
 
@@ -33,12 +33,12 @@ namespace ZhonTai.Plate.Admin.HttpApi
         /// <summary>
         /// 查询分页角色
         /// </summary>
-        /// <param name="model"></param>
+        /// <param name="input"></param>
         /// <returns></returns>
         [HttpPost]
-        public async Task<IResultOutput> GetPage(PageInput<RoleEntity> model)
+        public async Task<IResultOutput> GetPage(PageInput<RoleGetPageDto> input)
         {
-            return await _roleService.GetPageAsync(model);
+            return await _roleService.GetPageAsync(input);
         }
 
         /// <summary>

+ 4 - 3
src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.HttpApi/Controllers/TenantController.cs

@@ -2,6 +2,7 @@
 using System.Threading.Tasks;
 using ZhonTai.Common.Domain.Dto;
 using ZhonTai.Plate.Admin.Domain.Tenant;
+using ZhonTai.Plate.Admin.Domain.Tenant.Dto;
 using ZhonTai.Plate.Admin.Service.Tenant;
 using ZhonTai.Plate.Admin.Service.Tenant.Input;
 
@@ -33,12 +34,12 @@ namespace ZhonTai.Plate.Admin.HttpApi
         /// <summary>
         /// 查询分页租户
         /// </summary>
-        /// <param name="model"></param>
+        /// <param name="input"></param>
         /// <returns></returns>
         [HttpPost]
-        public async Task<IResultOutput> GetPage(PageInput<TenantEntity> model)
+        public async Task<IResultOutput> GetPage(PageInput<TenantGetPageDto> input)
         {
-            return await _tenantServices.GetPageAsync(model);
+            return await _tenantServices.GetPageAsync(input);
         }
 
         /// <summary>

+ 1 - 2
src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.HttpApi/Controllers/UserController.cs

@@ -71,11 +71,10 @@ namespace ZhonTai.Plate.Admin.HttpApi
         /// <summary>
         /// 查询分页用户
         /// </summary>
-        /// <param name="input"></param>
         /// <returns></returns>
         [HttpPost]
         //[ResponseCache(Duration = 60)]
-        public async Task<IResultOutput> GetPage(PageInput<UserEntity> input)
+        public async Task<IResultOutput> GetPage(PageInput input)
         {
             return await _userService.GetPageAsync(input);
         }

+ 4 - 4
src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.HttpApi/Controllers/ViewController.cs

@@ -1,7 +1,7 @@
 using Microsoft.AspNetCore.Mvc;
 using System.Threading.Tasks;
 using ZhonTai.Common.Domain.Dto;
-using ZhonTai.Plate.Admin.Domain.View;
+using ZhonTai.Plate.Admin.Domain.View.Dto;
 using ZhonTai.Plate.Admin.Service.View;
 using ZhonTai.Plate.Admin.Service.View.Input;
 
@@ -44,12 +44,12 @@ namespace ZhonTai.Plate.Admin.HttpApi
         /// <summary>
         /// 查询分页视图
         /// </summary>
-        /// <param name="model">分页模型</param>
+        /// <param name="input">分页模型</param>
         /// <returns></returns>
         [HttpPost]
-        public async Task<IResultOutput> GetPage(PageInput<ViewEntity> model)
+        public async Task<IResultOutput> GetPage(PageInput<ViewGetPageDto> input)
         {
-            return await _viewService.GetPageAsync(model);
+            return await _viewService.GetPageAsync(input);
         }
 
         /// <summary>

+ 17 - 18
src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.HttpApi/ZhonTai.Plate.Admin.HttpApi.xml

@@ -23,11 +23,11 @@
             <param name="key"></param>
             <returns></returns>
         </member>
-        <member name="M:ZhonTai.Plate.Admin.HttpApi.ApiController.GetPage(ZhonTai.Common.Domain.Dto.PageInput{ZhonTai.Plate.Admin.Domain.Api.ApiEntity})">
+        <member name="M:ZhonTai.Plate.Admin.HttpApi.ApiController.GetPage(ZhonTai.Common.Domain.Dto.PageInput{ZhonTai.Plate.Admin.Domain.Api.Dto.ApiGetPageDto})">
             <summary>
             查询分页接口
             </summary>
-            <param name="model">分页模型</param>
+            <param name="input">分页模型</param>
             <returns></returns>
         </member>
         <member name="M:ZhonTai.Plate.Admin.HttpApi.ApiController.Add(ZhonTai.Plate.Admin.Service.Api.Input.ApiAddInput)">
@@ -154,11 +154,11 @@
             <param name="id"></param>
             <returns></returns>
         </member>
-        <member name="M:ZhonTai.Plate.Admin.HttpApi.DictionaryController.GetPage(ZhonTai.Common.Domain.Dto.PageInput{ZhonTai.Plate.Admin.Domain.Dictionary.DictionaryEntity})">
+        <member name="M:ZhonTai.Plate.Admin.HttpApi.DictionaryController.GetPage(ZhonTai.Common.Domain.Dto.PageInput{ZhonTai.Plate.Admin.Domain.Dictionary.Dto.DictionaryGetPageDto})">
             <summary>
             查询分页数据字典
             </summary>
-            <param name="model"></param>
+            <param name="input"></param>
             <returns></returns>
         </member>
         <member name="M:ZhonTai.Plate.Admin.HttpApi.DictionaryController.Add(ZhonTai.Plate.Admin.Service.Dictionary.Input.DictionaryAddInput)">
@@ -201,11 +201,11 @@
             <param name="id"></param>
             <returns></returns>
         </member>
-        <member name="M:ZhonTai.Plate.Admin.HttpApi.DictionaryTypeController.GetPage(ZhonTai.Common.Domain.Dto.PageInput{ZhonTai.Plate.Admin.Domain.DictionaryType.DictionaryTypeEntity})">
+        <member name="M:ZhonTai.Plate.Admin.HttpApi.DictionaryTypeController.GetPage(ZhonTai.Common.Domain.Dto.PageInput{ZhonTai.Plate.Admin.Domain.DictionaryType.Dto.DictionaryTypeGetPageDto})">
             <summary>
             查询分页数据字典类型
             </summary>
-            <param name="model"></param>
+            <param name="input"></param>
             <returns></returns>
         </member>
         <member name="M:ZhonTai.Plate.Admin.HttpApi.DictionaryTypeController.Add(ZhonTai.Plate.Admin.Service.DictionaryType.Input.DictionaryTypeAddInput)">
@@ -346,11 +346,11 @@
             登录日志管理
             </summary>
         </member>
-        <member name="M:ZhonTai.Plate.Admin.HttpApi.LoginLogController.GetPage(ZhonTai.Common.Domain.Dto.PageInput{ZhonTai.Plate.Admin.Domain.LoginLog.LoginLogEntity})">
+        <member name="M:ZhonTai.Plate.Admin.HttpApi.LoginLogController.GetPage(ZhonTai.Common.Domain.Dto.PageInput{ZhonTai.Plate.Admin.Domain.LogGetPageDto})">
             <summary>
             查询分页登录日志
             </summary>
-            <param name="model"></param>
+            <param name="input"></param>
             <returns></returns>
         </member>
         <member name="T:ZhonTai.Plate.Admin.HttpApi.OprationLogController">
@@ -358,11 +358,11 @@
             操作日志管理
             </summary>
         </member>
-        <member name="M:ZhonTai.Plate.Admin.HttpApi.OprationLogController.GetPage(ZhonTai.Common.Domain.Dto.PageInput{ZhonTai.Plate.Admin.Domain.OprationLog.OprationLogEntity})">
+        <member name="M:ZhonTai.Plate.Admin.HttpApi.OprationLogController.GetPage(ZhonTai.Common.Domain.Dto.PageInput{ZhonTai.Plate.Admin.Domain.LogGetPageDto})">
             <summary>
             查询分页操作日志
             </summary>
-            <param name="model"></param>
+            <param name="input"></param>
             <returns></returns>
         </member>
         <member name="T:ZhonTai.Plate.Admin.HttpApi.PermissionController">
@@ -523,11 +523,11 @@
             <param name="id"></param>
             <returns></returns>
         </member>
-        <member name="M:ZhonTai.Plate.Admin.HttpApi.RoleController.GetPage(ZhonTai.Common.Domain.Dto.PageInput{ZhonTai.Plate.Admin.Domain.Role.RoleEntity})">
+        <member name="M:ZhonTai.Plate.Admin.HttpApi.RoleController.GetPage(ZhonTai.Common.Domain.Dto.PageInput{ZhonTai.Plate.Admin.Domain.Role.Dto.RoleGetPageDto})">
             <summary>
             查询分页角色
             </summary>
-            <param name="model"></param>
+            <param name="input"></param>
             <returns></returns>
         </member>
         <member name="M:ZhonTai.Plate.Admin.HttpApi.RoleController.Add(ZhonTai.Plate.Admin.Service.Role.Input.RoleAddInput)">
@@ -570,11 +570,11 @@
             <param name="id"></param>
             <returns></returns>
         </member>
-        <member name="M:ZhonTai.Plate.Admin.HttpApi.TenantController.GetPage(ZhonTai.Common.Domain.Dto.PageInput{ZhonTai.Plate.Admin.Domain.Tenant.TenantEntity})">
+        <member name="M:ZhonTai.Plate.Admin.HttpApi.TenantController.GetPage(ZhonTai.Common.Domain.Dto.PageInput{ZhonTai.Plate.Admin.Domain.Tenant.Dto.TenantGetPageDto})">
             <summary>
             查询分页租户
             </summary>
-            <param name="model"></param>
+            <param name="input"></param>
             <returns></returns>
         </member>
         <member name="M:ZhonTai.Plate.Admin.HttpApi.TenantController.Add(ZhonTai.Plate.Admin.Service.Tenant.Input.TenantAddInput)">
@@ -637,11 +637,10 @@
             <param name="id"></param>
             <returns></returns>
         </member>
-        <member name="M:ZhonTai.Plate.Admin.HttpApi.UserController.GetPage(ZhonTai.Common.Domain.Dto.PageInput{ZhonTai.Plate.Admin.Domain.User.UserEntity})">
+        <member name="M:ZhonTai.Plate.Admin.HttpApi.UserController.GetPage(ZhonTai.Common.Domain.Dto.PageInput)">
             <summary>
             查询分页用户
             </summary>
-            <param name="input"></param>
             <returns></returns>
         </member>
         <member name="M:ZhonTai.Plate.Admin.HttpApi.UserController.Add(ZhonTai.Plate.Admin.Service.User.Input.UserAddInput)">
@@ -712,11 +711,11 @@
             <param name="key"></param>
             <returns></returns>
         </member>
-        <member name="M:ZhonTai.Plate.Admin.HttpApi.ViewController.GetPage(ZhonTai.Common.Domain.Dto.PageInput{ZhonTai.Plate.Admin.Domain.View.ViewEntity})">
+        <member name="M:ZhonTai.Plate.Admin.HttpApi.ViewController.GetPage(ZhonTai.Common.Domain.Dto.PageInput{ZhonTai.Plate.Admin.Domain.View.Dto.ViewGetPageDto})">
             <summary>
             查询分页视图
             </summary>
-            <param name="model">分页模型</param>
+            <param name="input">分页模型</param>
             <returns></returns>
         </member>
         <member name="M:ZhonTai.Plate.Admin.HttpApi.ViewController.Add(ZhonTai.Plate.Admin.Service.View.Input.ViewAddInput)">

+ 3 - 3
src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.Service.Contracts/Api/IApiService.cs

@@ -1,7 +1,7 @@
 using ZhonTai.Common.Domain.Dto;
 using System.Threading.Tasks;
-using ZhonTai.Plate.Admin.Domain.Api;
 using ZhonTai.Plate.Admin.Service.Api.Input;
+using ZhonTai.Plate.Admin.Domain.Api.Dto;
 
 namespace ZhonTai.Plate.Admin.Service.Api
 {
@@ -27,9 +27,9 @@ namespace ZhonTai.Plate.Admin.Service.Api
         /// <summary>
         /// »ñµÃ·ÖÒ³
         /// </summary>
-        /// <param name="model"></param>
+        /// <param name="input"></param>
         /// <returns></returns>
-        Task<IResultOutput> GetPageAsync(PageInput<ApiEntity> model);
+        Task<IResultOutput> GetPageAsync(PageInput<ApiGetPageDto> input);
 
         /// <summary>
         /// Ìí¼Ó

+ 2 - 2
src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.Service.Contracts/Dictionary/IDictionaryService.cs

@@ -1,7 +1,7 @@
 using ZhonTai.Common.Domain.Dto;
 using System.Threading.Tasks;
-using ZhonTai.Plate.Admin.Domain.Dictionary;
 using ZhonTai.Plate.Admin.Service.Dictionary.Input;
+using ZhonTai.Plate.Admin.Domain.Dictionary.Dto;
 
 namespace ZhonTai.Plate.Admin.Service.Dictionary
 {
@@ -9,7 +9,7 @@ namespace ZhonTai.Plate.Admin.Service.Dictionary
     {
         Task<IResultOutput> GetAsync(long id);
 
-        Task<IResultOutput> GetPageAsync(PageInput<DictionaryEntity> model);
+        Task<IResultOutput> GetPageAsync(PageInput<DictionaryGetPageDto> input);
 
         Task<IResultOutput> AddAsync(DictionaryAddInput input);
 

+ 2 - 2
src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.Service.Contracts/DictionaryType/IDictionaryTypeService.cs

@@ -1,7 +1,7 @@
 using ZhonTai.Common.Domain.Dto;
 using System.Threading.Tasks;
-using ZhonTai.Plate.Admin.Domain.DictionaryType;
 using ZhonTai.Plate.Admin.Service.DictionaryType.Input;
+using ZhonTai.Plate.Admin.Domain.DictionaryType.Dto;
 
 namespace ZhonTai.Plate.Admin.Service.DictionaryType
 {
@@ -9,7 +9,7 @@ namespace ZhonTai.Plate.Admin.Service.DictionaryType
     {
         Task<IResultOutput> GetAsync(long id);
 
-        Task<IResultOutput> GetPageAsync(PageInput<DictionaryTypeEntity> model);
+        Task<IResultOutput> GetPageAsync(PageInput<DictionaryTypeGetPageDto> input);
 
         Task<IResultOutput> AddAsync(DictionaryTypeAddInput input);
 

+ 2 - 2
src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.Service.Contracts/LoginLog/ILoginLogService.cs

@@ -1,13 +1,13 @@
 using ZhonTai.Common.Domain.Dto;
 using System.Threading.Tasks;
-using ZhonTai.Plate.Admin.Domain.LoginLog;
 using ZhonTai.Plate.Admin.Service.LoginLog.Input;
+using ZhonTai.Plate.Admin.Domain;
 
 namespace ZhonTai.Plate.Admin.Service.LoginLog
 {
     public interface ILoginLogService
     {
-        Task<IResultOutput> GetPageAsync(PageInput<LoginLogEntity> input);
+        Task<IResultOutput> GetPageAsync(PageInput<LogGetPageDto> input);
 
         Task<IResultOutput<long>> AddAsync(LoginLogAddInput input);
     }

+ 2 - 2
src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.Service.Contracts/OprationLog/IOprationLogService.cs

@@ -1,13 +1,13 @@
 using System.Threading.Tasks;
 using ZhonTai.Common.Domain.Dto;
 using ZhonTai.Plate.Admin.Service.OprationLog.Input;
-using ZhonTai.Plate.Admin.Domain.OprationLog;
+using ZhonTai.Plate.Admin.Domain;
 
 namespace ZhonTai.Plate.Admin.Service.OprationLog
 {
     public interface IOprationLogService
     {
-        Task<IResultOutput> GetPageAsync(PageInput<OprationLogEntity> input);
+        Task<IResultOutput> GetPageAsync(PageInput<LogGetPageDto> input);
 
         Task<IResultOutput> AddAsync(OprationLogAddInput input);
     }

+ 2 - 2
src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.Service.Contracts/Role/IRoleService.cs

@@ -1,6 +1,6 @@
 using System.Threading.Tasks;
 using ZhonTai.Common.Domain.Dto;
-using ZhonTai.Plate.Admin.Domain.Role;
+using ZhonTai.Plate.Admin.Domain.Role.Dto;
 using ZhonTai.Plate.Admin.Service.Role.Input;
 
 namespace ZhonTai.Plate.Admin.Service.Role
@@ -9,7 +9,7 @@ namespace ZhonTai.Plate.Admin.Service.Role
     {
         Task<IResultOutput> GetAsync(long id);
 
-        Task<IResultOutput> GetPageAsync(PageInput<RoleEntity> input);
+        Task<IResultOutput> GetPageAsync(PageInput<RoleGetPageDto> input);
 
         Task<IResultOutput> AddAsync(RoleAddInput input);
 

+ 2 - 2
src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.Service.Contracts/Tenant/ITenantService.cs

@@ -1,6 +1,6 @@
 using System.Threading.Tasks;
 using ZhonTai.Common.Domain.Dto;
-using ZhonTai.Plate.Admin.Domain.Tenant;
+using ZhonTai.Plate.Admin.Domain.Tenant.Dto;
 using ZhonTai.Plate.Admin.Service.Tenant.Input;
 
 namespace ZhonTai.Plate.Admin.Service.Tenant
@@ -9,7 +9,7 @@ namespace ZhonTai.Plate.Admin.Service.Tenant
     {
         Task<IResultOutput> GetAsync(long id);
 
-        Task<IResultOutput> GetPageAsync(PageInput<TenantEntity> input);
+        Task<IResultOutput> GetPageAsync(PageInput<TenantGetPageDto> input);
 
         Task<IResultOutput> AddAsync(TenantAddInput input);
 

+ 1 - 2
src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.Service.Contracts/User/IUserService.cs

@@ -1,7 +1,6 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using ZhonTai.Common.Domain.Dto;
-using ZhonTai.Plate.Admin.Domain.User;
 using ZhonTai.Plate.Admin.Service.Auth.Output;
 using ZhonTai.Plate.Admin.Service.User.Input;
 using ZhonTai.Plate.Admin.Service.User.Output;
@@ -19,7 +18,7 @@ namespace ZhonTai.Plate.Admin.Service.User
 
         Task<IResultOutput> GetSelectAsync();
 
-        Task<IResultOutput> GetPageAsync(PageInput<UserEntity> input);
+        Task<IResultOutput> GetPageAsync(PageInput input);
 
         Task<IResultOutput> AddAsync(UserAddInput input);
 

+ 2 - 2
src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.Service.Contracts/View/IViewService.cs

@@ -1,6 +1,6 @@
 using System.Threading.Tasks;
 using ZhonTai.Common.Domain.Dto;
-using ZhonTai.Plate.Admin.Domain.View;
+using ZhonTai.Plate.Admin.Domain.View.Dto;
 using ZhonTai.Plate.Admin.Service.View.Input;
 
 
@@ -20,7 +20,7 @@ namespace ZhonTai.Plate.Admin.Service.View
 
         Task<IResultOutput> GetListAsync(string key);
 
-        Task<IResultOutput> GetPageAsync(PageInput<ViewEntity> model);
+        Task<IResultOutput> GetPageAsync(PageInput<ViewGetPageDto> model);
 
         Task<IResultOutput> AddAsync(ViewAddInput input);
 

+ 2 - 2
src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.Service.Contracts/ZhonTai.Plate.Admin.Service.Contracts.xml

@@ -23,11 +23,11 @@
             <param name="key"></param>
             <returns></returns>
         </member>
-        <member name="M:ZhonTai.Plate.Admin.Service.Api.IApiService.GetPageAsync(ZhonTai.Common.Domain.Dto.PageInput{ZhonTai.Plate.Admin.Domain.Api.ApiEntity})">
+        <member name="M:ZhonTai.Plate.Admin.Service.Api.IApiService.GetPageAsync(ZhonTai.Common.Domain.Dto.PageInput{ZhonTai.Plate.Admin.Domain.Api.Dto.ApiGetPageDto})">
             <summary>
             获得分页
             </summary>
-            <param name="model"></param>
+            <param name="input"></param>
             <returns></returns>
         </member>
         <member name="M:ZhonTai.Plate.Admin.Service.Api.IApiService.AddAsync(ZhonTai.Plate.Admin.Service.Api.Input.ApiAddInput)">

+ 2 - 1
src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.Service/Api/ApiService.cs

@@ -6,6 +6,7 @@ using ZhonTai.Common.Domain.Dto;
 using ZhonTai.Plate.Admin.Domain.Api;
 using ZhonTai.Plate.Admin.Service.Api.Output;
 using ZhonTai.Plate.Admin.Service.Api.Input;
+using ZhonTai.Plate.Admin.Domain.Api.Dto;
 
 namespace ZhonTai.Plate.Admin.Service.Api
 {
@@ -33,7 +34,7 @@ namespace ZhonTai.Plate.Admin.Service.Api
             return ResultOutput.Ok(data);
         }
 
-        public async Task<IResultOutput> GetPageAsync(PageInput<ApiEntity> input)
+        public async Task<IResultOutput> GetPageAsync(PageInput<ApiGetPageDto> input)
         {
             var key = input.Filter?.Label;
 

+ 2 - 1
src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.Service/Dictionary/DictionaryService.cs

@@ -3,6 +3,7 @@ using ZhonTai.Common.Domain.Dto;
 using ZhonTai.Plate.Admin.Domain.Dictionary;
 using ZhonTai.Plate.Admin.Service.Dictionary.Output;
 using ZhonTai.Plate.Admin.Service.Dictionary.Input;
+using ZhonTai.Plate.Admin.Domain.Dictionary.Dto;
 
 namespace ZhonTai.Plate.Admin.Service.Dictionary
 {
@@ -21,7 +22,7 @@ namespace ZhonTai.Plate.Admin.Service.Dictionary
             return ResultOutput.Ok(result);
         }
 
-        public async Task<IResultOutput> GetPageAsync(PageInput<DictionaryEntity> input)
+        public async Task<IResultOutput> GetPageAsync(PageInput<DictionaryGetPageDto> input)
         {
             var key = input.Filter?.Name;
             var dictionaryTypeId = input.Filter?.DictionaryTypeId;

+ 2 - 1
src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.Service/DictionaryType/DictionaryTypeService.cs

@@ -6,6 +6,7 @@ using ZhonTai.Plate.Admin.Service.DictionaryType.Input;
 using ZhonTai.Plate.Admin.Service.DictionaryType.Output;
 using ZhonTai.Plate.Admin.Domain.DictionaryType;
 using ZhonTai.Plate.Admin.Domain.Dictionary;
+using ZhonTai.Plate.Admin.Domain.DictionaryType.Dto;
 
 namespace ZhonTai.Plate.Admin.Service.DictionaryType
 {
@@ -25,7 +26,7 @@ namespace ZhonTai.Plate.Admin.Service.DictionaryType
             return ResultOutput.Ok(result);
         }
 
-        public async Task<IResultOutput> GetPageAsync(PageInput<DictionaryTypeEntity> input)
+        public async Task<IResultOutput> GetPageAsync(PageInput<DictionaryTypeGetPageDto> input)
         {
             var key = input.Filter?.Name;
 

+ 2 - 1
src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.Service/LoginLog/LoginLogService.cs

@@ -5,6 +5,7 @@ using ZhonTai.Common.Domain.Dto;
 using ZhonTai.Plate.Admin.Domain.LoginLog;
 using ZhonTai.Plate.Admin.Service.LoginLog.Output;
 using ZhonTai.Plate.Admin.Service.LoginLog.Input;
+using ZhonTai.Plate.Admin.Domain;
 
 namespace ZhonTai.Plate.Admin.Service.LoginLog
 {
@@ -22,7 +23,7 @@ namespace ZhonTai.Plate.Admin.Service.LoginLog
             _loginLogRepository = loginLogRepository;
         }
 
-        public async Task<IResultOutput> GetPageAsync(PageInput<LoginLogEntity> input)
+        public async Task<IResultOutput> GetPageAsync(PageInput<LogGetPageDto> input)
         {
             var userName = input.Filter?.CreatedUserName;
 

+ 2 - 1
src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.Service/OprationLog/OprationLogService.cs

@@ -5,6 +5,7 @@ using ZhonTai.Common.Domain.Dto;
 using ZhonTai.Plate.Admin.Service.OprationLog.Input;
 using ZhonTai.Plate.Admin.Service.OprationLog.Output;
 using ZhonTai.Plate.Admin.Domain.OprationLog;
+using ZhonTai.Plate.Admin.Domain;
 
 namespace ZhonTai.Plate.Admin.Service.OprationLog
 {
@@ -22,7 +23,7 @@ namespace ZhonTai.Plate.Admin.Service.OprationLog
             _oprationLogRepository = oprationLogRepository;
         }
 
-        public async Task<IResultOutput> GetPageAsync(PageInput<OprationLogEntity> input)
+        public async Task<IResultOutput> GetPageAsync(PageInput<LogGetPageDto> input)
         {
             var userName = input.Filter?.CreatedUserName;
 

+ 2 - 1
src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.Service/Role/RoleService.cs

@@ -6,6 +6,7 @@ using ZhonTai.Plate.Admin.Domain.Role;
 using ZhonTai.Plate.Admin.Domain.RolePermission;
 using ZhonTai.Plate.Admin.Service.Role.Input;
 using ZhonTai.Plate.Admin.Service.Role.Output;
+using ZhonTai.Plate.Admin.Domain.Role.Dto;
 
 namespace ZhonTai.Plate.Admin.Service.Role
 {
@@ -29,7 +30,7 @@ namespace ZhonTai.Plate.Admin.Service.Role
             return ResultOutput.Ok(result);
         }
 
-        public async Task<IResultOutput> GetPageAsync(PageInput<RoleEntity> input)
+        public async Task<IResultOutput> GetPageAsync(PageInput<RoleGetPageDto> input)
         {
             var key = input.Filter?.Name;
 

+ 2 - 1
src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.Service/Tenant/TenantService.cs

@@ -11,6 +11,7 @@ using ZhonTai.Plate.Admin.Domain.User;
 using ZhonTai.Plate.Admin.Domain.UserRole;
 using ZhonTai.Plate.Admin.Service.Tenant.Input;
 using ZhonTai.Plate.Admin.Service.Tenant.Output;
+using ZhonTai.Plate.Admin.Domain.Tenant.Dto;
 
 namespace ZhonTai.Plate.Admin.Service.Tenant
 {
@@ -43,7 +44,7 @@ namespace ZhonTai.Plate.Admin.Service.Tenant
             return ResultOutput.Ok(result);
         }
 
-        public async Task<IResultOutput> GetPageAsync(PageInput<TenantEntity> input)
+        public async Task<IResultOutput> GetPageAsync(PageInput<TenantGetPageDto> input)
         {
             var key = input.Filter?.Name;
 

+ 1 - 1
src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.Service/User/UserService.cs

@@ -109,7 +109,7 @@ namespace ZhonTai.Plate.Admin.Service.User
             return result;
         }
 
-        public async Task<IResultOutput> GetPageAsync(PageInput<UserEntity> input)
+        public async Task<IResultOutput> GetPageAsync(PageInput input)
         {
             var list = await _userRepository.Select
             .WhereDynamicFilter(input.DynamicFilter)

+ 2 - 1
src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.Service/View/ViewService.cs

@@ -4,6 +4,7 @@ using System.Threading.Tasks;
 using ZhonTai.Common.Attributes;
 using ZhonTai.Common.Domain.Dto;
 using ZhonTai.Plate.Admin.Domain.View;
+using ZhonTai.Plate.Admin.Domain.View.Dto;
 using ZhonTai.Plate.Admin.Service.View.Input;
 using ZhonTai.Plate.Admin.Service.View.Output;
 
@@ -35,7 +36,7 @@ namespace ZhonTai.Plate.Admin.Service.View
             return ResultOutput.Ok(data);
         }
 
-        public async Task<IResultOutput> GetPageAsync(PageInput<ViewEntity> input)
+        public async Task<IResultOutput> GetPageAsync(PageInput<ViewGetPageDto> input)
         {
             var key = input.Filter?.Label;
 

+ 10 - 0
src/plates/ZhonTai.Plate.Personal/ZhonTai.Plate.Personnel.Domain/Position/Dto/PositionDataOutput.cs

@@ -0,0 +1,10 @@
+namespace ZhonTai.Plate.Personnel.Domain.Position.Dto
+{
+    public partial class PositionGetPageDto
+    {
+        /// <summary>
+        /// 名称
+        /// </summary>
+        public string Name { get; set; }
+    }
+}

+ 5 - 0
src/plates/ZhonTai.Plate.Personal/ZhonTai.Plate.Personnel.Domain/ZhonTai.Plate.Personnel.Domain.xml

@@ -299,6 +299,11 @@
             排序
             </summary>
         </member>
+        <member name="P:ZhonTai.Plate.Personnel.Domain.Position.Dto.PositionGetPageDto.Name">
+            <summary>
+            名称
+            </summary>
+        </member>
         <member name="T:ZhonTai.Plate.Personnel.Domain.Position.Output.PositionDataOutput">
             <summary>
             岗位导出

+ 1 - 2
src/plates/ZhonTai.Plate.Personal/ZhonTai.Plate.Personnel.HttpApi/Controllers/EmployeeController.cs

@@ -3,7 +3,6 @@ using ZhonTai.Plate.Personnel.Service.Employee;
 using Microsoft.AspNetCore.Mvc;
 using System.Threading.Tasks;
 using ZhonTai.Plate.Personnel.Service.Employee.Input;
-using ZhonTai.Plate.Personnel.Domain.Employee;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 
 namespace ZhonTai.Plate.Personnel.HttpApi.Controllers
@@ -38,7 +37,7 @@ namespace ZhonTai.Plate.Personnel.HttpApi.Controllers
         /// <returns></returns>
         [HttpPost]
         //[ResponseCache(Duration = 60)]
-        public async Task<IResultOutput> GetPage(PageInput<EmployeeEntity> input)
+        public async Task<IResultOutput> GetPage(PageInput input)
         {
             return await _employeeService.GetPageAsync(input);
         }

+ 4 - 4
src/plates/ZhonTai.Plate.Personal/ZhonTai.Plate.Personnel.HttpApi/Controllers/PositionController.cs

@@ -3,7 +3,7 @@ using ZhonTai.Plate.Personnel.Service.Position;
 using ZhonTai.Plate.Personnel.Service.Position.Input;
 using Microsoft.AspNetCore.Mvc;
 using System.Threading.Tasks;
-using ZhonTai.Plate.Personnel.Domain.Position;
+using ZhonTai.Plate.Personnel.Domain.Position.Dto;
 
 namespace ZhonTai.Plate.Personnel.HttpApi.Controllers
 {
@@ -33,12 +33,12 @@ namespace ZhonTai.Plate.Personnel.HttpApi.Controllers
         /// <summary>
         /// 查询分页职位
         /// </summary>
-        /// <param name="model"></param>
+        /// <param name="input"></param>
         /// <returns></returns>
         [HttpPost]
-        public async Task<IResultOutput> GetPage(PageInput<PositionEntity> model)
+        public async Task<IResultOutput> GetPage(PageInput<PositionGetPageDto> input)
         {
-            return await _positionService.GetPageAsync(model);
+            return await _positionService.GetPageAsync(input);
         }
 
         /// <summary>

+ 1 - 0
src/plates/ZhonTai.Plate.Personal/ZhonTai.Plate.Personnel.HttpApi/ZhonTai.Plate.Personnel.HttpApi.csproj

@@ -6,6 +6,7 @@
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <DocumentationFile>F:\zhontai\Admin\src\plates\ZhonTai.Plate.Personal\ZhonTai.Plate.Personnel.HttpApi\ZhonTai.Plate.Personnel.HttpApi.xml</DocumentationFile>
+    <NoWarn>1701;1702;1591</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>

+ 3 - 3
src/plates/ZhonTai.Plate.Personal/ZhonTai.Plate.Personnel.HttpApi/ZhonTai.Plate.Personnel.HttpApi.xml

@@ -21,7 +21,7 @@
             <param name="id"></param>
             <returns></returns>
         </member>
-        <member name="M:ZhonTai.Plate.Personnel.HttpApi.Controllers.EmployeeController.GetPage(ZhonTai.Common.Domain.Dto.PageInput{ZhonTai.Plate.Personnel.Domain.Employee.EmployeeEntity})">
+        <member name="M:ZhonTai.Plate.Personnel.HttpApi.Controllers.EmployeeController.GetPage(ZhonTai.Common.Domain.Dto.PageInput)">
             <summary>
             查询分页员工
             </summary>
@@ -108,11 +108,11 @@
             <param name="id"></param>
             <returns></returns>
         </member>
-        <member name="M:ZhonTai.Plate.Personnel.HttpApi.Controllers.PositionController.GetPage(ZhonTai.Common.Domain.Dto.PageInput{ZhonTai.Plate.Personnel.Domain.Position.PositionEntity})">
+        <member name="M:ZhonTai.Plate.Personnel.HttpApi.Controllers.PositionController.GetPage(ZhonTai.Common.Domain.Dto.PageInput{ZhonTai.Plate.Personnel.Domain.Position.Dto.PositionGetPageDto})">
             <summary>
             查询分页职位
             </summary>
-            <param name="model"></param>
+            <param name="input"></param>
             <returns></returns>
         </member>
         <member name="M:ZhonTai.Plate.Personnel.HttpApi.Controllers.PositionController.Add(ZhonTai.Plate.Personnel.Service.Position.Input.PositionAddInput)">

+ 1 - 1
src/plates/ZhonTai.Plate.Personal/ZhonTai.Plate.Personnel.Service.Contracts/Employee/IEmployeeService.cs

@@ -13,7 +13,7 @@ namespace ZhonTai.Plate.Personnel.Service.Employee
     {
         Task<ResultOutput<EmployeeGetOutput>> GetAsync(long id);
 
-        Task<IResultOutput> GetPageAsync(PageInput<EmployeeEntity> input);
+        Task<IResultOutput> GetPageAsync(PageInput input);
 
         Task<IResultOutput> AddAsync(EmployeeAddInput input);
 

+ 2 - 2
src/plates/ZhonTai.Plate.Personal/ZhonTai.Plate.Personnel.Service.Contracts/Position/IPositionService.cs

@@ -1,7 +1,7 @@
 using ZhonTai.Common.Domain.Dto;
 using ZhonTai.Plate.Personnel.Service.Position.Input;
 using System.Threading.Tasks;
-using ZhonTai.Plate.Personnel.Domain.Position;
+using ZhonTai.Plate.Personnel.Domain.Position.Dto;
 
 namespace ZhonTai.Plate.Personnel.Service.Position
 {
@@ -9,7 +9,7 @@ namespace ZhonTai.Plate.Personnel.Service.Position
     {
         Task<IResultOutput> GetAsync(long id);
 
-        Task<IResultOutput> GetPageAsync(PageInput<PositionEntity> input);
+        Task<IResultOutput> GetPageAsync(PageInput<PositionGetPageDto> input);
 
         Task<IResultOutput> AddAsync(PositionAddInput input);
 

+ 1 - 0
src/plates/ZhonTai.Plate.Personal/ZhonTai.Plate.Personnel.Service.Contracts/ZhonTai.Plate.Personnel.Service.Contracts.csproj

@@ -7,6 +7,7 @@
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <DocumentationFile>F:\zhontai\Admin\src\plates\ZhonTai.Plate.Personal\ZhonTai.Plate.Personnel.Service.Contracts\ZhonTai.Plate.Personnel.Service.Contracts.xml</DocumentationFile>
+    <NoWarn>1701;1702;1591</NoWarn>
   </PropertyGroup>
 
     <ItemGroup>

+ 1 - 1
src/plates/ZhonTai.Plate.Personal/ZhonTai.Plate.Personnel.Service/Employee/EmployeeService.cs

@@ -45,7 +45,7 @@ namespace ZhonTai.Plate.Personnel.Service.Employee
             return res.Ok(dto);
         }
 
-        public async Task<IResultOutput> GetPageAsync(PageInput<EmployeeEntity> input)
+        public async Task<IResultOutput> GetPageAsync(PageInput input)
         {
             var list = await _employeeRepository.Select
             .WhereDynamicFilter(input.DynamicFilter)

+ 2 - 1
src/plates/ZhonTai.Plate.Personal/ZhonTai.Plate.Personnel.Service/Position/PositionService.cs

@@ -4,6 +4,7 @@ using ZhonTai.Plate.Personnel.Service.Position.Output;
 using System.Threading.Tasks;
 using ZhonTai.Plate.Admin.Service;
 using ZhonTai.Plate.Personnel.Domain.Position;
+using ZhonTai.Plate.Personnel.Domain.Position.Dto;
 
 namespace ZhonTai.Plate.Personnel.Service.Position
 {
@@ -24,7 +25,7 @@ namespace ZhonTai.Plate.Personnel.Service.Position
             return ResultOutput.Ok(result);
         }
 
-        public async Task<IResultOutput> GetPageAsync(PageInput<PositionEntity> input)
+        public async Task<IResultOutput> GetPageAsync(PageInput<PositionGetPageDto> input)
         {
             var key = input.Filter?.Name;
 

+ 12 - 5
src/shared/ZhonTai.Common/Domain/Dto/PageInput.cs

@@ -3,7 +3,7 @@
     /// <summary>
     /// 分页信息输入
     /// </summary>
-    public class PageInput<T>
+    public class PageInput
     {
         /// <summary>
         /// 当前页标
@@ -16,13 +16,20 @@
         public int PageSize { set; get; } = 50;
 
         /// <summary>
-        /// 查询条件
+        /// 高级查询条件
         /// </summary>
-        public T Filter { get; set; }
+        public FreeSql.Internal.Model.DynamicFilterInfo DynamicFilter { get; set; } = null;
+    }
 
+    /// <summary>
+    /// 分页信息输入
+    /// </summary>
+    /// <typeparam name="T">过滤数据</typeparam>
+    public class PageInput<T>: PageInput
+    {
         /// <summary>
-        /// 高级查询条件
+        /// 查询条件
         /// </summary>
-        public FreeSql.Internal.Model.DynamicFilterInfo DynamicFilter { get; set; } = null;
+        public T Filter { get; set; }
     }
 }

+ 13 - 7
src/shared/ZhonTai.Common/ZhonTai.Common.xml

@@ -509,29 +509,35 @@
             </summary>
         </member>
-        <member name="T:ZhonTai.Common.Domain.Dto.PageInput`1">
+        <member name="T:ZhonTai.Common.Domain.Dto.PageInput">
             <summary>
             分页信息输入
             </summary>
         </member>
-        <member name="P:ZhonTai.Common.Domain.Dto.PageInput`1.CurrentPage">
+        <member name="P:ZhonTai.Common.Domain.Dto.PageInput.CurrentPage">
             <summary>
             当前页标
             </summary>
         </member>
-        <member name="P:ZhonTai.Common.Domain.Dto.PageInput`1.PageSize">
+        <member name="P:ZhonTai.Common.Domain.Dto.PageInput.PageSize">
             <summary>
             每页大小
             </summary>
         </member>
-        <member name="P:ZhonTai.Common.Domain.Dto.PageInput`1.Filter">
+        <member name="P:ZhonTai.Common.Domain.Dto.PageInput.DynamicFilter">
             <summary>
-            查询条件
+            高级查询条件
             </summary>
         </member>
-        <member name="P:ZhonTai.Common.Domain.Dto.PageInput`1.DynamicFilter">
+        <member name="T:ZhonTai.Common.Domain.Dto.PageInput`1">
             <summary>
-            高级查询条件
+            分页信息输入
+            </summary>
+            <typeparam name="T">过滤数据</typeparam>
+        </member>
+        <member name="P:ZhonTai.Common.Domain.Dto.PageInput`1.Filter">
+            <summary>
+            查询条件
             </summary>
         </member>
         <member name="T:ZhonTai.Common.Domain.Dto.PageOutput`1">