From 9b0d356ba4c4a02180ddad85bd38312fc7dc404b Mon Sep 17 00:00:00 2001 From: Rodney Chen <rodney.chen@hotmail.com> Date: 星期二, 29 十月 2024 19:57:42 +0800 Subject: [PATCH] Merge branch 'master' of http://47.115.28.255:8110/r/TigerClouds-Tech/Server/TigerApi6_2024 --- Tiger.Model.Net/Entitys/TSK/TSK_JOB.cs | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/Tiger.Model.Net/Entitys/TSK/TSK_JOB.cs b/Tiger.Model.Net/Entitys/TSK/TSK_JOB.cs index b74d86c..d18d68d 100644 --- a/Tiger.Model.Net/Entitys/TSK/TSK_JOB.cs +++ b/Tiger.Model.Net/Entitys/TSK/TSK_JOB.cs @@ -95,8 +95,8 @@ [SugarColumn(IsIgnore = true)] public string Status => Triggers?.FirstOrDefault()?.StatusStr + "," + Triggers?.FirstOrDefault()?.StatusStr.GetEnum<TSK_TRIG.Statuss>().GetDesc() ?? TSK_TRIG.Statuss.Ready.GetName() + "," + TSK_TRIG.Statuss.Ready.GetDesc(); - [SugarColumn(IsIgnore = true)] - public int Period => Convert.ToInt32(Triggers?.FirstOrDefault()?.Args ?? $"2"); + //[SugarColumn(IsIgnore = true)] + //public int Period => Convert.ToInt32(Triggers?.FirstOrDefault()?.Args ?? $"2"); [SugarColumn(IsIgnore = true)] public int uPeriod { get; set; } @@ -157,4 +157,15 @@ /// </summary> public string Remark { get; set; } } + + public class FluentJobParam: TskJobParam + { + public string AssemblyName { get; set; } + public string DataType { get; set; } + + /// <summary> + /// 鍙傛暟 + /// </summary> + public TrigArgs Args { get; set; } + } } \ No newline at end of file -- Gitblit v1.9.3