on.nemtina/DD.WellWorkover.Cloud
1
0
Fork 0
forked from ddrilling/AsbCloudServer
Code Pull Requests Activity

доделан сервис наработок и статистики.

Browse Source 
в контроллере доделан экшн получения списка подсистем и добавлена проверка доступа пользователя к скважине
This commit is contained in:
eugeniy_ivanov 2022-08-05 17:10:56 +05:00
parent 2c4d6a9a53
commit 1e694216a9
5 changed files with 92 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AsbCloudApp/Services/Subsystems/ISubsystemOperationTimeService.cs
View File

@ -11,7 +11,7 @@ namespace AsbCloudApp.Services.Subsystems
{ {
public interface ISubsystemOperationTimeService public interface ISubsystemOperationTimeService
{ {
Task<IEnumerable<SubsystemDto>> GetSubsystemAsync(int idWell, CancellationToken token); Task<IEnumerable<SubsystemDto>> GetSubsystemAsync(int? idWell, CancellationToken token);
Task<IEnumerable<SubsystemStatDto>> GetStatAsync(SubsystemOperationTimeRequest request, CancellationToken token); Task<IEnumerable<SubsystemStatDto>> GetStatAsync(SubsystemOperationTimeRequest request, CancellationToken token);
Task<int> DeleteAsync(SubsystemOperationTimeRequest request, CancellationToken token); Task<int> DeleteAsync(SubsystemOperationTimeRequest request, CancellationToken token);
Task<IEnumerable<SubsystemOperationTimeDto>> GetOperationTimeAsync(SubsystemOperationTimeRequest request, CancellationToken token); Task<IEnumerable<SubsystemOperationTimeDto>> GetOperationTimeAsync(SubsystemOperationTimeRequest request, CancellationToken token);

6
AsbCloudInfrastructure/DependencyInjection.cs
View File

@ -123,7 +123,7 @@ namespace AsbCloudInfrastructure
services.AddTransient<IDrillerService, DrillerService>(); services.AddTransient<IDrillerService, DrillerService>();
services.AddTransient<IScheduleService, ScheduleService>(); services.AddTransient<IScheduleService, ScheduleService>();
services.AddTransient<IOperationValueService, OperationValueService>(); services.AddTransient<IOperationValueService, OperationValueService>();
//services.AddTransient<ISubsystemOperationTimeService, SubsystemOperationTimeService>(); services.AddTransient<ISubsystemOperationTimeService, SubsystemOperationTimeService>();
// admin crud services: // admin crud services:
services.AddTransient<ICrudService<TelemetryDto>, CrudServiceBase<TelemetryDto, Telemetry>>(s => services.AddTransient<ICrudService<TelemetryDto>, CrudServiceBase<TelemetryDto, Telemetry>>(s =>
@ -139,6 +139,10 @@ namespace AsbCloudInfrastructure
new CrudCacheServiceBase<CompanyDto, Company>( new CrudCacheServiceBase<CompanyDto, Company>(
s.GetService<IAsbCloudDbContext>(), s.GetService<IAsbCloudDbContext>(),
dbSet => dbSet.Include(c => c.CompanyType))); dbSet => dbSet.Include(c => c.CompanyType)));
services.AddTransient<ICrudService<CompanyTypeDto>, CrudCacheServiceBase<CompanyTypeDto, CompanyType>>(); services.AddTransient<ICrudService<CompanyTypeDto>, CrudCacheServiceBase<CompanyTypeDto, CompanyType>>();
services.AddTransient<ICrudService<ClusterDto>, CrudCacheServiceBase<ClusterDto, Cluster>>(s => services.AddTransient<ICrudService<ClusterDto>, CrudCacheServiceBase<ClusterDto, Cluster>>(s =>
new CrudCacheServiceBase<ClusterDto, Cluster>( new CrudCacheServiceBase<ClusterDto, Cluster>(

14
AsbCloudInfrastructure/Services/Subsystems/SubsystemOperationTimeBackgroundService.cs
View File

@ -127,13 +127,13 @@ namespace AsbCloudInfrastructure.Services.Subsystems
float? depthStart = firstItem.Depth; float? depthStart = firstItem.Depth;
var resultSubsystemOperationTime = new List<SubsystemOperationTime>(); var resultSubsystemOperationTime = new List<SubsystemOperationTime>();
var data = await query var data = await query
.Where(d => d.DateTime > startDate) .Where(d => d.DateTime > startDate)
.Take(take) .Take(take)
.ToArrayAsync(token); .ToArrayAsync(token);
for(int i = 1;i<=data.Length ;i++) for (int i = 1; i < data.Length; i++)
{ {
if( data[i].Mode!= mode) if (data[i].Mode != mode)
{ {
var operationTimeItem = new SubsystemOperationTime() var operationTimeItem = new SubsystemOperationTime()
{ {
@ -187,7 +187,7 @@ namespace AsbCloudInfrastructure.Services.Subsystems
.Take(take) .Take(take)
.ToArrayAsync(token); .ToArrayAsync(token);
for (int i = 1; i <= data.Length; i++) for (int i = 1; i < data.Length; i++)
{ {
if (data[i].Mode != mode) if (data[i].Mode != mode)
{ {

62
AsbCloudInfrastructure/Services/Subsystems/SubsystemOperationTimeService.cs
View File

@ -5,6 +5,7 @@ using AsbCloudApp.Services.Subsystems;
using AsbCloudDb; using AsbCloudDb;
using AsbCloudDb.Model; using AsbCloudDb.Model;
using AsbCloudDb.Model.Subsystems; using AsbCloudDb.Model.Subsystems;
using AsbCloudInfrastructure.Repository;
using Mapster; using Mapster;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using System; using System;
@ -21,33 +22,48 @@ namespace AsbCloudInfrastructure.Services.Subsystems
private readonly IAsbCloudDbContext db; private readonly IAsbCloudDbContext db;
private readonly IWellService wellService; private readonly IWellService wellService;
private readonly SubsystemService subsystemService; private readonly ICrudService<SubsystemDto> subsystemService;
public SubsystemOperationTimeService(IAsbCloudDbContext db, IWellService wellService, SubsystemService subsystemService)
public SubsystemOperationTimeService(IAsbCloudDbContext db, IWellService wellService, ICrudService<SubsystemDto> subsystemService)
{ {
this.db = db; this.db = db;
this.wellService = wellService; this.wellService = wellService;
this.subsystemService = subsystemService; this.subsystemService = subsystemService;
} }
public async Task <IEnumerable<SubsystemDto>> GetSubsystemAsync(int idWell, CancellationToken token) private async Task<IEnumerable<SubsystemDto>> GetSubsystemAsync(int idWell, CancellationToken token)
{ {
var well = await wellService.GetOrDefaultAsync(idWell, token); var well = await wellService.GetOrDefaultAsync(idWell, token);
if (well?.IdTelemetry is null || well.Timezone is null) if (well?.IdTelemetry is null || well.Timezone is null)
return null; return null;
var wellSubsystem = db.SubsystemOperationTimes var wellSubsystem = await db.SubsystemOperationTimes
.Include(e=>e.Subsystem) .Include(e => e.Subsystem)
.AsNoTracking() .AsNoTracking()
.Where(o => o.IdTelemetry == well.IdTelemetry) .Where(o => o.IdTelemetry == well.IdTelemetry)
.DistinctBy(o => o.IdSubsystem) .DistinctBy(o => o.IdSubsystem)
.Select(d => new SubsystemDto .Select(d => new SubsystemDto
{ {
Id = d.Subsystem.Id, Id = d.Subsystem.Id,
Name = d.Subsystem.Name, Name = d.Subsystem.Name,
Description = d.Subsystem.Description, Description = d.Subsystem.Description,
})
.ToListAsync(token);
return wellSubsystem;
}
public async Task<IEnumerable<SubsystemDto>> GetSubsystemAsync(int? idWell, CancellationToken token)
{
if (idWell is null)
{
var subsystem = await subsystemService.GetAllAsync(token);
return subsystem;
}
var subsystemWell = await GetSubsystemAsync(idWell, token);
return subsystemWell;
});
return wellSubsystem;
} }
@ -119,20 +135,24 @@ namespace AsbCloudInfrastructure.Services.Subsystems
private IEnumerable<SubsystemStatDto> CalcStat(IEnumerable<SubsystemOperationTimeDto> groupedData, SubsystemOperationTimeRequest request) private IEnumerable<SubsystemStatDto> CalcStat(IEnumerable<SubsystemOperationTimeDto> groupedData, SubsystemOperationTimeRequest request)
{ {
var result = new List<SubsystemStatDto>(); var result = new List<SubsystemStatDto>();
var groupedDataSubsystems = groupedData
.GroupBy(x => x.IdSubsystem);
var periodGroupTotal = groupedData var periodGroupTotal = groupedData
.GroupBy(x => x.IdSubsystem) .GroupBy(x => x.IdSubsystem)
.Sum(g => g.Sum(o=> (o.DateEnd - o.DateStart).TotalHours)); .Sum(g => g.Sum(o=> (o.DateEnd - o.DateStart).TotalHours));
foreach (IEnumerable<SubsystemOperationTime> item in groupedData) foreach (var item in groupedDataSubsystems)
{ {
var periodGroup = item.Sum(g => (g.DateEnd - g.DateStart).TotalHours); var periodGroup = item.Sum(g => (g.DateEnd - g.DateStart).TotalHours);
var periodRequest = item.Where(o => o.DateStart==request.GtDate & o.DateEnd == request.LtDate) var gtDate = request.GtDate ?? item.Min(d => d.DateStart);
var ltDate = request.LtDate ?? item.Max(d => d.DateEnd);
var periodRequest = item.Where(o => o.DateStart>=gtDate && o.DateEnd <= ltDate)
.Sum(o => (o.DateEnd - o.DateStart).TotalHours); .Sum(o => (o.DateEnd - o.DateStart).TotalHours);
int idSubsystem = item.First().IdSubsystem; int idSubsystem = item.First().IdSubsystem;
var subsystemStat = new SubsystemStatDto() var subsystemStat = new SubsystemStatDto()
{ {
IdSubsystem = idSubsystem, IdSubsystem = idSubsystem,
Subsystem = subsystemService.GetOrDefault(idSubsystem)?.Name ?? "unknown", Subsystem = subsystemService.GetOrDefault(idSubsystem)?.Name ?? "unknown",
//Subsystem = db.Subsystems.Where(n => n.Id == idSubsystem).FirstOrDefault()?.Name ?? "unknown",
UsedTimeHours = TimeSpan.FromHours(periodGroup), UsedTimeHours = TimeSpan.FromHours(periodGroup),
KUsage = 1d*periodGroup / periodRequest, KUsage = 1d*periodGroup / periodRequest,
K2 = 1d*periodGroup / periodGroupTotal, K2 = 1d*periodGroup / periodGroupTotal,

37
AsbCloudWebApi/Controllers/Subsystems/SubsystemOperationTimeController.cs
View File

@ -20,9 +20,13 @@ namespace AsbCloudWebApi.Controllers.Subsystems
public class SubsystemOperationTimeController : ControllerBase public class SubsystemOperationTimeController : ControllerBase
{ {
private readonly ISubsystemOperationTimeService subsystemOperationTimeService; private readonly ISubsystemOperationTimeService subsystemOperationTimeService;
public SubsystemOperationTimeController(ISubsystemOperationTimeService subsystemOperationTimeService) private readonly ICrudService<SubsystemDto> subsystemService;
private readonly IWellService wellService;
public SubsystemOperationTimeController(ISubsystemOperationTimeService subsystemOperationTimeService, ICrudService<SubsystemDto> subsystemService, IWellService wellService)
{ {
this.subsystemOperationTimeService = subsystemOperationTimeService; this.subsystemOperationTimeService = subsystemOperationTimeService;
this.subsystemService = subsystemService;
this.wellService = wellService;
} }
/// <summary> /// <summary>
/// получить статистику /// получить статистику
@ -31,6 +35,8 @@ namespace AsbCloudWebApi.Controllers.Subsystems
[ProducesResponseType(typeof(IEnumerable<SubsystemStatDto>), (int)System.Net.HttpStatusCode.OK)] [ProducesResponseType(typeof(IEnumerable<SubsystemStatDto>), (int)System.Net.HttpStatusCode.OK)]
public async Task<IActionResult> GetStatAsync([FromQuery] SubsystemOperationTimeRequest request, CancellationToken token = default) public async Task<IActionResult> GetStatAsync([FromQuery] SubsystemOperationTimeRequest request, CancellationToken token = default)
{ {
if (!await UserHasAccesToWellAsync(request.IdWell, token))
return Forbid();
var subsystemResult = await subsystemOperationTimeService.GetStatAsync(request, token); var subsystemResult = await subsystemOperationTimeService.GetStatAsync(request, token);
return Ok(subsystemResult); return Ok(subsystemResult);
} }
@ -40,16 +46,14 @@ namespace AsbCloudWebApi.Controllers.Subsystems
/// </summary> /// </summary>
[HttpGet("subsystem")] [HttpGet("subsystem")]
[ProducesResponseType(typeof(IEnumerable<SubsystemDto>), (int)System.Net.HttpStatusCode.OK)] [ProducesResponseType(typeof(IEnumerable<SubsystemDto>), (int)System.Net.HttpStatusCode.OK)]
public async Task<IActionResult> GetSubsystemAsync([FromQuery] int idWell, CancellationToken token = default) public async Task<IActionResult> GetSubsystemAsync([FromQuery] int? idWell, CancellationToken token = default)
{ {
if (idWell != null) if (idWell.HasValue)
{ if (!await UserHasAccesToWellAsync(idWell.Value, token))
var resultIdWell = await subsystemOperationTimeService.GetSubsystemAsync(idWell, token); return Forbid();
return Ok(resultIdWell);
}
var result = await subsystemOperationTimeService.GetSubsystemAsync(idWell, token);
return Ok(result);
var result = await subsystemOperationTimeService.GetSubsystemAsync(idWell, token);
return Ok(result);
} }
/// <summary> /// <summary>
@ -57,10 +61,13 @@ namespace AsbCloudWebApi.Controllers.Subsystems
/// </summary> /// </summary>
[HttpGet("operationTime")] [HttpGet("operationTime")]
[ProducesResponseType(typeof(IEnumerable<SubsystemOperationTimeDto>), (int)System.Net.HttpStatusCode.OK)] [ProducesResponseType(typeof(IEnumerable<SubsystemOperationTimeDto>), (int)System.Net.HttpStatusCode.OK)]
public async Task<IActionResult> GetOperationTimeAsync( public async Task<IActionResult> GetOperationTimeAsync(
[FromQuery] SubsystemOperationTimeRequest request, [FromQuery] SubsystemOperationTimeRequest request,
CancellationToken token = default) CancellationToken token = default)
{ {
if (!await UserHasAccesToWellAsync(request.IdWell, token))
return Forbid();
var result = await subsystemOperationTimeService.GetOperationTimeAsync(request, token); var result = await subsystemOperationTimeService.GetOperationTimeAsync(request, token);
return Ok(result); return Ok(result);
} }
@ -78,8 +85,20 @@ namespace AsbCloudWebApi.Controllers.Subsystems
[FromQuery] SubsystemOperationTimeRequest request, [FromQuery] SubsystemOperationTimeRequest request,
CancellationToken token) CancellationToken token)
{ {
if (!await UserHasAccesToWellAsync(request.IdWell, token))
return Forbid();
var result = await subsystemOperationTimeService.DeleteAsync(request, token); var result = await subsystemOperationTimeService.DeleteAsync(request, token);
return Ok(result); return Ok(result);
} }
protected async Task<bool> UserHasAccesToWellAsync(int idWell, CancellationToken token)
{
var idCompany = User.GetCompanyId();
if (idCompany is not null &&
await wellService.IsCompanyInvolvedInWellAsync((int)idCompany, idWell, token)
.ConfigureAwait(false))
return true;
return false;
}
} }
} }