优化项目命名空间

ZR.Model/System/Dto/ArticleDto.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace ZR.Model.System.Dto
+{
+    public class ArticleQueryDto: PagerInfo
+    {
+        public string Status { get; set; }
+        public string Title { get; set; }
+        public DateTime BeginTime { get; set; }
+        public DateTime EndTime { get; set; }
+
+    }
+}

ZR.Model/System/Dto/LoginBodyDto.cs

@@ -0,0 +1,30 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace ZR.Model.System.Dto
+{
+    public class LoginBodyDto
+    {
+        /// <summary>
+        /// 用户名
+        /// </summary>
+        [Required(ErrorMessage = "用户名不能为空")]
+        public string Username { get; set; }
+
+        /// <summary>
+        /// 用户密码
+        /// </summary>
+        [Required(ErrorMessage = "密码不能为空")]
+        public string Password { get; set; }
+
+        /**
+         * 验证码
+         */
+        public string Code { get; set; }
+
+        /**
+         * 唯一标识
+         */
+        public string Uuid { get; set; } = "";
+        public string LoginIP { get; set; }
+    }
+}

ZR.Model/System/Dto/MenuDto.cs

@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace ZR.Model.System.Dto
+{
+    public class MenuDto
+    {
+        //{"parentId":0,"menuName":"aaa","icon":"documentation","menuType":"M","orderNum":999,"visible":0,"status":0,"path":"aaa"}
+        public int parentId { get; set; }
+        public string menuName { get; set; }
+        public string icon { get; set; } = "";
+        public string menuType { get; set; }
+        public int orderNum { get; set; }
+        public int visible { get; set; }
+        public int status { get; set; }
+        public string path { get; set; } = "#";
+        public int MenuId { get; set; }
+        public string component { get; set; }
+        public int isCache { get; set; }
+        public int isFrame { get; set; }
+        public string perms { get; set; } = "";
+    }
+}

ZR.Model/System/Dto/RoleUsersCreateDto.cs

@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Text;
+
+namespace ZR.Model.System.Dto
+{
+    public class RoleUsersCreateDto
+    {
+        /// <summary>
+        /// 描述 : 角色id 
+        /// 空值 : False
+        /// 默认 : 
+        /// </summary>
+        [Display(Name = "角色id")]
+        [Required(ErrorMessage = "roleId 不能为空")]
+        public long RoleId { get; set; }
+
+        /// <summary>
+        /// 描述 : 用户编码 [1,2,3,4] 
+        /// 空值 : False
+        /// 默认 : 
+        /// </summary>
+        [Display(Name = "用户编码 [1,2,3,4]")]
+        public List<long> UserIds { get; set; }
+    }
+}

ZR.Model/System/Dto/SysFileQueryDto.cs

@@ -0,0 +1,10 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace ZR.Model.System.Dto
+{
+    public class SysFileQueryDto : PagerInfo
+    {
+    }
+}

ZR.Model/System/Dto/SysLogininfoDto.cs

@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using ZR.Model.System;
+
+namespace ZR.Model.System.Dto
+{
+    public class SysLogininfoDto : SysBase
+    {
+        public int pageNum { get; set; }
+        /// <summary>
+        /// IP 地址
+        /// </summary>
+        public string Ipaddr { get; set; }
+        /// <summary>
+        /// 登录状态 0成功 1失败
+        /// </summary>
+        public string Status { get; set; }
+        /// <summary>
+        /// 用户名
+        /// </summary>
+        public string UserName { get; set; }
+
+    }
+}

ZR.Model/System/Dto/SysOperLogDto.cs

