NewLife
/
AntJob
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

优化数据模型，删除不使用的表

This commit is contained in:
大石头 2024-06-24 10:21:14 +08:00
parent e2690e698d
commit 15717165a7
7 changed files with 33 additions and 504 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

135
AntJob.Data/Ant.htm
View File

@ -679,133 +679,6 @@
</tbody>
</table>
<br></br>
<h3>应用配置（AppConfig）</h3>
<table>
<thead>
<tr>
<th>名称</th>
<th>显示名</th>
<th>类型</th>
<th>长度</th>
<th>精度</th>
<th>主键</th>
<th>允许空</th>
<th>备注</th>
</tr>
</thead>
<tbody>
<tr>
<td>ID</td>
<td>编号</td>
<td>Int32</td>
<td></td>
<td></td>
<td title="自增">AI</td>
<td>N</td>
<td></td>
</tr>
<tr>
<td>AppID</td>
<td>应用</td>
<td>Int32</td>
<td></td>
<td></td>
<td></td>
<td>N</td>
<td></td>
</tr>
<tr>
<td>Name</td>
<td>名称</td>
<td>String</td>
<td>50</td>
<td></td>
<td></td>
<td></td>
<td></td>
</tr>
<tr>
<td>Content</td>
<td>内容</td>
<td>String</td>
<td>5000</td>
<td></td>
<td></td>
<td></td>
<td>一般是json格式</td>
</tr>
<tr>
<td>CreateUserID</td>
<td>创建人</td>
<td>Int32</td>
<td></td>
<td></td>
<td></td>
<td>N</td>
<td></td>
</tr>
<tr>
<td>CreateTime</td>
<td>创建时间</td>
<td>DateTime</td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
</tr>
<tr>
<td>CreateIP</td>
<td>创建地址</td>
<td>String</td>
<td>50</td>
<td></td>
<td></td>
<td></td>
<td></td>
</tr>
<tr>
<td>UpdateUserID</td>
<td>更新人</td>
<td>Int32</td>
<td></td>
<td></td>
<td></td>
<td>N</td>
<td></td>
</tr>
<tr>
<td>UpdateTime</td>
<td>更新时间</td>
<td>DateTime</td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
</tr>
<tr>
<td>UpdateIP</td>
<td>更新地址</td>
<td>String</td>
<td>50</td>
<td></td>
<td></td>
<td></td>
<td></td>
</tr>
</tbody>
</table>
<br></br>
<h3>作业（Job）</h3>
<table>
<thead>
@ -1131,24 +1004,24 @@
<tr>
<td>LastStatus</td>
<td>最后一次状态</td>
<td>最后状态</td>
<td>Int32</td>
<td></td>
<td></td>
<td></td>
<td>N</td>
<td></td>
<td>最后一次状态</td>
</tr>
<tr>
<td>LastTime</td>
<td>最后一次时间</td>
<td>最后时间</td>
<td>DateTime</td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td>最后一次时间</td>
</tr>
<tr>

24
AntJob.Data/Entity/作业.cs
View File

@ -260,21 +260,21 @@ public partial class Job
public Int32 Speed { get => _Speed; set { if (OnPropertyChanging("Speed", value)) { _Speed = value; OnPropertyChanged("Speed"); } } }
private JobStatus _LastStatus;
/// <summary>最后一次状态</summary>
/// <summary>最后状态。最后一次状态</summary>
[Category("统计")]
[DisplayName("最后一次状态")]
[Description("最后一次状态")]
[DisplayName("最后状态")]
[Description("最后状态。最后一次状态")]
[DataObjectField(false, false, false, 0)]
[BindColumn("LastStatus", "最后一次状态", "")]
[BindColumn("LastStatus", "最后状态。最后一次状态", "")]
public JobStatus LastStatus { get => _LastStatus; set { if (OnPropertyChanging("LastStatus", value)) { _LastStatus = value; OnPropertyChanged("LastStatus"); } } }
private DateTime _LastTime;
/// <summary>最后一次时间</summary>
/// <summary>最后时间。最后一次时间</summary>
[Category("统计")]
[DisplayName("最后一次时间")]
[Description("最后一次时间")]
[DisplayName("最后时间")]
[Description("最后时间。最后一次时间")]
[DataObjectField(false, false, true, 0)]
[BindColumn("LastTime", "最后一次时间", "")]
[BindColumn("LastTime", "最后时间。最后一次时间", "")]
public DateTime LastTime { get => _LastTime; set { if (OnPropertyChanging("LastTime", value)) { _LastTime = value; OnPropertyChanged("LastTime"); } } }
private String _Data;
@ -566,10 +566,10 @@ public partial class Job
/// <summary>速度</summary>
public static readonly Field Speed = FindByName("Speed");
/// <summary>最后一次状态</summary>
/// <summary>最后状态。最后一次状态</summary>
public static readonly Field LastStatus = FindByName("LastStatus");
/// <summary>最后一次时间</summary>
/// <summary>最后时间。最后一次时间</summary>
public static readonly Field LastTime = FindByName("LastTime");
/// <summary>数据。Sql模板或C#模板</summary>
@ -692,10 +692,10 @@ public partial class Job
/// <summary>速度</summary>
public const String Speed = "Speed";
/// <summary>最后一次状态</summary>
/// <summary>最后状态。最后一次状态</summary>
public const String LastStatus = "LastStatus";
/// <summary>最后一次时间</summary>
/// <summary>最后时间。最后一次时间</summary>
public const String LastTime = "LastTime";
/// <summary>数据。Sql模板或C#模板</summary>

