авточистка проекта

This commit is contained in:
Фролов 2021-07-21 15:29:19 +05:00
parent d0378e4f1d
commit 6abbf476b1
50 changed files with 265 additions and 311 deletions

View File

@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace AsbCloudApp.Data
namespace AsbCloudApp.Data
{
public class ClusterDto : IMapPoint
{

View File

@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace AsbCloudApp.Data
namespace AsbCloudApp.Data
{
public interface IMapPoint
{

View File

@ -1,7 +1,7 @@
using System;
using System.Collections.Generic;
using AsbCloudApp.Data;
using AsbCloudApp.Data;
using AsbCloudDb.Model;
using System;
using System.Collections.Generic;
namespace AsbCloudApp.Services
{

View File

@ -1,9 +1,5 @@
using AsbCloudApp.Data;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace AsbCloudApp.Services
{

View File

@ -1,6 +1,6 @@
using System;
using AsbCloudApp.Data;
using System;
using System.Collections.Generic;
using AsbCloudApp.Data;
namespace AsbCloudApp.Services
{

View File

@ -1,5 +1,5 @@
using System.Collections.Generic;
using AsbCloudDb.Model;
using AsbCloudDb.Model;
using System.Collections.Generic;
namespace AsbCloudApp.Services
{

View File

@ -1,6 +1,5 @@
using AsbCloudApp.Data;
using System.Collections.Generic;
using System.Security.Claims;
namespace AsbCloudApp.Services
{

View File

@ -1,5 +1,4 @@
using Microsoft.EntityFrameworkCore;
using System.Collections.Generic;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;

View File

@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace AsbCloudDb.Model
namespace AsbCloudDb.Model
{
public interface IMapPoint
{

View File

@ -1,7 +1,7 @@
using Microsoft.EntityFrameworkCore;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using System.Collections.Generic;
namespace AsbCloudDb.Model
{

View File

@ -1,5 +1,5 @@
using System;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore;
using System;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;

View File

@ -1,7 +1,6 @@
using Microsoft.EntityFrameworkCore;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using System;
using System.Text.Json.Serialization;
#nullable disable

View File

@ -1,9 +1,8 @@
using Microsoft.EntityFrameworkCore;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using System;
using System.Text.Json.Serialization;
using System.Collections.Generic;
#nullable disable
namespace AsbCloudDb.Model

View File

@ -1,9 +1,8 @@
using Microsoft.EntityFrameworkCore;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using System;
using System.Text.Json.Serialization;
using System.Collections.Generic;
#nullable disable
namespace AsbCloudDb.Model

View File

@ -1,9 +1,9 @@
using AsbSaubReport.Model;
using AsbCloudDb.Model;
using AsbSaubReport.Model;
using Microsoft.EntityFrameworkCore;
using System;
using System.Collections.Generic;
using System.Linq;
using AsbCloudDb.Model;
using Microsoft.EntityFrameworkCore;
namespace AsbSaubReport
{

View File

@ -1,10 +1,10 @@
using System;
using System.Linq;
using AsbCloudApp.Data;
using AsbCloudApp.Data;
using AsbCloudApp.Services;
using AsbCloudInfrastructure.Services.Cache;
using AsbCloudDb.Model;
using AsbCloudInfrastructure.Services.Cache;
using System;
using System.Collections.Generic;
using System.Linq;
namespace AsbCloudInfrastructure.Services
{
@ -147,10 +147,12 @@ namespace AsbCloudInfrastructure.Services
where a.IdTelemetry == telemetry.Id &&
a.IdOperation != null
join o in db.Operations on a.IdOperation equals o.Id
group a by new {
group a by new
{
Interval = Math.Floor((a.UnixDate - workBeginSeconds + timezoneOffset) / intervalSeconds),
OperationId = a.IdOperation,
o.Name } into g
o.Name
} into g
select new
{
IntervalStart = g.Min(d => d.UnixDate),
@ -159,9 +161,11 @@ namespace AsbCloudInfrastructure.Services
}).ToList();
var operationsGroupedByInterval = operations.GroupBy(op => op.IntervalStart)
.Select(o => new OperationInfoDto {
.Select(o => new OperationInfoDto
{
IntervalBegin = DateTimeOffset.FromUnixTimeSeconds(o.Key),
Operations = o.Select(opr => new OperationDetailsDto {
Operations = o.Select(opr => new OperationDetailsDto
{
OperationName = opr.OperationName,
Duration = opr.OperationsDuration
}).ToList()

View File

@ -1,6 +1,6 @@
using System;
using AsbCloudApp.Services;
using System;
using System.Collections.Concurrent;
using AsbCloudApp.Services;
namespace AsbCloudInfrastructure.Services
{

View File

@ -1,7 +1,7 @@
using System.Threading;
using System.Threading.Tasks;
using AsbCloudApp.Services;
using Microsoft.Extensions.Hosting;
using AsbCloudApp.Services;
using System.Threading;
using System.Threading.Tasks;
namespace AsbCloudInfrastructure.Services
{

View File

@ -1,5 +1,5 @@
using System;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore;
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;

View File

@ -1,5 +1,5 @@
using System;
using AsbCloudDb.Model;
using AsbCloudDb.Model;
using System;
namespace AsbCloudInfrastructure.Services
{

View File

@ -1,6 +1,6 @@
using System.Collections.Generic;
using AsbCloudDb.Model;
using System.Collections.Generic;
using System.Linq;
using AsbCloudDb.Model;
namespace AsbCloudInfrastructure.Services
{

View File

@ -1,13 +1,13 @@
using AsbCloudApp.Services;
using AsbCloudApp.Data;
using AsbCloudApp.Data;
using AsbCloudApp.Services;
using AsbCloudDb.Model;
using System;
using System.Collections.Generic;
using System.Linq;
using System.IO;
using AsbSaubReport;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Configuration;
using AsbSaubReport;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
namespace AsbCloudInfrastructure.Services
{
@ -111,7 +111,8 @@ namespace AsbCloudInfrastructure.Services
To = g.Max()
}).OrderBy(gr => gr.From).FirstOrDefault();
return new DatesRangeDto {
return new DatesRangeDto
{
From = datesRange.From,
To = datesRange.To.Year == 1 ? DateTime.MaxValue : datesRange.To
};

View File

@ -1,6 +1,6 @@
using System.Collections.Generic;
using AsbCloudApp.Services;
using AsbCloudApp.Services;
using AsbCloudDb.Model;
using System.Collections.Generic;
namespace AsbCloudInfrastructure.Services
{

View File

@ -1,7 +1,7 @@
using System;
using AsbCloudApp.Services;
using System;
using System.Collections.Generic;
using System.Linq;
using AsbCloudApp.Services;
namespace AsbCloudInfrastructure.Services
{

View File

@ -1,6 +1,6 @@
using AsbCloudApp.Data;
using AsbCloudApp.Comparators;
using AsbCloudApp.Data;
using AsbCloudApp.Services;
using AsbCloudApp.Comparators;
using AsbCloudDb.Model;
using AsbCloudInfrastructure.Services.Cache;
using System.Collections.Generic;

View File

@ -2,9 +2,9 @@
using AsbCloudApp.Services;
using AsbCloudDb.Model;
using AsbCloudInfrastructure.Services.Cache;
using System;
using System.Collections.Generic;
using System.Linq;
using System;
namespace AsbCloudInfrastructure.Services
{

View File

@ -1,13 +1,9 @@
using AsbCloudApp.Data;
using AsbCloudApp.Services;
using AsbCloudDb.Model;
using AsbCloudInfrastructure.Services.Cache;
using Microsoft.EntityFrameworkCore;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace AsbCloudInfrastructure.Services
{
@ -120,7 +116,8 @@ namespace AsbCloudInfrastructure.Services
RateOfPenetrationPlan = e.RateOfPenetrationPlan,
RouteSpeedFact = e.RouteSpeedFact,
RouteSpeedPlan = e.RouteSpeedPlan,
Sections = e.Sections.Select(s => new WellSectionDto {
Sections = e.Sections.Select(s => new WellSectionDto
{
BhaDownSpeedFact = s.BhaDownSpeedFact,
BhaDownSpeedPlan = s.BhaDownSpeedPlan,
BhaUpSpeedFact = s.BhaUpSpeedFact,

View File

@ -1,13 +1,13 @@
using System;
using AsbCloudApp.Data;
using AsbCloudApp.Services;
using AsbCloudWebApi.Controllers;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Moq;
using System;
using System.Collections.Generic;
using System.Security.Claims;
using Xunit;
using Moq;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Http;
using AsbCloudWebApi.Controllers;
using AsbCloudApp.Services;
using AsbCloudApp.Data;
namespace AsbCloudWebApi.Tests.ControllersTests
{

View File

@ -1,10 +1,10 @@
using System;
using System.Linq;
using System.Collections.Generic;
using AsbCloudApp.Data;
using AsbCloudApp.Data;
using AsbCloudApp.Services;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using System;
using System.Collections.Generic;
using System.Linq;
namespace AsbCloudWebApi.Controllers
{

View File

@ -1,12 +1,8 @@
using AsbCloudApp.Data;
using AsbCloudApp.Services;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
namespace AsbCloudWebApi.Controllers
{
@ -45,36 +41,36 @@ namespace AsbCloudWebApi.Controllers
/// <summary>
/// Получение доступных пользователю скважин
/// </summary>
/// <param name="clusterId"></param>
/// <param name="idCluster"></param>
/// <returns></returns>
[HttpGet("{clusterId}")]
[HttpGet("{idCluster}")]
[ProducesResponseType(typeof(IEnumerable<WellDto>), (int)System.Net.HttpStatusCode.OK)]
public IActionResult GetWells(int clusterId)
public IActionResult GetWells(int idCluster)
{
int? idCompany = User.GetCompanyId();
if (idCompany is null)
return Forbid();
var result = clusterService.GetWells((int)idCompany, clusterId);
var result = clusterService.GetWells((int)idCompany, idCluster);
return Ok(result);
}
/// <summary>
/// Получение обопщенной аналитики по кусту (лучшая/худшая скважина)
/// Получение обопщенной статистики по кусту (лучшая/худшая скважина)
/// </summary>
/// <param name="clusterId"></param>
/// <param name="idCluster"></param>
/// <returns></returns>
[HttpGet("{clusterId}/Analysis")]
[HttpGet("{idCluster}/Stat")]
[ProducesResponseType(typeof(IEnumerable<WellDrillingStatDto>), (int)System.Net.HttpStatusCode.OK)]
public IActionResult GetAnalysis(int clusterId)
public IActionResult GetStat(int idCluster)
{
int? idCompany = User.GetCompanyId();
if (idCompany is null)
return Forbid();
var result = clusterService.GetStat((int)idCompany, clusterId);
var result = clusterService.GetStat((int)idCompany, idCluster);
return Ok(result);
}
}

View File

@ -1,12 +1,8 @@
using AsbCloudApp.Data;
using AsbCloudApp.Services;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
namespace AsbCloudWebApi.Controllers
{

View File

@ -1,13 +1,13 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.IO;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Mvc;
using AsbCloudApp.Data;
using AsbCloudApp.Data;
using AsbCloudApp.Services;
using AsbCloudWebApi.SignalR;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.SignalR;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Threading.Tasks;
namespace AsbCloudWebApi.Controllers
{
@ -30,7 +30,8 @@ namespace AsbCloudWebApi.Controllers
}
private void HandleReportProgressAsync(float progress, string operation, int id) =>
Task.Run(()=> {
Task.Run(() =>
{
reportsHubContext.Clients.Group($"Report_{id}").SendAsync(
nameof(IReportHubClient.GetReportProgress),
new { Progress = progress, Operation = operation, ReportName = "" }
@ -38,7 +39,8 @@ namespace AsbCloudWebApi.Controllers
});
private void HandleReportNameAsync(string reportName, int groupId) =>
Task.Run(() => {
Task.Run(() =>
{
reportsHubContext.Clients.All.SendAsync(
nameof(IReportHubClient.GetReportProgress),
new { Progress = 100, Operation = "Отчет успешно создан", ReportName = reportName }

View File

@ -1,6 +1,5 @@
using AsbCloudInfrastructure.Services;
using Microsoft.AspNetCore.Authentication.JwtBearer;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.IdentityModel.Tokens;
using Microsoft.OpenApi.Models;

View File

@ -1,6 +1,6 @@
using System.Threading.Tasks;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.SignalR;
using System.Threading.Tasks;
namespace AsbCloudWebApi.SignalR
{

View File

@ -1,8 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace ConsoleApp1
{
@ -12,7 +8,8 @@ namespace ConsoleApp1
public enum RotorState { Inactive, Active }
public enum PressureState { Inactive, Active }
public enum HookWeightState { Idle, None }
public enum DrillingOperation {
public enum DrillingOperation
{
Unknown,
RotorDrilling,
SlideDrilling,

View File

@ -29,7 +29,8 @@ namespace ConsoleApp1
.UseNpgsql("Host=localhost;Database=postgres;Username=postgres;Password=q;Persist Security Info=True")
.Options;
var acfg = new MapperConfiguration(cfg => {
var acfg = new MapperConfiguration(cfg =>
{
cfg.CreateMap<DataSaubBase, DataSaubBaseDto>();
cfg.CreateMap<DataSaubBaseDto, DataSaubBase>();

View File

@ -1,12 +1,4 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Runtime.Serialization;
using System.Runtime.Serialization.Formatters.Binary;
using System.Text.Json;
namespace DataTable
namespace DataTable
{
class Program
{

View File

@ -1,8 +1,8 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Linq.Expressions;
using System.Reflection;
using System.ComponentModel;
namespace DataTable
{

View File

@ -1,9 +1,5 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace DataTable
{