Browse Source

make workflow instance return more detailed data

pull/439/head
cKey 4 years ago
parent
commit
a8439f97c4
  1. 6
      aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore/LINGYUN.Abp.WorkflowCore.csproj
  2. 30
      aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Application.Contracts/LINGYUN/Abp/WorkflowManagement/Workflows/Dto/ExecutionPointerDto.cs
  3. 9
      aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Application.Contracts/LINGYUN/Abp/WorkflowManagement/Workflows/Dto/WorkflowInstanceDto.cs
  4. 7
      aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Application/LINGYUN/Abp/WorkflowManagement/WorkflowManagementApplicationMapperProfile.cs

6
aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore/LINGYUN.Abp.WorkflowCore.csproj

@ -12,11 +12,11 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.Timing" Version="$(VoloAbpPackageVersion)" /> <PackageReference Include="Volo.Abp.Timing" Version="$(VoloAbpPackageVersion)" />
<PackageReference Include="Volo.Abp.Threading" Version="$(VoloAbpPackageVersion)" /> <PackageReference Include="Volo.Abp.Threading" Version="$(VoloAbpPackageVersion)" />
<!--<PackageReference Include="WorkflowCore.DSL" Version="3.6.1" />--> <PackageReference Include="WorkflowCore.DSL" Version="3.6.1" />
</ItemGroup> </ItemGroup>
<ItemGroup> <!--<ItemGroup>
<ProjectReference Include="..\..\..\consoles\source\src\WorkflowCore.DSL\WorkflowCore.DSL.csproj" /> <ProjectReference Include="..\..\..\consoles\source\src\WorkflowCore.DSL\WorkflowCore.DSL.csproj" />
</ItemGroup> </ItemGroup>-->
</Project> </Project>

30
aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Application.Contracts/LINGYUN/Abp/WorkflowManagement/Workflows/Dto/ExecutionPointerDto.cs

@ -0,0 +1,30 @@
using System;
using System.Collections.Generic;
namespace LINGYUN.Abp.WorkflowManagement.Workflows
{
public class ExecutionPointerDto
{
public string Id { get; set; }
public int StepId { get; set; }
public bool Active { get; set; }
public DateTime? SleepUntil { get; set; }
public object PersistenceData { get; set; }
public DateTime? StartTime { get; set; }
public DateTime? EndTime { get; set; }
public string EventName { get; set; }
public string EventKey { get; set; }
public bool EventPublished { get; set; }
public object EventData { get; set; }
public string StepName { get; set; }
public int RetryCount { get; set; }
public List<string> Children { get; set; } = new List<string>();
public object ContextItem { get; set; }
public string PredecessorId { get; set; }
public object Outcome { get; set; }
public string Status { get; set; }
public List<string> Scope { get; set; } = new List<string>();
public Dictionary<string, object> ExtensionAttributes { get; set; } = new Dictionary<string, object>();
}
}

9
aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Application.Contracts/LINGYUN/Abp/WorkflowManagement/Workflows/Dto/WorkflowInstanceDto.cs

@ -1,16 +1,19 @@
using System; using System;
using System.Collections.Generic;
namespace LINGYUN.Abp.WorkflowManagement.Workflows namespace LINGYUN.Abp.WorkflowManagement.Workflows
{ {
public class WorkflowInstanceDto public class WorkflowInstanceDto
{ {
public string WorkflowId { get; set; } public string Id { get; set; }
public object Data { get; set; } public object Data { get; set; }
public string DefinitionId { get; set; } public string DefinitionId { get; set; }
public int Version { get; set; } public int Version { get; set; }
public string Status { get; set; } public string Status { get; set; }
public string Description { get; set; }
public string Reference { get; set; } public string Reference { get; set; }
public DateTime StartTime { get; set; } public DateTime CreateTime { get; set; }
public DateTime? EndTime { get; set; } public DateTime? CompleteTime { get; set; }
public ICollection<ExecutionPointerDto> ExecutionPointers { get; set; } = new List<ExecutionPointerDto>();
} }
} }

7
aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Application/LINGYUN/Abp/WorkflowManagement/WorkflowManagementApplicationMapperProfile.cs

@ -10,14 +10,13 @@ namespace LINGYUN.Abp.WorkflowManagement
{ {
public WorkflowManagementApplicationMapperProfile() public WorkflowManagementApplicationMapperProfile()
{ {
CreateMap<ExecutionPointer, ExecutionPointerDto>()
.ForMember(dto => dto.Status, map => map.MapFrom(src => src.Status.ToString()));
CreateMap<WorkflowInstance, WorkflowInstanceDto>() CreateMap<WorkflowInstance, WorkflowInstanceDto>()
.ForMember(dto => dto.WorkflowId, map => map.MapFrom(src => src.Id.ToString()))
.ForMember(dto => dto.DefinitionId, map => map.MapFrom(src => src.Id.ToString())) .ForMember(dto => dto.DefinitionId, map => map.MapFrom(src => src.Id.ToString()))
.ForMember(dto => dto.StartTime, map => map.MapFrom(src => src.CreateTime)) .ForMember(dto => dto.Status, map => map.MapFrom(src => src.Status.ToString()));
.ForMember(dto => dto.EndTime, map => map.MapFrom(src => src.CompleteTime));
CreateMap<PendingActivity, PendingActivityDto>(); CreateMap<PendingActivity, PendingActivityDto>();
CreateMap<StepNode, StepNodeDto>(); CreateMap<StepNode, StepNodeDto>();
CreateMap<CompensateNode, StepNodeDto>(); CreateMap<CompensateNode, StepNodeDto>();
CreateMap<Workflow, WorkflowDto>() CreateMap<Workflow, WorkflowDto>()

Loading…
Cancel
Save