14
AntJob.Data/Entity/作业任务.Biz.cs
View File

@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using System.Linq;
using NewLife;
@ -117,6 +117,18 @@ public partial class JobTask : EntityBase<JobTask>
return FindAll(_.JobID == jobId & _.Status == status & _.DataTime == dataTime);
}
/// <summary>根据作业、数据时间查找</summary>
/// <param name="jobId">作业</param>
/// <param name="dataTime">数据时间</param>
/// <returns>实体列表</returns>
public static IList<JobTask> FindAllByJobIDAndDataTime(Int32 jobId, DateTime dataTime)
{
// 实体缓存
if (Meta.Session.Count < 1000) return Meta.Cache.FindAll(e => e.JobID == jobId && e.DataTime == dataTime);
return FindAll(_.JobID == jobId & _.DataTime == dataTime);
}
#endregion
#region 高级查询

2
AntJob.Data/Entity/作业任务.cs
View File

@ -17,7 +17,7 @@ namespace AntJob.Data.Entity;
[Serializable]
[DataObject]
[Description("作业任务。计算作业在执行过程中生成的任务实例，具有该次执行所需参数")]
[BindIndex("IX_JobTask_JobID_Status_DataTime", false, "JobID,Status,DataTime")]
[BindIndex("IX_JobTask_JobID_DataTime", false, "JobID,DataTime")]
[BindIndex("IX_JobTask_AppID_Client_Status", false, "AppID,Client,Status")]
[BindIndex("IX_JobTask_JobID_CreateTime", false, "JobID,CreateTime")]
[BindTable("JobTask", Description = "作业任务。计算作业在执行过程中生成的任务实例，具有该次执行所需参数", ConnName = "Ant", DbType = DatabaseType.None)]

103
AntJob.Data/Entity/应用配置.Biz.cs
View File

