枚举转字典job,若网页修改了TagType，下一次请求，一直重置TagType的问题
This commit is contained in:
zhao-fuck-sky
parent
a4f0a328b6
commit
9b5f0b1edb
@ -1,150 +1,150 @@
|
|||||||
// Admin.NET 项目的版权、商标、专利和其他相关权利均受相应法律法规的保护。使用本项目应遵守相关法律法规和许可证的要求。
|
// Admin.NET 项目的版权、商标、专利和其他相关权利均受相应法律法规的保护。使用本项目应遵守相关法律法规和许可证的要求。
|
||||||
//
|
//
|
||||||
// 本项目主要遵循 MIT 许可证和 Apache 许可证（版本 2.0）进行分发和使用。许可证位于源代码树根目录中的 LICENSE-MIT 和 LICENSE-APACHE 文件。
|
// 本项目主要遵循 MIT 许可证和 Apache 许可证（版本 2.0）进行分发和使用。许可证位于源代码树根目录中的 LICENSE-MIT 和 LICENSE-APACHE 文件。
|
||||||
//
|
//
|
||||||
// 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！
|
// 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！
|
||||||
|
|
||||||
namespace Admin.NET.Core;
|
namespace Admin.NET.Core;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 枚举转字典
|
/// 枚举转字典
|
||||||
/// </summary>
|
/// </summary>
|
||||||
[JobDetail("job_EnumToDictJob", Description = "枚举转字典", GroupName = "default", Concurrent = false)]
|
[JobDetail("job_EnumToDictJob", Description = "枚举转字典", GroupName = "default", Concurrent = false)]
|
||||||
[PeriodSeconds(1, TriggerId = "trigger_EnumToDictJob", Description = "枚举转字典", MaxNumberOfRuns = 1, RunOnStart = true)]
|
[PeriodSeconds(1, TriggerId = "trigger_EnumToDictJob", Description = "枚举转字典", MaxNumberOfRuns = 1, RunOnStart = true)]
|
||||||
public class EnumToDictJob : IJob
|
public class EnumToDictJob : IJob
|
||||||
{
|
{
|
||||||
private readonly IServiceScopeFactory _scopeFactory;
|
private readonly IServiceScopeFactory _scopeFactory;
|
||||||
private readonly IJsonSerializerProvider _jsonSerializer;
|
private readonly IJsonSerializerProvider _jsonSerializer;
|
||||||
|
|
||||||
public EnumToDictJob(IServiceScopeFactory scopeFactory, IJsonSerializerProvider jsonSerializer)
|
public EnumToDictJob(IServiceScopeFactory scopeFactory, IJsonSerializerProvider jsonSerializer)
|
||||||
{
|
{
|
||||||
_scopeFactory = scopeFactory;
|
_scopeFactory = scopeFactory;
|
||||||
_jsonSerializer = jsonSerializer;
|
_jsonSerializer = jsonSerializer;
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task ExecuteAsync(JobExecutingContext context, CancellationToken stoppingToken)
|
public async Task ExecuteAsync(JobExecutingContext context, CancellationToken stoppingToken)
|
||||||
{
|
{
|
||||||
using var serviceScope = _scopeFactory.CreateScope();
|
using var serviceScope = _scopeFactory.CreateScope();
|
||||||
var sysEnumService = serviceScope.ServiceProvider.GetRequiredService<SysEnumService>();
|
var sysEnumService = serviceScope.ServiceProvider.GetRequiredService<SysEnumService>();
|
||||||
var db = serviceScope.ServiceProvider.GetRequiredService<ISqlSugarClient>().CopyNew();
|
var db = serviceScope.ServiceProvider.GetRequiredService<ISqlSugarClient>().CopyNew();
|
||||||
|
|
||||||
var enumTypeList = sysEnumService.GetEnumTypeList();
|
var enumTypeList = sysEnumService.GetEnumTypeList();
|
||||||
var enumCodeList = enumTypeList.Select(u => u.TypeName);
|
var enumCodeList = enumTypeList.Select(u => u.TypeName);
|
||||||
var sysDictTypeCodeList = await db.Queryable<SysDictType>().Where(u => enumCodeList.Contains(u.Code)).Select(u => u.Code).ToListAsync(stoppingToken);
|
var sysDictTypeCodeList = await db.Queryable<SysDictType>().Where(u => enumCodeList.Contains(u.Code)).Select(u => u.Code).ToListAsync(stoppingToken);
|
||||||
|
|
||||||
// 更新的枚举转换字典
|
// 更新的枚举转换字典
|
||||||
var uEnumType = enumTypeList.Where(u => sysDictTypeCodeList.Contains(u.TypeName)).ToList();
|
var uEnumType = enumTypeList.Where(u => sysDictTypeCodeList.Contains(u.TypeName)).ToList();
|
||||||
var waitUpdateSysDictType = await db.Queryable<SysDictType>().Where(u => uEnumType.Any(a => a.TypeName == u.Code)).ToListAsync(stoppingToken);
|
var waitUpdateSysDictType = await db.Queryable<SysDictType>().Where(u => uEnumType.Any(a => a.TypeName == u.Code)).ToListAsync(stoppingToken);
|
||||||
var waitUpdateSysDictTypeDict = waitUpdateSysDictType.ToDictionary(u => u.Code, u => u);
|
var waitUpdateSysDictTypeDict = waitUpdateSysDictType.ToDictionary(u => u.Code, u => u);
|
||||||
var waitUpdateSysDictData = await db.Queryable<SysDictData>().Where(u => uEnumType.Any(a => a.TypeName == u.DictType.Code)).ToListAsync(stoppingToken);
|
var waitUpdateSysDictData = await db.Queryable<SysDictData>().Where(u => uEnumType.Any(a => a.TypeName == u.DictType.Code)).ToListAsync(stoppingToken);
|
||||||
var uSysDictType = new List<SysDictType>();
|
var uSysDictType = new List<SysDictType>();
|
||||||
var uSysDictData = new List<SysDictData>();
|
var uSysDictData = new List<SysDictData>();
|
||||||
if (uEnumType.Count > 0)
|
if (uEnumType.Count > 0)
|
||||||
{
|
{
|
||||||
uEnumType.ForEach(e =>
|
uEnumType.ForEach(e =>
|
||||||
{
|
{
|
||||||
if (waitUpdateSysDictTypeDict.TryGetValue(e.TypeName, out SysDictType value))
|
if (waitUpdateSysDictTypeDict.TryGetValue(e.TypeName, out SysDictType value))
|
||||||
{
|
{
|
||||||
var uDictType = value;
|
var uDictType = value;
|
||||||
uDictType.Name = e.TypeDescribe;
|
uDictType.Name = e.TypeDescribe;
|
||||||
uDictType.Remark = e.TypeRemark;
|
uDictType.Remark = e.TypeRemark;
|
||||||
var uDictData = waitUpdateSysDictData.Where(u => u.DictTypeId == uDictType.Id).ToList();
|
var uDictData = waitUpdateSysDictData.Where(u => u.DictTypeId == uDictType.Id).ToList();
|
||||||
if (uDictData.Count > 0)
|
if (uDictData.Count > 0)
|
||||||
{
|
{
|
||||||
uDictData.ForEach(dictData =>
|
uDictData.ForEach(dictData =>
|
||||||
{
|
{
|
||||||
var enumData = e.EnumEntities.Where(u => dictData.Code == u.Name).FirstOrDefault();
|
var enumData = e.EnumEntities.Where(u => dictData.Code == u.Name).FirstOrDefault();
|
||||||
if (enumData != null)
|
if (enumData != null)
|
||||||
{
|
{
|
||||||
dictData.Value = enumData.Value.ToString();
|
dictData.Value = enumData.Value.ToString();
|
||||||
dictData.Code = enumData.Name;
|
dictData.Code = enumData.Name;
|
||||||
dictData.OrderNo = enumData.Value + 10;
|
dictData.OrderNo = enumData.Value + 10;
|
||||||
dictData.Name = enumData.Describe;
|
dictData.Name = enumData.Describe;
|
||||||
dictData.TagType = enumData.Theme != "" ? enumData.Theme : "info";
|
dictData.TagType = enumData.Theme != "" ? enumData.Theme : dictData.TagType != "" ? dictData.TagType : "info";
|
||||||
uSysDictData.Add(dictData);
|
uSysDictData.Add(dictData);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
if (!uSysDictType.Any(u => u.Id == uDictType.Id))
|
if (!uSysDictType.Any(u => u.Id == uDictType.Id))
|
||||||
uSysDictType.Add(uDictType);
|
uSysDictType.Add(uDictType);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
db.BeginTran();
|
db.BeginTran();
|
||||||
|
|
||||||
if (uSysDictType.Count > 0)
|
if (uSysDictType.Count > 0)
|
||||||
await db.Updateable(uSysDictType).ExecuteCommandAsync(stoppingToken);
|
await db.Updateable(uSysDictType).ExecuteCommandAsync(stoppingToken);
|
||||||
|
|
||||||
if (uSysDictData.Count > 0)
|
if (uSysDictData.Count > 0)
|
||||||
await db.Updateable(uSysDictData).ExecuteCommandAsync(stoppingToken);
|
await db.Updateable(uSysDictData).ExecuteCommandAsync(stoppingToken);
|
||||||
|
|
||||||
db.CommitTran();
|
db.CommitTran();
|
||||||
}
|
}
|
||||||
catch (Exception error)
|
catch (Exception error)
|
||||||
{
|
{
|
||||||
db.RollbackTran();
|
db.RollbackTran();
|
||||||
Log.Error($"{context.Trigger.Description}更新枚举转换字典入库错误：" + _jsonSerializer.Serialize(error));
|
Log.Error($"{context.Trigger.Description}更新枚举转换字典入库错误：" + _jsonSerializer.Serialize(error));
|
||||||
throw new Exception($"{context.Trigger.Description}更新枚举转换字典入库错误");
|
throw new Exception($"{context.Trigger.Description}更新枚举转换字典入库错误");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// 新增的枚举转换字典
|
// 新增的枚举转换字典
|
||||||
var iEnumType = enumTypeList.Where(u => !sysDictTypeCodeList.Contains(u.TypeName)).ToList();
|
var iEnumType = enumTypeList.Where(u => !sysDictTypeCodeList.Contains(u.TypeName)).ToList();
|
||||||
if (iEnumType.Count > 0)
|
if (iEnumType.Count > 0)
|
||||||
{
|
{
|
||||||
// 新增字典类型
|
// 新增字典类型
|
||||||
var iDictType = iEnumType.Select(u => new SysDictType
|
var iDictType = iEnumType.Select(u => new SysDictType
|
||||||
{
|
{
|
||||||
Id = YitIdHelper.NextId(),
|
Id = YitIdHelper.NextId(),
|
||||||
Code = u.TypeName,
|
Code = u.TypeName,
|
||||||
Name = u.TypeDescribe,
|
Name = u.TypeDescribe,
|
||||||
Remark = u.TypeRemark,
|
Remark = u.TypeRemark,
|
||||||
Status = StatusEnum.Enable
|
Status = StatusEnum.Enable
|
||||||
}).ToList();
|
}).ToList();
|
||||||
// 新增字典数据
|
// 新增字典数据
|
||||||
var dictData = iEnumType.Join(iDictType, t1 => t1.TypeName, t2 => t2.Code, (t1, t2) => new
|
var dictData = iEnumType.Join(iDictType, t1 => t1.TypeName, t2 => t2.Code, (t1, t2) => new
|
||||||
{
|
{
|
||||||
data = t1.EnumEntities.Select(u => new SysDictData
|
data = t1.EnumEntities.Select(u => new SysDictData
|
||||||
{
|
{
|
||||||
Id = YitIdHelper.NextId(), // 性能优化，使用BulkCopyAsync必须手动获取Id
|
Id = YitIdHelper.NextId(), // 性能优化，使用BulkCopyAsync必须手动获取Id
|
||||||
DictTypeId = t2.Id,
|
DictTypeId = t2.Id,
|
||||||
Name = u.Describe,
|
Name = u.Describe,
|
||||||
Value = u.Value.ToString(),
|
Value = u.Value.ToString(),
|
||||||
Code = u.Name,
|
Code = u.Name,
|
||||||
Remark = t2.Remark,
|
Remark = t2.Remark,
|
||||||
OrderNo = u.Value + 10,
|
OrderNo = u.Value + 10,
|
||||||
TagType = u.Theme != "" ? u.Theme : "info"
|
TagType = u.Theme != "" ? u.Theme : "info"
|
||||||
}).ToList()
|
}).ToList()
|
||||||
}).ToList();
|
}).ToList();
|
||||||
var iDictData = new List<SysDictData>();
|
var iDictData = new List<SysDictData>();
|
||||||
dictData.ForEach(item =>
|
dictData.ForEach(item =>
|
||||||
{
|
{
|
||||||
iDictData.AddRange(item.data);
|
iDictData.AddRange(item.data);
|
||||||
});
|
});
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
db.BeginTran();
|
db.BeginTran();
|
||||||
|
|
||||||
if (iDictType.Count > 0)
|
if (iDictType.Count > 0)
|
||||||
await db.Insertable(iDictType).ExecuteCommandAsync(stoppingToken);
|
await db.Insertable(iDictType).ExecuteCommandAsync(stoppingToken);
|
||||||
|
|
||||||
if (iDictData.Count > 0)
|
if (iDictData.Count > 0)
|
||||||
await db.Insertable(iDictData).ExecuteCommandAsync(stoppingToken);
|
await db.Insertable(iDictData).ExecuteCommandAsync(stoppingToken);
|
||||||
|
|
||||||
db.CommitTran();
|
db.CommitTran();
|
||||||
}
|
}
|
||||||
catch (Exception error)
|
catch (Exception error)
|
||||||
{
|
{
|
||||||
db.RollbackTran();
|
db.RollbackTran();
|
||||||
Log.Error($"{context.Trigger.Description}新增枚举转换字典入库错误：" + _jsonSerializer.Serialize(error));
|
Log.Error($"{context.Trigger.Description}新增枚举转换字典入库错误：" + _jsonSerializer.Serialize(error));
|
||||||
throw new Exception($"{context.Trigger.Description}新增枚举转换字典入库错误");
|
throw new Exception($"{context.Trigger.Description}新增枚举转换字典入库错误");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
var originColor = Console.ForegroundColor;
|
var originColor = Console.ForegroundColor;
|
||||||
Console.ForegroundColor = ConsoleColor.Green;
|
Console.ForegroundColor = ConsoleColor.Green;
|
||||||
Console.WriteLine($"【{DateTime.Now}】系统枚举转换字典");
|
Console.WriteLine($"【{DateTime.Now}】系统枚举转换字典");
|
||||||
Console.ForegroundColor = originColor;
|
Console.ForegroundColor = originColor;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Loading…
Reference in New Issue
Block a user