tsai
/
abp-next-admin
mirror of https://github.com/colinin/abp-next-admin.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

clean up excess code

5.0.0-rc.2
cKey 4 years ago
parent
7d5d2efae9
commit
45db3fb663
2 changed files with 0 additions and 64 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 62
      aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore.Persistence/LINGYUN/Abp/WorkflowCore/Persistence/AbpWorkflowPersistenceProvider.cs
  2. 2
      aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore.RabbitMQ/LINGYUN/Abp/WorkflowCore/RabbitMQ/AbpWorkflowCoreRabbitMQModule.cs

62
aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore.Persistence/LINGYUN/Abp/WorkflowCore/Persistence/AbpWorkflowPersistenceProvider.cs
View File

@ -2,7 +2,6 @@
using Microsoft.Extensions.Logging.Abstractions; using Microsoft.Extensions.Logging.Abstractions;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Data;
using System.Linq; using System.Linq;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
@ -21,7 +20,6 @@ namespace LINGYUN.Abp.WorkflowCore.Persistence
private readonly ICurrentTenant _currentTenant; private readonly ICurrentTenant _currentTenant;
private readonly IGuidGenerator _guidGenerator; private readonly IGuidGenerator _guidGenerator;
//private readonly IUnitOfWorkManager _unitOfWorkManager;
private readonly IWorkflowRepository _workflowRepository; private readonly IWorkflowRepository _workflowRepository;
private readonly IWorkflowEventRepository _workflowEventRepository; private readonly IWorkflowEventRepository _workflowEventRepository;
private readonly IWorkflowExecutionErrorRepository _executionErrorRepository; private readonly IWorkflowExecutionErrorRepository _executionErrorRepository;
@ -35,7 +33,6 @@ namespace LINGYUN.Abp.WorkflowCore.Persistence
public AbpWorkflowPersistenceProvider( public AbpWorkflowPersistenceProvider(
ICurrentTenant currentTenant, ICurrentTenant currentTenant,
IGuidGenerator guidGenerator, IGuidGenerator guidGenerator,
//IUnitOfWorkManager unitOfWorkManager,
IAsyncQueryableExecuter asyncQueryableExecuter, IAsyncQueryableExecuter asyncQueryableExecuter,
IWorkflowRepository workflowRepository, IWorkflowRepository workflowRepository,
IWorkflowEventRepository workflowEventRepository, IWorkflowEventRepository workflowEventRepository,
@ -45,7 +42,6 @@ namespace LINGYUN.Abp.WorkflowCore.Persistence
{ {
_currentTenant = currentTenant; _currentTenant = currentTenant;
_guidGenerator = guidGenerator; _guidGenerator = guidGenerator;
//_unitOfWorkManager = unitOfWorkManager;
_asyncQueryableExecuter = asyncQueryableExecuter; _asyncQueryableExecuter = asyncQueryableExecuter;
_workflowRepository = workflowRepository; _workflowRepository = workflowRepository;
@ -62,8 +58,6 @@ namespace LINGYUN.Abp.WorkflowCore.Persistence
string token, string token,
CancellationToken cancellationToken = default) CancellationToken cancellationToken = default)
{ {
//using var unitOfWork = _unitOfWorkManager.Begin();
var uid = Guid.Parse(eventSubscriptionId); var uid = Guid.Parse(eventSubscriptionId);
var existingEntity = await _subscriptionRepository.GetAsync(uid, cancellationToken: cancellationToken); var existingEntity = await _subscriptionRepository.GetAsync(uid, cancellationToken: cancellationToken);
@ -73,22 +67,16 @@ namespace LINGYUN.Abp.WorkflowCore.Persistence
existingEntity.SetSubscriptionToken(null, null, null); existingEntity.SetSubscriptionToken(null, null, null);
await _subscriptionRepository.UpdateAsync(existingEntity, cancellationToken: cancellationToken); await _subscriptionRepository.UpdateAsync(existingEntity, cancellationToken: cancellationToken);
//await unitOfWork.SaveChangesAsync();
} }
public virtual async Task<string> CreateEvent( public virtual async Task<string> CreateEvent(
Event newEvent, Event newEvent,
CancellationToken cancellationToken = default) CancellationToken cancellationToken = default)
{ {
//using var unitOfWork = _unitOfWorkManager.Begin();
var we = newEvent.ToPersistable(_guidGenerator, _currentTenant); var we = newEvent.ToPersistable(_guidGenerator, _currentTenant);
await _workflowEventRepository.InsertAsync(we, cancellationToken: cancellationToken); await _workflowEventRepository.InsertAsync(we, cancellationToken: cancellationToken);
//await unitOfWork.SaveChangesAsync();
newEvent.Id = we.Id.ToString(); newEvent.Id = we.Id.ToString();
return newEvent.Id; return newEvent.Id;
@ -98,14 +86,10 @@ namespace LINGYUN.Abp.WorkflowCore.Persistence
EventSubscription subscription, EventSubscription subscription,
CancellationToken cancellationToken = default) CancellationToken cancellationToken = default)
{ {
//using var unitOfWork = _unitOfWorkManager.Begin();
var wes = subscription.ToPersistable(_guidGenerator, _currentTenant); var wes = subscription.ToPersistable(_guidGenerator, _currentTenant);
await _subscriptionRepository.InsertAsync(wes, cancellationToken: cancellationToken); await _subscriptionRepository.InsertAsync(wes, cancellationToken: cancellationToken);
//await unitOfWork.SaveChangesAsync();
subscription.Id = wes.Id.ToString(); subscription.Id = wes.Id.ToString();
return subscription.Id; return subscription.Id;
@ -115,14 +99,10 @@ namespace LINGYUN.Abp.WorkflowCore.Persistence
WorkflowInstance workflow, WorkflowInstance workflow,
CancellationToken cancellationToken = default) CancellationToken cancellationToken = default)
{ {
//using var unitOfWork = _unitOfWorkManager.Begin();
var wf = workflow.ToPersistable(_guidGenerator, _currentTenant); var wf = workflow.ToPersistable(_guidGenerator, _currentTenant);
await _workflowRepository.InsertAsync(wf, cancellationToken: cancellationToken); await _workflowRepository.InsertAsync(wf, cancellationToken: cancellationToken);
//await unitOfWork.SaveChangesAsync();
workflow.Id = wf.Id.ToString(); workflow.Id = wf.Id.ToString();
return workflow.Id; return workflow.Id;
@ -133,7 +113,6 @@ namespace LINGYUN.Abp.WorkflowCore.Persistence
// TODO: // TODO:
} }
//[UnitOfWork]
public virtual async Task<Event> GetEvent(string id, CancellationToken cancellationToken = default) public virtual async Task<Event> GetEvent(string id, CancellationToken cancellationToken = default)
{ {
var eventId = Guid.Parse(id); var eventId = Guid.Parse(id);
@ -143,7 +122,6 @@ namespace LINGYUN.Abp.WorkflowCore.Persistence
return workflowEvent.ToEvent(); return workflowEvent.ToEvent();
} }
//[UnitOfWork]
public virtual async Task<IEnumerable<string>> GetEvents( public virtual async Task<IEnumerable<string>> GetEvents(
string eventName, string eventName,
string eventKey, string eventKey,
@ -160,7 +138,6 @@ namespace LINGYUN.Abp.WorkflowCore.Persistence
return workflowEventIds.Select(e => e.ToString()); return workflowEventIds.Select(e => e.ToString());
} }
//[UnitOfWork]
public virtual async Task<EventSubscription> GetFirstOpenSubscription( public virtual async Task<EventSubscription> GetFirstOpenSubscription(
string eventName, string eventName,
string eventKey, string eventKey,
@ -175,7 +152,6 @@ namespace LINGYUN.Abp.WorkflowCore.Persistence
return workflowEventSubscription?.ToEventSubscription(); return workflowEventSubscription?.ToEventSubscription();
} }
//[UnitOfWork]
public virtual async Task<IEnumerable<string>> GetRunnableEvents( public virtual async Task<IEnumerable<string>> GetRunnableEvents(
DateTime asAt, DateTime asAt,
CancellationToken cancellationToken = default) CancellationToken cancellationToken = default)
@ -193,7 +169,6 @@ namespace LINGYUN.Abp.WorkflowCore.Persistence
return workflowEventIdList.Select(e => e.ToString()); return workflowEventIdList.Select(e => e.ToString());
} }
//[UnitOfWork]
public virtual async Task<IEnumerable<string>> GetRunnableInstances( public virtual async Task<IEnumerable<string>> GetRunnableInstances(
DateTime asAt, DateTime asAt,
CancellationToken cancellationToken = default) CancellationToken cancellationToken = default)
@ -209,7 +184,6 @@ namespace LINGYUN.Abp.WorkflowCore.Persistence
return workflowIdList.Select(e => e.ToString()); return workflowIdList.Select(e => e.ToString());
} }
//[UnitOfWork]
public virtual async Task<EventSubscription> GetSubscription( public virtual async Task<EventSubscription> GetSubscription(
string eventSubscriptionId, string eventSubscriptionId,
CancellationToken cancellationToken = default) CancellationToken cancellationToken = default)
@ -220,7 +194,6 @@ namespace LINGYUN.Abp.WorkflowCore.Persistence
return subscription?.ToEventSubscription(); return subscription?.ToEventSubscription();
} }
//[UnitOfWork]
public virtual async Task<IEnumerable<EventSubscription>> GetSubscriptions( public virtual async Task<IEnumerable<EventSubscription>> GetSubscriptions(
string eventName, string eventName,
string eventKey, string eventKey,
@ -236,7 +209,6 @@ namespace LINGYUN.Abp.WorkflowCore.Persistence
return eventSubscriptions.Select(x => x.ToEventSubscription()); return eventSubscriptions.Select(x => x.ToEventSubscription());
} }
[UnitOfWork(true, IsolationLevel.ReadUncommitted)]
public virtual async Task<WorkflowInstance> GetWorkflowInstance( public virtual async Task<WorkflowInstance> GetWorkflowInstance(
string Id, string Id,
CancellationToken cancellationToken = default) CancellationToken cancellationToken = default)
@ -250,7 +222,6 @@ namespace LINGYUN.Abp.WorkflowCore.Persistence
return workflow?.ToWorkflowInstance(); return workflow?.ToWorkflowInstance();
} }
//[UnitOfWork]
public virtual async Task<IEnumerable<WorkflowInstance>> GetWorkflowInstances( public virtual async Task<IEnumerable<WorkflowInstance>> GetWorkflowInstances(
WorkflowStatus? status, WorkflowStatus? status,
string type, string type,
@ -264,7 +235,6 @@ namespace LINGYUN.Abp.WorkflowCore.Persistence
return workflows.Select(x => x.ToWorkflowInstance()); return workflows.Select(x => x.ToWorkflowInstance());
} }
//[UnitOfWork]
public virtual async Task<IEnumerable<WorkflowInstance>> GetWorkflowInstances( public virtual async Task<IEnumerable<WorkflowInstance>> GetWorkflowInstances(
IEnumerable<string> ids, IEnumerable<string> ids,
CancellationToken cancellationToken = default) CancellationToken cancellationToken = default)
@ -281,50 +251,36 @@ namespace LINGYUN.Abp.WorkflowCore.Persistence
public virtual async Task MarkEventProcessed(string id, CancellationToken cancellationToken = default) public virtual async Task MarkEventProcessed(string id, CancellationToken cancellationToken = default)
{ {
//using var unitOfWork = _unitOfWorkManager.Begin();
var eventId = Guid.Parse(id); var eventId = Guid.Parse(id);
var workflowEvent = await _workflowEventRepository.GetAsync(eventId, cancellationToken: cancellationToken); var workflowEvent = await _workflowEventRepository.GetAsync(eventId, cancellationToken: cancellationToken);
workflowEvent.IsProcessed = true; workflowEvent.IsProcessed = true;
await _workflowEventRepository.UpdateAsync(workflowEvent, cancellationToken: cancellationToken); await _workflowEventRepository.UpdateAsync(workflowEvent, cancellationToken: cancellationToken);
//await unitOfWork.SaveChangesAsync(cancellationToken);
} }
public virtual async Task MarkEventUnprocessed(string id, CancellationToken cancellationToken = default) public virtual async Task MarkEventUnprocessed(string id, CancellationToken cancellationToken = default)
{ {
//using var unitOfWork = _unitOfWorkManager.Begin();
var eventId = Guid.Parse(id); var eventId = Guid.Parse(id);
var workflowEvent = await _workflowEventRepository.GetAsync(eventId, cancellationToken: cancellationToken); var workflowEvent = await _workflowEventRepository.GetAsync(eventId, cancellationToken: cancellationToken);
workflowEvent.IsProcessed = false; workflowEvent.IsProcessed = false;
await _workflowEventRepository.UpdateAsync(workflowEvent, cancellationToken: cancellationToken); await _workflowEventRepository.UpdateAsync(workflowEvent, cancellationToken: cancellationToken);
//await unitOfWork.SaveChangesAsync(cancellationToken);
} }
public virtual async Task PersistErrors(IEnumerable<ExecutionError> errors, CancellationToken cancellationToken = default) public virtual async Task PersistErrors(IEnumerable<ExecutionError> errors, CancellationToken cancellationToken = default)
{ {
if (errors.Any()) if (errors.Any())
{ {
//using var unitOfWork = _unitOfWorkManager.Begin();
var workflowExecutionErrors = errors.Select(x => x.ToPersistable(_currentTenant)); var workflowExecutionErrors = errors.Select(x => x.ToPersistable(_currentTenant));
await _executionErrorRepository.InsertManyAsync(workflowExecutionErrors, cancellationToken: cancellationToken); await _executionErrorRepository.InsertManyAsync(workflowExecutionErrors, cancellationToken: cancellationToken);
//await unitOfWork.SaveChangesAsync(cancellationToken);
} }
} }
public virtual async Task PersistWorkflow(WorkflowInstance workflow, CancellationToken cancellationToken = default) public virtual async Task PersistWorkflow(WorkflowInstance workflow, CancellationToken cancellationToken = default)
{ {
//using var unitOfWork = _unitOfWorkManager.Begin();
if (!Guid.TryParse(workflow.Id, out Guid workflowId)) if (!Guid.TryParse(workflow.Id, out Guid workflowId))
{ {
workflowId = _guidGenerator.Create(); workflowId = _guidGenerator.Create();
@ -343,8 +299,6 @@ namespace LINGYUN.Abp.WorkflowCore.Persistence
await _workflowRepository.UpdateAsync(wf, cancellationToken: cancellationToken); await _workflowRepository.UpdateAsync(wf, cancellationToken: cancellationToken);
} }
//await unitOfWork.SaveChangesAsync(cancellationToken);
} }
public virtual async Task ProcessCommands( public virtual async Task ProcessCommands(
@ -354,8 +308,6 @@ namespace LINGYUN.Abp.WorkflowCore.Persistence
{ {
try try
{ {
//using var unitOfWork = _unitOfWorkManager.Begin();
var quertable = await _scheduledCommandRepository.GetQueryableAsync(); var quertable = await _scheduledCommandRepository.GetQueryableAsync();
var commands = await _asyncQueryableExecuter.ToListAsync( var commands = await _asyncQueryableExecuter.ToListAsync(
quertable.Where(x => x.ExecuteTime < asOf.UtcDateTime.Ticks), quertable.Where(x => x.ExecuteTime < asOf.UtcDateTime.Ticks),
@ -367,8 +319,6 @@ namespace LINGYUN.Abp.WorkflowCore.Persistence
} }
await _scheduledCommandRepository.DeleteManyAsync(commands, cancellationToken: cancellationToken); await _scheduledCommandRepository.DeleteManyAsync(commands, cancellationToken: cancellationToken);
//await unitOfWork.SaveChangesAsync(cancellationToken);
} }
catch(Exception ex) catch(Exception ex)
{ {
@ -381,13 +331,9 @@ namespace LINGYUN.Abp.WorkflowCore.Persistence
{ {
if (!await _scheduledCommandRepository.CheckExistsAsync(command.CommandName, command.Data)) if (!await _scheduledCommandRepository.CheckExistsAsync(command.CommandName, command.Data))
{ {
//using var unitOfWork = _unitOfWorkManager.Begin();
var workflowCommand = command.ToPersistable(_currentTenant); var workflowCommand = command.ToPersistable(_currentTenant);
await _scheduledCommandRepository.InsertAsync(workflowCommand); await _scheduledCommandRepository.InsertAsync(workflowCommand);
//await unitOfWork.SaveChangesAsync();
} }
} }
@ -400,16 +346,12 @@ namespace LINGYUN.Abp.WorkflowCore.Persistence
{ {
var uid = Guid.Parse(eventSubscriptionId); var uid = Guid.Parse(eventSubscriptionId);
//using var unitOfWork = _unitOfWorkManager.Begin();
var existingEntity = await _subscriptionRepository.GetAsync(uid, cancellationToken: cancellationToken); var existingEntity = await _subscriptionRepository.GetAsync(uid, cancellationToken: cancellationToken);
existingEntity.SetSubscriptionToken(token, workerId, expiry); existingEntity.SetSubscriptionToken(token, workerId, expiry);
await _subscriptionRepository.UpdateAsync(existingEntity, cancellationToken: cancellationToken); await _subscriptionRepository.UpdateAsync(existingEntity, cancellationToken: cancellationToken);
//await unitOfWork.SaveChangesAsync(cancellationToken);
return true; return true;
} }
@ -419,13 +361,9 @@ namespace LINGYUN.Abp.WorkflowCore.Persistence
{ {
var uid = Guid.Parse(eventSubscriptionId); var uid = Guid.Parse(eventSubscriptionId);
//using var unitOfWork = _unitOfWorkManager.Begin();
var existingEntity = await _subscriptionRepository.GetAsync(uid, cancellationToken: cancellationToken); var existingEntity = await _subscriptionRepository.GetAsync(uid, cancellationToken: cancellationToken);
await _subscriptionRepository.DeleteAsync(existingEntity, cancellationToken: cancellationToken); await _subscriptionRepository.DeleteAsync(existingEntity, cancellationToken: cancellationToken);
//await unitOfWork.SaveChangesAsync(cancellationToken);
} }
} }
} }

2
aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore.RabbitMQ/LINGYUN/Abp/WorkflowCore/RabbitMQ/AbpWorkflowCoreRabbitMQModule.cs
View File

@ -1,10 +1,8 @@
using Volo.Abp.Modularity; using Volo.Abp.Modularity;
using Volo.Abp.RabbitMQ; using Volo.Abp.RabbitMQ;
using Volo.Abp.Uow;
namespace LINGYUN.Abp.WorkflowCore.RabbitMQ namespace LINGYUN.Abp.WorkflowCore.RabbitMQ
{ {
[DependsOn(typeof(AbpUnitOfWorkModule))]
[DependsOn(typeof(AbpRabbitMqModule))] [DependsOn(typeof(AbpRabbitMqModule))]
[DependsOn(typeof(AbpWorkflowCoreModule))] [DependsOn(typeof(AbpWorkflowCoreModule))]
public class AbpWorkflowCoreRabbitMQModule : AbpModule public class AbpWorkflowCoreRabbitMQModule : AbpModule

Write Preview
Loading…
Cancel
Save