@ -1,103 +0,0 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Runtime.Serialization;
using System.Xml.Serialization;
using NewLife;
using NewLife.Data;
using XCode;
using XCode.Cache;
using XCode.Membership;
namespace AntJob.Data.Entity;
/// <summary>应用配置。各应用的配置数据</summary>
public partial class AppConfig : EntityBase<AppConfig>
{
#region 对象操作
static AppConfig()
{
// 累加字段
//var df = Meta.Factory.AdditionalFields;
//df.Add(__.AppID);
// 过滤器 UserModule、TimeModule、IPModule
Meta.Modules.Add<UserModule>();
Meta.Modules.Add<TimeModule>();
Meta.Modules.Add<IPModule>();
}
#endregion
#region 扩展属性
///// <summary>设备编号</summary>
//[XmlIgnore, IgnoreDataMember]
////[ScriptIgnore]
//public App App => Extends.Get(nameof(App), k => App.FindByID(AppID));
///// <summary>设备编号</summary>
//[XmlIgnore, IgnoreDataMember]
////[ScriptIgnore]
//[DisplayName("设备编号")]
//[Map(__.AppID, typeof(App), "ID")]
//public String AppName => App?.Name;
#endregion
#region 扩展查询
/// <summary>根据编号查找</summary>
/// <param name="id">编号</param>
/// <returns>实体对象</returns>
public static AppConfig FindByID(Int32 id)
{
if (id <= 0) return null;
// 实体缓存
if (Meta.Session.Count < 1000) return Meta.Cache.Find(e => e.ID == id);
// 单对象缓存
return Meta.SingleCache[id];
//return Find(_.ID == id);
}
/// <summary>根据设备编号、名称查找</summary>
/// <param name="appid">设备编号</param>
/// <param name="name">名称</param>
/// <returns>实体对象</returns>
public static AppConfig FindByAppIDAndName(Int32 appid, String name)
{
// 实体缓存
if (Meta.Session.Count < 1000) return Meta.Cache.Find(e => e.AppID == appid && e.Name == name);
return Find(_.AppID == appid & _.Name == name);
}
#endregion
#region 高级查询
/// <summary>高级查询</summary>
/// <param name="appid"></param>
/// <param name="start"></param>
/// <param name="end"></param>
/// <param name="key"></param>
/// <param name="p"></param>
/// <returns></returns>
public static IEnumerable<AppConfig> Search(Int32 appid, DateTime start, DateTime end, String key, PageParameter p)
{
var exp = new WhereExpression();
if (appid > 0) exp &= _.AppID == appid.ToInt();
if (!key.IsNullOrEmpty()) exp &= _.Name.Contains(key);
exp &= _.CreateTime.Between(start, end);
return FindAll(exp, p);
}
#endregion
#region 业务操作
/// <summary>类别名实体缓存，异步，缓存10分钟</summary>
static readonly FieldCache<AppConfig> NameCache = new FieldCache<AppConfig>(__.Name);
/// <summary>获取所有类别名称</summary>
/// <returns></returns>
public static IDictionary<String, String> FindAllName() => NameCache.FindAllName();
#endregion
}

235
AntJob.Data/Entity/应用配置.cs
View File

