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

merge dev to .

Browse Source
This commit is contained in:
Frolov-Nikita 2024-01-21 12:25:50 +05:00
commit 35df48f95a
No known key found for this signature in database
GPG Key ID: 719E3386D12B0760
10 changed files with 46 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
AsbCloudApp/Data/SAUB/TelemetryDataSaubDto.cs
View File

@ -25,7 +25,8 @@ namespace AsbCloudApp.Data.SAUB
/// 6 - "ПОДЪЕМ С ПРОРАБОТКОЙ" /// 6 - "ПОДЪЕМ С ПРОРАБОТКОЙ"
/// 10 - "БЛОКИРОВКА" /// 10 - "БЛОКИРОВКА"
/// </summary> /// </summary>
public short? Mode { get; set; } [Required]
public short Mode { get; set; }
/// <summary> /// <summary>
/// telemetry id /// telemetry id
@ -40,17 +41,17 @@ namespace AsbCloudApp.Data.SAUB
/// <summary> /// <summary>
/// Глубина забоя, м /// Глубина забоя, м
/// </summary> /// </summary>
public float? WellDepth { get; set; } public float WellDepth { get; set; }
/// <summary> /// <summary>
/// Глубина долота, м /// Глубина долота, м
/// </summary> /// </summary>
public float? BitDepth { get; set; } public float BitDepth { get; set; }
/// <summary> /// <summary>
/// Талевый блок. Положение, м /// Талевый блок. Положение, м
/// </summary> /// </summary>
public float? BlockPosition { get; set; } public float BlockPosition { get; set; }
/// <summary> /// <summary>
/// Талевый блок. Мин положение, м /// Талевый блок. Мин положение, м
@ -90,7 +91,7 @@ namespace AsbCloudApp.Data.SAUB
/// <summary> /// <summary>
/// Давление, атм /// Давление, атм
/// </summary> /// </summary>
public float? Pressure { get; set; } public float Pressure { get; set; }
/// <summary> /// <summary>
/// Давление при холостом ходе, атм /// Давление при холостом ходе, атм
@ -125,7 +126,7 @@ namespace AsbCloudApp.Data.SAUB
/// <summary> /// <summary>
/// осевая нагрузка, т /// осевая нагрузка, т
/// </summary> /// </summary>
public float? AxialLoad { get; set; } public float AxialLoad { get; set; }
/// <summary> /// <summary>
/// задание осевой нагрузки, т /// задание осевой нагрузки, т
@ -140,7 +141,7 @@ namespace AsbCloudApp.Data.SAUB
/// <summary> /// <summary>
/// Вес на крюке, т /// Вес на крюке, т
/// </summary> /// </summary>
public float? HookWeight { get; set; } public float HookWeight { get; set; }
/// <summary> /// <summary>
/// Вес на крюке на х.х., т /// Вес на крюке на х.х., т
@ -160,7 +161,7 @@ namespace AsbCloudApp.Data.SAUB
/// <summary> /// <summary>
/// момент ротора, кН*м /// момент ротора, кН*м
/// </summary> /// </summary>
public float? RotorTorque { get; set; } public float RotorTorque { get; set; }
/// <summary> /// <summary>
/// момент ротора на х.х., кН*м /// момент ротора на х.х., кН*м
@ -180,7 +181,7 @@ namespace AsbCloudApp.Data.SAUB
/// <summary> /// <summary>
/// скорость ротора, об/мин /// скорость ротора, об/мин
/// </summary> /// </summary>
public float? RotorSpeed { get; set; } public float RotorSpeed { get; set; }
/// <summary> /// <summary>
/// расход, л/с /// расход, л/с

10
AsbCloudApp/Data/SAUB/TelemetryDataSpinDto.cs
View File

@ -19,16 +19,6 @@ namespace AsbCloudApp.Data.SAUB
[Required] [Required]
public DateTime DateTime { get; set; } public DateTime DateTime { get; set; }
/// <summary>
/// Дата
/// </summary>
[Required]
public DateTime Date
{
get { return DateTime; }
set { DateTime = value; }
}
/// <summary> /// <summary>
/// Ограничение числа оборотов вправо /// Ограничение числа оборотов вправо
/// </summary> /// </summary>

4
AsbCloudDb/AsbCloudDb.csproj
View File

@ -6,11 +6,11 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.6"> <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.22">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference> </PackageReference>
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.6" /> <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.22" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

20
AsbCloudInfrastructure/AsbCloudInfrastructure.csproj
View File

