chenjingyong
/
ds8-solution-pro
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

工作流执行节点判断调整

Browse Source
usertest
zhangxiaofeng 3 months ago
parent b4a1b29c2c
commit 6dc9277816
1 changed files with 9 additions and 109 deletions
Show Stats Download Patch File Download Diff File

118
ds-wms-service/DS.WMS.Core/TaskPlat/Other/TaskFlowRuner.cs
Unescape Escape View File

@ -421,20 +421,21 @@ namespace DS.WMS.Core.TaskPlat
.Where(x => configIdList.Contains(x.ConfigId)) .Where(x => configIdList.Contains(x.ConfigId))
.ToListAsync(); .ToListAsync();
var matchedConfigList = new List<TaskFlowConfig>(); Dictionary<TaskFlowConfig, int> matchedConfigList = new();
foreach (var item in waitMatchConfigList) foreach (var item in waitMatchConfigList)
{ {
var condition = conditionList.FirstOrDefault(x => x.ConfigId == item.Id); var condition = conditionList.FirstOrDefault(x => x.ConfigId == item.Id);
if (condition == null || string.IsNullOrEmpty(condition.Content)) if (condition == null || string.IsNullOrEmpty(condition.Content))
{ {
matchedConfigList.Add(item); matchedConfigList.Add(item, 0);
} }
else else
{ {
var contitionContent = JsonConvert.DeserializeObject<ConditionContent>(condition.Content)!; var conditionContent = JsonConvert.DeserializeObject<ConditionContent>(condition.Content)!;
if (ConditionHelper.IsPass(contitionContent, dataContext)) if (ConditionHelper.IsPass(conditionContent, dataContext))
{ {
matchedConfigList.Add(item); var conditionCount = ConditionHelper.GetConditionCount(conditionContent);
matchedConfigList.Add(item, conditionCount);
} }
} }
} }
@ -442,11 +443,12 @@ namespace DS.WMS.Core.TaskPlat
TaskFlowConfig? executeConfig = null; TaskFlowConfig? executeConfig = null;
if (matchedConfigList.Count == 1) if (matchedConfigList.Count == 1)
{ {
executeConfig = matchedConfigList[0]; executeConfig = matchedConfigList.First().Key;
} }
else if (matchedConfigList.Count > 1) else if (matchedConfigList.Count > 1)
{ {
executeConfig = matchedConfigList.FirstOrDefault(x => x.IsMoreMatchDefault); var maxMatchNum = matchedConfigList.OrderByDescending(x => x.Value).First().Value; // 取匹配条件数最多的一条
executeConfig = matchedConfigList.Where(x => x.Value == maxMatchNum).OrderBy(x => x.Key.Id).First().Key;
} }
if (executeConfig == null) if (executeConfig == null)
@ -481,108 +483,6 @@ namespace DS.WMS.Core.TaskPlat
return null; return null;
} }
/// <summary>
/// 根据当前节点Id，获取工作流下一个任务类型
/// </summary>
/// <param name="workFlowType">工作流流程类型</param>
/// <param name="dataContext"></param>
/// <param name="currentConfigId">当前执行的配置Id（如果为空，则返回首个任务类型）</param>
/// <returns>（下一个任务类型，下一节点Id）</returns>
public async Task<(TaskBaseTypeEnum taskType, long configId)?> GetWorkFlowNextConfig(TaskBaseTypeEnum workFlowType, TaskFlowDataContext dataContext, long? currentConfigId = null)
{
var allConfigList = await tenantDb.Queryable<TaskFlowConfig>()
.Where(t => t.MainConfigId == SqlFunc.Subqueryable<TaskFlowConfig>().Where(x => x.IsMain && x.TaskType == workFlowType.ToString()).Select(x => x.Id))
.OrderBy(t => t.Id)
.ToListAsync();
if (allConfigList.Count == 0) return null;
long configId;
if (currentConfigId == null)
{
configId = allConfigList.First(x => x.IsMain).Id;
}
else
{
configId = currentConfigId.Value;
}
List<TaskFlowConfig> waitMatchConfigList = new();
for (int i = 0; i < allConfigList.Count; i++)
{
var currentConfig = allConfigList.FirstOrDefault(x => x.Id == configId);
if (currentConfig == null || string.IsNullOrEmpty(currentConfig.NextConfigId))
return null;
var nextIds = currentConfig.NextConfigId.Split(',').Where(x => !string.IsNullOrEmpty(x)).Select(x => Convert.ToInt64(x));
waitMatchConfigList = allConfigList.Where(x => nextIds.Contains(x.Id)).ToList();
if (waitMatchConfigList.Count == 0) return null; // 如果走了这一步的return，说明配置有问题：配置了下一节点的id，但是却查不到
var configIdList = waitMatchConfigList.Select(x => x.Id);
var conditionList = await tenantDb.Queryable<TaskFlowCondition>()
.Where(x => configIdList.Contains(x.ConfigId))
.ToListAsync();
var matchedConfigList = new List<TaskFlowConfig>();
foreach (var item in waitMatchConfigList)
{
var condition = conditionList.FirstOrDefault(x => x.ConfigId == item.Id);
if (condition == null || string.IsNullOrEmpty(condition.Content))
{
matchedConfigList.Add(item);
}
else
{
var contitionContent = JsonConvert.DeserializeObject<ConditionContent>(condition.Content)!;
if (ConditionHelper.IsPass(contitionContent, dataContext))
{
matchedConfigList.Add(item);
}
}
}
TaskFlowConfig? executeConfig = null;
if (matchedConfigList.Count == 1)
{
executeConfig = matchedConfigList[0];
}
else if (matchedConfigList.Count > 1)
{
executeConfig = matchedConfigList.FirstOrDefault(x => x.IsMoreMatchDefault);
}
if (executeConfig == null)
{
executeConfig = waitMatchConfigList.FirstOrDefault(x => x.IsUnMatchDefault);
}
if (executeConfig == null)
{
// 如果最终还是没有匹配到，则需要判断情况
// 如果待匹配的分支只有1个，则继续循环判断下一节点；否则如果待匹配的分支有多个，则无法判断下一节点
if (waitMatchConfigList.Count == 1)
{
configId = waitMatchConfigList[0].Id;
continue;
}
else
{
return null;
}
}
else
{
var taskType = await tenantDb.Queryable<TaskFlowModule>().Where(x => x.Id == executeConfig.ExecuteModuleId && x.ModuleType == 2).Select(x => x.TaskType).FirstAsync();
if (taskType != null && Enum.TryParse(typeof(TaskBaseTypeEnum), taskType, out object? temp))
{
return ((TaskBaseTypeEnum)temp, executeConfig.Id);
}
}
}
return null;
}
static string WriteLog(string throwMsg, Exception ex) static string WriteLog(string throwMsg, Exception ex)
{ {
return string.Format("【自定义错误】：{0} \r\n【异常类型】：{1} \r\n【异常信息】：{2} \r\n【堆栈调用】：{3}", new object[] return string.Format("【自定义错误】：{0} \r\n【异常类型】：{1} \r\n【异常信息】：{2} \r\n【堆栈调用】：{3}", new object[]

Write Preview
Loading…
Cancel
Save