@ -1,235 +0,0 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Runtime.Serialization;
using System.Web.Script.Serialization;
using System.Xml.Serialization;
using NewLife;
using NewLife.Data;
using XCode;
using XCode.Cache;
using XCode.Configuration;
using XCode.DataAccessLayer;
namespace AntJob.Data.Entity;
/// <summary>应用配置。数据计算应用的配置数据</summary>
[Serializable]
[DataObject]
[Description("应用配置。数据计算应用的配置数据")]
[BindIndex("IU_AppConfig_AppID_Name", true, "AppID,Name")]
[BindIndex("IX_AppConfig_UpdateTime", false, "UpdateTime")]
[BindTable("AppConfig", Description = "应用配置。数据计算应用的配置数据", ConnName = "Ant", DbType = DatabaseType.None)]
public partial class AppConfig
{
#region 属性
private Int32 _ID;
/// <summary>编号</summary>
[DisplayName("编号")]
[Description("编号")]
[DataObjectField(true, true, false, 0)]
[BindColumn("ID", "编号", "")]
public Int32 ID { get => _ID; set { if (OnPropertyChanging("ID", value)) { _ID = value; OnPropertyChanged("ID"); } } }
private Int32 _AppID;
/// <summary>应用</summary>
[DisplayName("应用")]
[Description("应用")]
[DataObjectField(false, false, false, 0)]
[BindColumn("AppID", "应用", "")]
public Int32 AppID { get => _AppID; set { if (OnPropertyChanging("AppID", value)) { _AppID = value; OnPropertyChanged("AppID"); } } }
private String _Name;
/// <summary>名称</summary>
[DisplayName("名称")]
[Description("名称")]
[DataObjectField(false, false, true, 50)]
[BindColumn("Name", "名称", "", Master = true)]
public String Name { get => _Name; set { if (OnPropertyChanging("Name", value)) { _Name = value; OnPropertyChanged("Name"); } } }
private String _Content;
/// <summary>内容。一般是json格式</summary>
[DisplayName("内容")]
[Description("内容。一般是json格式")]
[DataObjectField(false, false, true, 5000)]
[BindColumn("Content", "内容。一般是json格式", "")]
public String Content { get => _Content; set { if (OnPropertyChanging("Content", value)) { _Content = value; OnPropertyChanged("Content"); } } }
private Int32 _CreateUserID;
/// <summary>创建人</summary>
[Category("扩展")]
[DisplayName("创建人")]
[Description("创建人")]
[DataObjectField(false, false, false, 0)]
[BindColumn("CreateUserID", "创建人", "")]
public Int32 CreateUserID { get => _CreateUserID; set { if (OnPropertyChanging("CreateUserID", value)) { _CreateUserID = value; OnPropertyChanged("CreateUserID"); } } }
private DateTime _CreateTime;
/// <summary>创建时间</summary>
[Category("扩展")]
[DisplayName("创建时间")]
[Description("创建时间")]
[DataObjectField(false, false, true, 0)]
[BindColumn("CreateTime", "创建时间", "")]
public DateTime CreateTime { get => _CreateTime; set { if (OnPropertyChanging("CreateTime", value)) { _CreateTime = value; OnPropertyChanged("CreateTime"); } } }
private String _CreateIP;
/// <summary>创建地址</summary>
[Category("扩展")]
[DisplayName("创建地址")]
[Description("创建地址")]
[DataObjectField(false, false, true, 50)]
[BindColumn("CreateIP", "创建地址", "")]
public String CreateIP { get => _CreateIP; set { if (OnPropertyChanging("CreateIP", value)) { _CreateIP = value; OnPropertyChanged("CreateIP"); } } }
private Int32 _UpdateUserID;
/// <summary>更新人</summary>
[Category("扩展")]
[DisplayName("更新人")]
[Description("更新人")]
[DataObjectField(false, false, false, 0)]
[BindColumn("UpdateUserID", "更新人", "")]
public Int32 UpdateUserID { get => _UpdateUserID; set { if (OnPropertyChanging("UpdateUserID", value)) { _UpdateUserID = value; OnPropertyChanged("UpdateUserID"); } } }
private DateTime _UpdateTime;
/// <summary>更新时间</summary>
[Category("扩展")]
[DisplayName("更新时间")]
[Description("更新时间")]
[DataObjectField(false, false, true, 0)]
[BindColumn("UpdateTime", "更新时间", "")]
public DateTime UpdateTime { get => _UpdateTime; set { if (OnPropertyChanging("UpdateTime", value)) { _UpdateTime = value; OnPropertyChanged("UpdateTime"); } } }
private String _UpdateIP;
/// <summary>更新地址</summary>
[Category("扩展")]
[DisplayName("更新地址")]
[Description("更新地址")]
[DataObjectField(false, false, true, 50)]
[BindColumn("UpdateIP", "更新地址", "")]
public String UpdateIP { get => _UpdateIP; set { if (OnPropertyChanging("UpdateIP", value)) { _UpdateIP = value; OnPropertyChanged("UpdateIP"); } } }
#endregion
#region 获取/设置 字段值
/// <summary>获取/设置 字段值</summary>
/// <param name="name">字段名</param>
/// <returns></returns>
public override Object this[String name]
{
get => name switch
{
"ID" => _ID,
"AppID" => _AppID,
"Name" => _Name,
"Content" => _Content,
"CreateUserID" => _CreateUserID,
"CreateTime" => _CreateTime,
"CreateIP" => _CreateIP,
"UpdateUserID" => _UpdateUserID,
"UpdateTime" => _UpdateTime,
"UpdateIP" => _UpdateIP,
_ => base[name]
};
set
{
switch (name)
{
case "ID": _ID = value.ToInt(); break;
case "AppID": _AppID = value.ToInt(); break;
case "Name": _Name = Convert.ToString(value); break;
case "Content": _Content = Convert.ToString(value); break;
case "CreateUserID": _CreateUserID = value.ToInt(); break;
case "CreateTime": _CreateTime = value.ToDateTime(); break;
case "CreateIP": _CreateIP = Convert.ToString(value); break;
case "UpdateUserID": _UpdateUserID = value.ToInt(); break;
case "UpdateTime": _UpdateTime = value.ToDateTime(); break;
case "UpdateIP": _UpdateIP = Convert.ToString(value); break;
default: base[name] = value; break;
}
}
}
#endregion
#region 关联映射
/// <summary>应用</summary>
[XmlIgnore, IgnoreDataMember, ScriptIgnore]
public App App => Extends.Get(nameof(App), k => App.FindByID(AppID));
/// <summary>应用</summary>
[Map(nameof(AppID), typeof(App), "ID")]
public String AppName => App?.ToString();
#endregion
#region 字段名
/// <summary>取得应用配置字段信息的快捷方式</summary>
public partial class _
{
/// <summary>编号</summary>
public static readonly Field ID = FindByName("ID");
/// <summary>应用</summary>
public static readonly Field AppID = FindByName("AppID");
/// <summary>名称</summary>
public static readonly Field Name = FindByName("Name");
/// <summary>内容。一般是json格式</summary>
public static readonly Field Content = FindByName("Content");
/// <summary>创建人</summary>
public static readonly Field CreateUserID = FindByName("CreateUserID");
/// <summary>创建时间</summary>
public static readonly Field CreateTime = FindByName("CreateTime");
/// <summary>创建地址</summary>
public static readonly Field CreateIP = FindByName("CreateIP");
/// <summary>更新人</summary>
public static readonly Field UpdateUserID = FindByName("UpdateUserID");
/// <summary>更新时间</summary>
public static readonly Field UpdateTime = FindByName("UpdateTime");
/// <summary>更新地址</summary>
public static readonly Field UpdateIP = FindByName("UpdateIP");
static Field FindByName(String name) => Meta.Table.FindByName(name);
}
/// <summary>取得应用配置字段名称的快捷方式</summary>
public partial class __
{
/// <summary>编号</summary>
public const String ID = "ID";
/// <summary>应用</summary>
public const String AppID = "AppID";
/// <summary>名称</summary>
public const String Name = "Name";
/// <summary>内容。一般是json格式</summary>
public const String Content = "Content";
/// <summary>创建人</summary>
public const String CreateUserID = "CreateUserID";
/// <summary>创建时间</summary>
public const String CreateTime = "CreateTime";
/// <summary>创建地址</summary>
public const String CreateIP = "CreateIP";
/// <summary>更新人</summary>
public const String UpdateUserID = "UpdateUserID";
/// <summary>更新时间</summary>
public const String UpdateTime = "UpdateTime";
/// <summary>更新地址</summary>
public const String UpdateIP = "UpdateIP";
}
#endregion
}

