Merge branch 'master' into net6.0

ZR.Model/Dto/Business/GendemoDto.cs

@@ -0,0 +1,40 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using ZR.Model.Dto;
+using ZR.Model.Models;
+
+namespace ZR.Model.Dto
+{
+    /// <summary>
+    /// 演示输入对象
+    /// </summary>
+    public class GenDemoDto
+    {
+        [Required(ErrorMessage = "id不能为空")]
+        public int Id { get; set; }
+        [Required(ErrorMessage = "名称不能为空")]
+        public string Name { get; set; }
+        public string Icon { get; set; }
+        [Required(ErrorMessage = "显示状态不能为空")]
+        public int ShowStatus { get; set; }
+        public int? Sex { get; set; }
+        public int? Sort { get; set; }
+        public string Remark { get; set; }
+        public DateTime? BeginTime { get; set; }
+        public DateTime? EndTime { get; set; }
+        public string Feature { get; set; }
+    }
+
+    /// <summary>
+    /// 演示查询对象
+    /// </summary>
+    public class GenDemoQueryDto : PagerInfo 
+    {
+        public int? Id { get; set; }
+        public string Name { get; set; }
+        public int? ShowStatus { get; set; }
+        public DateTime? BeginAddTime { get; set; }
+        public DateTime? EndAddTime { get; set; }
+    }
+}

ZR.Model/Models/Business/Gendemo.cs

@@ -0,0 +1,103 @@
+using System;
+using System.Collections.Generic;
+using SqlSugar;
+using OfficeOpenXml.Attributes;
+
+namespace ZR.Model.Models
+{
+    /// <summary>
+    /// 演示，数据实体对象
+    ///
+    /// @author zz
+    /// @date 2022-03-31
+    /// </summary>
+    [SugarTable("gen_demo")]
+    public class GenDemo
+    {
+        /// <summary>
+        /// 描述 : id
+        /// 空值 : false  
+        /// </summary>
+        [EpplusTableColumn(Header = "id")]
+        [SqlSugar.SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
+        public int Id { get; set; }
+
+        /// <summary>
+        /// 描述 : 名称
+        /// 空值 : false  
+        /// </summary>
+        [EpplusTableColumn(Header = "名称")]
+        public string Name { get; set; }
+
+        /// <summary>
+        /// 描述 : 图片
+        /// 空值 : true  
+        /// </summary>
+        [EpplusTableColumn(Header = "图片")]
+        public string Icon { get; set; }
+
+        /// <summary>
+        /// 描述 : 显示状态
+        /// 空值 : false  
+        /// </summary>
+        [EpplusTableColumn(Header = "显示状态")]
+        public int ShowStatus { get; set; }
+
+        /// <summary>
+        /// 描述 : 添加时间
+        /// 空值 : true  
+        /// </summary>
+        [EpplusTableColumn(Header = "添加时间", NumberFormat = "yyyy-MM-dd HH:mm:ss")]
+        public DateTime? AddTime { get; set; }
+
+        /// <summary>
+        /// 描述 : 用户性别
+        /// 空值 : true  
+        /// </summary>
+        [EpplusTableColumn(Header = "用户性别")]
+        public int? Sex { get; set; }
+
+        /// <summary>
+        /// 描述 : 排序
+        /// 空值 : true  
+        /// </summary>
+        [EpplusTableColumn(Header = "排序")]
+        public int? Sort { get; set; }
+
+        /// <summary>
+        /// 描述 : 备注
+        /// 空值 : true  
+        /// </summary>
+        [EpplusTableColumn(Header = "备注")]
+        public string Remark { get; set; }
+
+        /// <summary>
+        /// 描述 : 开始时间
+        /// 空值 : true  
+        /// </summary>
+        [EpplusTableColumn(Header = "开始时间", NumberFormat = "yyyy-MM-dd HH:mm:ss")]
+        public DateTime? BeginTime { get; set; }
+
+        /// <summary>
+        /// 描述 : 结束时间
+        /// 空值 : true  
+        /// </summary>
+        [EpplusTableColumn(Header = "结束时间", NumberFormat = "yyyy-MM-dd HH:mm:ss")]
+        public DateTime? EndTime { get; set; }
+
+        /// <summary>
+        /// 描述 : 特征
+        /// 空值 : true  
+        /// </summary>
+        [EpplusTableColumn(Header = "特征")]
+        public string Feature { get; set; }
+
+        /// <summary>
+        /// 描述 : 父级id
+        /// 空值 : true  
+        /// </summary>
+        [EpplusTableColumn(Header = "父级id")]
+        public int? ParentId { get; set; }
+
+    }
+}

ZR.Model/System/Dto/TasksDto.cs

@@ -112,6 +112,11 @@ namespace ZR.Model.System.Dto
         /// </summary>
         [Display(Name = "传入参数")]
         public string JobParams { get; set; }
+        public string ApiUrl { get; set; }
+        /// <summary>
+        /// 1、程序集任务 2、apiUrl任务
+        /// </summary>
+        public int TaskType { get; set; }
     }
 
     /// <summary>
@@ -219,6 +224,10 @@ namespace ZR.Model.System.Dto
         /// </summary>
         [Display(Name = "传入参数")]
         public string JobParams { get; set; }
+        public string ApiUrl { get; set; }
+        /// <summary>
+        /// 1、程序集任务 2、apiUrl任务
+        /// </summary>
+        public int TaskType { get; set; }
     }
-
 }

ZR.Model/System/SysTasksQz.cs

@@ -157,5 +157,13 @@ namespace ZR.Model.System
         /// 最后运行时间
         /// </summary>
         public DateTime? LastRunTime { get; set; }
+        /// <summary>
+        /// api执行地址
+        /// </summary>
+        public string ApiUrl { get; set; }
+        /// <summary>
+        /// 任务类型 1程序集2网络请求
+        /// </summary>
+        public int TaskType { get; set; }
     }
 }