@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using ZR.Model.System;
+
+namespace ZR.Model.System.Dto
+{
+    public class SysOperLogDto : SysBase
+    {
+        /// <summary>
+        /// 页码
+        /// </summary>
+        public int pageNum { get; set; }
+        /// <summary>
+        /// 操作人员
+        /// </summary>
+        public string operName { get; set; }
+        /// <summary>
+        /// 业务类型 0=其它,1=新增,2=修改,3=删除,4=授权,5=导出,6=导入,7=强退,8=生成代码,9=清空数据
+        /// </summary>
+        public int BusinessType { get; set; } = -1;
+        /// <summary>
+        /// 状态
+        /// </summary>
+        public int Status { get; set; } = -1;
+        /// <summary>
+        /// 操作模块
+        /// </summary>
+        public string Title { get; set; }
+    }
+}

ZR.Model/System/Dto/SysRoleDto.cs

@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using ZR.Model.System;
+
+namespace ZR.Model.System.Dto
+{
+    public class SysRoleDto: SysBase
+    {
+        public long RoleId { get; set; }
+        /// <summary>
+        /// 角色分配菜单
+        /// </summary>
+        public List<long> MenuIds { get; set; } = new List<long>();
+        public string RoleName { get; set; }
+        public string RoleKey { get; set; }
+        public int RoleSort { get; set; }
+        public string Status { get; set; }
+    }
+}

ZR.Model/System/Dto/SysUserDto.cs

@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using ZR.Model.System;
+
+namespace ZR.Model.System.Dto
+{
+    public class SysUserDto
+    {
+        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; }
+    }
+}

ZR.Model/System/Dto/TasksDto.cs