@ -49,17 +49,17 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="AsbSaubReport" Version="3.2.1" /> <PackageReference Include="AsbSaubReport" Version="3.24.116.510" />
<PackageReference Include="AsbSaubReportLas" Version="3.2.1" /> <PackageReference Include="AsbSaubReportLas" Version="3.24.116.510" />
<PackageReference Include="AsbSaubReportPdf" Version="3.2.1" /> <PackageReference Include="AsbSaubReportPdf" Version="3.24.116.510" />
<PackageReference Include="CliWrap" Version="3.6.0" /> <PackageReference Include="CliWrap" Version="3.6.6" />
<PackageReference Include="ClosedXML" Version="0.96.0" /> <PackageReference Include="ClosedXML" Version="0.96.0" />
<PackageReference Include="itext7" Version="7.2.3" /> <PackageReference Include="itext7" Version="8.0.2" />
<PackageReference Include="Mapster" Version="7.3.0" /> <PackageReference Include="Mapster" Version="7.4.0" />
<PackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="2.2.0" /> <PackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="2.1.21" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.1" /> <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.23.1" /> <PackageReference Include="Microsoft.IdentityModel.Tokens" Version="7.2.0" />
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.23.1" /> <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="7.2.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

1
AsbCloudInfrastructure/Repository/ProcessMapPlanRepository.cs
View File

@ -10,7 +10,6 @@ using AsbCloudApp.Services;
using AsbCloudDb.Model; using AsbCloudDb.Model;
using AsbCloudDb.Model.ProcessMaps; using AsbCloudDb.Model.ProcessMaps;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using Org.BouncyCastle.Asn1.Ocsp;
namespace AsbCloudInfrastructure.Repository; namespace AsbCloudInfrastructure.Repository;

11
AsbCloudWebApi.IntegrationTests/AsbCloudWebApi.IntegrationTests.csproj
View File

@ -4,15 +4,16 @@
<TargetFramework>net6.0</TargetFramework> <TargetFramework>net6.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<UserSecretsId>af52bb94-3f08-4d6a-8895-8cfb7691c393</UserSecretsId>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Bogus" Version="35.2.0" /> <PackageReference Include="Bogus" Version="35.4.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.25" /> <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.26" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.1" /> <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="Refit" Version="7.0.0" /> <PackageReference Include="Refit" Version="7.0.0" />
<PackageReference Include="xunit" Version="2.4.2" /> <PackageReference Include="xunit" Version="2.6.6" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5"> <PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
</PackageReference> </PackageReference>

6
AsbCloudWebApi.IntegrationTests/MatchHelper.cs
View File

@ -8,10 +8,10 @@ public static class MatchHelper
public static void Match<T>(T expected, T actual, IEnumerable<string>? excludeProps = null) public static void Match<T>(T expected, T actual, IEnumerable<string>? excludeProps = null)
{ {
if (ReferenceEquals(expected, actual)) if (ReferenceEquals(expected, actual))
throw new EqualException(expected, actual); throw EqualException.ForMismatchedValues(expected, actual);
if (expected is null || actual is null) if (expected is null || actual is null)
throw new EqualException(expected, actual); throw EqualException.ForMismatchedValues(expected, actual);
var props = typeof(T).GetProperties( var props = typeof(T).GetProperties(
BindingFlags.Public BindingFlags.Public
@ -25,7 +25,7 @@ public static class MatchHelper
var objValue = prop.GetValue(expected); var objValue = prop.GetValue(expected);
var anotherValue = prop.GetValue(actual); var anotherValue = prop.GetValue(actual);
if (objValue != null && !objValue.Equals(anotherValue)) if (objValue != null && !objValue.Equals(anotherValue))
throw new EqualException(expected, actual); throw EqualException.ForMismatchedValues(expected, actual);
} }
} }
} }

2
AsbCloudWebApi.IntegrationTests/Middlware/UserConnectionsLimitMiddlwareTest.cs
View File

@ -145,7 +145,7 @@ namespace AsbCloudWebApi.IntegrationTests.Middlware
return httpClient; return httpClient;
} }
private static IServiceCollection ReplaceService<T>(this IServiceCollection services, T instance) private static IServiceCollection ReplaceService<T>(IServiceCollection services, T instance)
where T : notnull where T : notnull
{ {
var typeofT = typeof(T); var typeofT = typeof(T);

8
AsbCloudWebApi.Tests/AsbCloudWebApi.Tests.csproj
View File

@ -19,11 +19,11 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.25" /> <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.26" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.1" /> <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="NSubstitute" Version="5.1.0" /> <PackageReference Include="NSubstitute" Version="5.1.0" />
<PackageReference Include="xunit" Version="2.4.2" /> <PackageReference Include="xunit" Version="2.6.6" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5"> <PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
</PackageReference> </PackageReference>

17
AsbCloudWebApi/AsbCloudWebApi.csproj
View File

@ -10,13 +10,16 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.8" /> <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.26" />
<PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="6.0.8" /> <PackageReference Include="Microsoft.Extensions.ApiDescription.Server" Version="8.0.1">
<PackageReference Include="protobuf-net" Version="3.1.17" /> <PrivateAssets>all</PrivateAssets>
<PackageReference Include="protobuf-net.AspNetCore" Version="3.1.17" /> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PackageReference Include="SignalRSwaggerGen" Version="4.4.0" /> </PackageReference>
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" /> <PackageReference Include="protobuf-net" Version="3.2.30" />
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.4.0" /> <PackageReference Include="protobuf-net.AspNetCore" Version="3.2.12" />
<PackageReference Include="SignalRSwaggerGen" Version="4.5.0" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.5.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>