24
AntJob.Data/Model.xml
View File

@ -116,24 +116,6 @@
<Index Columns="AppID,Action" />
</Indexes>
</Table>
<Table Name="AppConfig" Description="应用配置。数据计算应用的配置数据">
<Columns>
<Column Name="ID" DataType="Int32" Identity="True" PrimaryKey="True" Description="编号" />
<Column Name="AppID" DataType="Int32" Map="App@ID@$" Description="应用" />
<Column Name="Name" DataType="String" Master="True" Description="名称" />
<Column Name="Content" DataType="String" Length="5000" Description="内容。一般是json格式" />
<Column Name="CreateUserID" DataType="Int32" Description="创建人" Category="扩展" />
<Column Name="CreateTime" DataType="DateTime" Description="创建时间" Category="扩展" />
<Column Name="CreateIP" DataType="String" Description="创建地址" Category="扩展" />
<Column Name="UpdateUserID" DataType="Int32" Description="更新人" Category="扩展" />
<Column Name="UpdateTime" DataType="DateTime" Description="更新时间" Category="扩展" />
<Column Name="UpdateIP" DataType="String" Description="更新地址" Category="扩展" />
</Columns>
<Indexes>
<Index Columns="AppID,Name" Unique="True" />
<Index Columns="UpdateTime" />
</Indexes>
</Table>
<Table Name="Job" Description="作业。数据计算逻辑的主要单元，每个作业即是一个业务逻辑">
<Columns>
<Column Name="ID" DataType="Int32" Identity="True" PrimaryKey="True" Description="编号" />
@ -164,8 +146,8 @@
<Column Name="Error" DataType="Int32" Description="错误" Category="统计" />
<Column Name="Times" DataType="Int32" Description="次数" Category="统计" />
<Column Name="Speed" DataType="Int32" Description="速度" Category="统计" />
<Column Name="LastStatus" DataType="Int32" Description="最后一次状态" Category="统计" Type="JobStatus" />
<Column Name="LastTime" DataType="DateTime" Description="最后一次时间" Category="统计" />
<Column Name="LastStatus" DataType="Int32" Description="最后状态。最后一次状态" Category="统计" Type="JobStatus" />
<Column Name="LastTime" DataType="DateTime" Description="最后时间。最后一次时间" Category="统计" />
<Column Name="Data" DataType="String" Length="-1" Description="数据。Sql模板或C#模板" />
<Column Name="CreateUserID" DataType="Int32" Description="创建人" Category="扩展" />
<Column Name="CreateUser" DataType="String" Description="创建者" Category="扩展" />
@ -211,7 +193,7 @@
<Column Name="UpdateTime" DataType="DateTime" Description="更新时间" Category="扩展" />
</Columns>
<Indexes>
<Index Columns="JobID,Status,DataTime" />
<Index Columns="JobID,DataTime" />
<Index Columns="AppID,Client,Status" />
<Index Columns="JobID,CreateTime" />
</Indexes>