@@ -0,0 +1,224 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Text;
+
+namespace ZR.Model.System.Dto
+{
+    public class TasksQueryDto
+    {
+        /// <summary>
+        /// 描述 : 查询字符串 
+        /// 空值 : False
+        /// 默认 : 
+        /// </summary>
+        [Display(Name = "查询字符串")]
+        public string QueryText { get; set; }
+    }
+
+    /// <summary>
+    /// 添加任务
+    /// </summary>
+    public class TasksCreateDto
+    {
+        /// <summary>
+        /// 描述 : 任务名称 
+        /// 空值 : False
+        /// 默认 : 
+        /// </summary>
+        [Display(Name = "任务名称")]
+        [Required(ErrorMessage = "任务名称不能为空")]
+        public string Name { get; set; }
+
+        /// <summary>
+        /// 描述 : 任务分组 
+        /// 空值 : False
+        /// 默认 : 
+        /// </summary>
+        [Display(Name = "任务分组")]
+        [Required(ErrorMessage = "任务分组不能为空")]
+        public string JobGroup { get; set; }
+
+        /// <summary>
+        /// 描述 : 运行时间表达式 
+        /// 空值 : False
+        /// 默认 : 
+        /// </summary>
+        [Display(Name = "运行时间表达式")]
+        public string Cron { get; set; }
+
+        /// <summary>
+        /// 描述 : 程序集名称 
+        /// 空值 : False
+        /// 默认 : 
+        /// </summary>
+        [Display(Name = "程序集名称")]
+        [Required(ErrorMessage = "程序集名称不能为空")]
+        public string AssemblyName { get; set; }
+
+        /// <summary>
+        /// 描述 : 任务所在类 
+        /// 空值 : False
+        /// 默认 : 
+        /// </summary>
+        [Display(Name = "任务所在类")]
+        [Required(ErrorMessage = "任务所在类不能为空")]
+        public string ClassName { get; set; }
+
+        /// <summary>
+        /// 描述 : 任务描述 
+        /// 空值 : True
+        /// 默认 : 
+        /// </summary>
+        [Display(Name = "任务描述")]
+        public string Remark { get; set; }
+
+        /// <summary>
+        /// 描述 : 开始时间 
+        /// 空值 : True
+        /// 默认 : 
+        /// </summary>
+        [Display(Name = "开始时间")]
+        public DateTime BeginTime { get; set; }
+
+        /// <summary>
+        /// 描述 : 结束时间 
+        /// 空值 : True
+        /// 默认 : 
+        /// </summary>
+        [Display(Name = "结束时间")]
+        public DateTime EndTime { get; set; }
+
+        /// <summary>
+        /// 描述 : 触发器类型（0、simple 1、cron） 
+        /// 空值 : False
+        /// 默认 : 
+        /// </summary>
+        [Display(Name = "触发器类型（0、simple 1、cron）")]
+        public int TriggerType { get; set; }
+
+        /// <summary>
+        /// 描述 : 执行间隔时间(单位:秒) 
+        /// 空值 : False
+        /// 默认 : 0
+        /// </summary>
+        [Display(Name = "执行间隔时间(单位:秒)")]
+        public int IntervalSecond { get; set; }
+
+        /// <summary>
+        /// 描述 : 传入参数 
+        /// 空值 : True
+        /// 默认 : 
+        /// </summary>
+        [Display(Name = "传入参数")]
+        public string JobParams { get; set; }
+    }
+
+    /// <summary>
+    /// 更新任务
+    /// </summary>
+    public class TasksUpdateDto
+    {
+        /// <summary>
+        /// 描述 : UID 
+        /// 空值 : False
+        /// 默认 : 
+        /// </summary>
+        [Display(Name = "UID")]
+        [Required(ErrorMessage = "UID不能为空")]
+        public string ID { get; set; }
+
+        /// <summary>
+        /// 描述 : 任务名称 
+        /// 空值 : False
+        /// 默认 : 
+        /// </summary>
+        [Display(Name = "任务名称")]
+        [Required(ErrorMessage = "任务名称不能为空")]
+        public string Name { get; set; }
+
+        /// <summary>
+        /// 描述 : 任务分组 
+        /// 空值 : False
+        /// 默认 : 
+        /// </summary>
+        [Display(Name = "任务分组")]
+        [Required(ErrorMessage = "任务分组不能为空")]
+        public string JobGroup { get; set; }
+
+        /// <summary>
+        /// 描述 : 运行时间表达式 
+        /// 空值 : False
+        /// 默认 : 
+        /// </summary>
+        [Display(Name = "运行时间表达式")]
+        public string Cron { get; set; }
+
+        /// <summary>
+        /// 描述 : 程序集名称 
+        /// 空值 : False
+        /// 默认 : 
+        /// </summary>
+        [Display(Name = "程序集名称")]
+        [Required(ErrorMessage = "程序集名称不能为空")]
+        public string AssemblyName { get; set; }
+
+        /// <summary>
+        /// 描述 : 任务所在类 
+        /// 空值 : False
+        /// 默认 : 
+        /// </summary>
+        [Display(Name = "任务所在类")]
+        [Required(ErrorMessage = "任务所在类不能为空")]
+        public string ClassName { get; set; }
+
+        /// <summary>
+        /// 描述 : 任务描述 
+        /// 空值 : True
+        /// 默认 : 
+        /// </summary>
+        [Display(Name = "任务描述")]
+        public string Remark { get; set; }
+
+        /// <summary>
+        /// 描述 : 开始时间 
+        /// 空值 : True
+        /// 默认 : 
+        /// </summary>
+        [Display(Name = "开始时间")]
+        public string BeginTime { get; set; }
+
+        /// <summary>
+        /// 描述 : 结束时间 
+        /// 空值 : True
+        /// 默认 : 
+        /// </summary>
+        [Display(Name = "结束时间")]
+        public string EndTime { get; set; }
+
+        /// <summary>
+        /// 描述 : 触发器类型（0、simple 1、cron） 
+        /// 空值 : False
+        /// 默认 : 
+        /// </summary>
+        [Display(Name = "触发器类型（0、simple 1、cron）")]
+        public int TriggerType { get; set; }
+
+        /// <summary>
+        /// 描述 : 执行间隔时间(单位:秒) 
+        /// 空值 : False
+        /// 默认 : 0
+        /// </summary>
+        [Display(Name = "执行间隔时间(单位:秒)")]
+        public int IntervalSecond { get; set; }
+
+        /// <summary>
+        /// 描述 : 传入参数 
+        /// 空值 : True
+        /// 默认 : 
+        /// </summary>
+        [Display(Name = "传入参数")]
+        public string JobParams { get; set; }
+    }
+
+}

ZR.Model/System/Dto/TasksLogDto.cs

@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace ZR.Model.System.Dto
+{
+    public class TasksLogQueryDto
+    {
+        /// <summary>
+        /// 描述 : 查询字符串 
+        /// 空值 : False
+        /// 默认 : 
+        /// </summary>
+        //[Display(Name = "查询字符串")]
+        public string Name{ get; set; }
+        public string JobName { get; set; }
+        public string JobId { get; set; }
+        public string JobGroup { get; set; }
+        public string Status { get; set; }
+        public DateTime? BeginTime { get; set; }
+        public DateTime? EndTime { get; set; }
+    }
+
+    public class TasksLogDto
+    {
+
+    }
+}

ZR.Model/System/Vo/RouterVo.cs

@@ -0,0 +1,50 @@
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace ZR.Model.System.Vo
+{
+    /// <summary>
+    /// 路由展示
+    /// </summary>
+    public class RouterVo
+    {
+        [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
+        public bool AlwaysShow { get; set; }
+        private string component;
+        [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
+        public bool Hidden { get; set; }
+        public string Name { get; set; }
+        public string Path { get; set; }
+        //[JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
+        public string Redirect { get; set; }
+        public Meta Meta { get; set; }
+        [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
+        public List<RouterVo> Children { get; set; }
+        public string Component { get => component; set => component = value; }
+    }
+
+    public class Meta
+    {
+        /// <summary>
+        /// 设置该路由在侧边栏和面包屑中展示的名字
+        /// </summary>
+        public string Title { get; set; }
+        /// <summary>
+        /// 设置该路由的图标，对应路径src/assets/icons/svg
+        /// </summary>
+        public string Icon { get; set; }
+        /// <summary>
+        /// 设置为true，则不会被 <keep-alive>缓存
+        /// </summary>
+        public bool NoCache { get; set; }
+
+        public Meta(string title, string icon, bool noCache)
+        {
+            Title = title;
+            Icon = icon;
+            NoCache = noCache;
+        }
+    }
+}

ZR.Model/System/Vo/TreeSelectVo.cs

@@ -0,0 +1,58 @@
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using ZR.Model.System;
+
+namespace ZR.Model.Vo.System
+{
+    /// <summary>
+    /// Treeselect树结构实体类
+    /// </summary>
+    public class TreeSelectVo
+    {
+        /// <summary>
+        /// 节点Id
+        /// </summary>
+        public long Id { get; set; }
+        /// <summary>
+        /// 节点名称
+        /// </summary>
+        public string Label { get; set; }
+
+        public TreeSelectVo() { }
+
+        public TreeSelectVo(SysMenu menu)
+        {
+            Id = menu.menuId;
+            Label = menu.menuName;
+
+            //menu.getChildren().stream().map(TreeSelect::new).collect(Collectors.toList()); java写法
+            List<TreeSelectVo> child = new List<TreeSelectVo>();
+            foreach (var item in menu.children)
+            {
+                child.Add(new TreeSelectVo(item));
+            }
+
+            Children = child;
+        }
+
+        public TreeSelectVo(SysDept dept)
+        {
+            Id = dept.DeptId;
+            Label = dept.DeptName;
+
+            //menu.getChildren().stream().map(TreeSelect::new).collect(Collectors.toList()); java写法
+            List<TreeSelectVo> child = new List<TreeSelectVo>();
+            foreach (var item in dept.children)
+            {
+                child.Add(new TreeSelectVo(item));
+            }
+
+            Children = child;
+        }
+
+        [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
+        public List<TreeSelectVo> Children { get; set; }
+    }
+}