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

Fix comparators implementation and revise some dtos

Browse Source
This commit is contained in:
ngfrolov 2023-02-22 17:10:29 +05:00
parent bc35e18703
commit 1e86c24258
Signed by: ng.frolov
GPG Key ID: E99907A0357B29A7
13 changed files with 32 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
AsbCloudApp/Comparators/ComparerIId.cs
View File

@ -25,12 +25,8 @@ namespace AsbCloudApp.Comparators
/// <param name="y"></param>
/// <returns></returns>
public int Compare(IId? x, IId? y)
{
if (x is null || y is null)
return 0;
else
return x.Id.CompareTo(y.Id);
}
=> (x?.Id??0).CompareTo(y?.Id??0);
/// <summary>
///
@ -39,11 +35,11 @@ namespace AsbCloudApp.Comparators
/// <param name="y"></param>
/// <returns></returns>
public bool Equals(IId? x, IId? y)
{
if (x is null || y is null)
return false;
else
{
if (x is not null && y is not null)
return x.Id == y.Id;
return x == y;
}
/// <summary>

10
AsbCloudApp/Comparators/TelemetryUserDtoComparer.cs
View File

@ -9,12 +9,10 @@ namespace AsbCloudApp.Comparators
/// <inheritdoc/>
public bool Equals(TelemetryUserDto? prevUser, TelemetryUserDto? nextUser)
{
if (prevUser is null || nextUser is null)
return false;
else if (prevUser.Id == nextUser.Id)
return true;
else
return false;
if (prevUser is not null && nextUser is not null)
return prevUser.Id == nextUser.Id;
return prevUser == nextUser;
}
/// <inheritdoc/>

2
AsbCloudApp/Data/ReportProgressDto.cs
View File

@ -13,7 +13,7 @@
/// <summary>
/// название текущей операции генерации
/// </summary>
public string Operation { get; set; }
public string? Operation { get; set; }
/// <summary>
/// номер текущей страницы

1
AsbCloudApp/Data/ReportPropertiesDto.cs
View File

@ -2,7 +2,6 @@
namespace AsbCloudApp.Data
{
#nullable enable
/// <summary>
/// DTO формирования рапорта
/// </summary>

2
AsbCloudApp/Data/RequestLogDto.cs
View File

@ -2,7 +2,6 @@
namespace AsbCloudApp.Data
{
#nullable enable
/// <summary>
/// DTO журнала запросов
/// </summary>
@ -63,5 +62,4 @@ namespace AsbCloudApp.Data
/// </summary>
public string? ExceptionStack { get; set; } = null!;
}
#nullable disable
}

2
AsbCloudApp/Data/RequestLogUserDto.cs
View File

@ -2,7 +2,6 @@
namespace AsbCloudApp.Data
{
#nullable enable
/// <summary>
/// DTO статистики запросов по пользователю
/// </summary>
@ -48,5 +47,4 @@ namespace AsbCloudApp.Data
/// </summary>
public UserDto User { get; set; } = null!;
}
#nullable disable
}

6
AsbCloudApp/Data/ScheduleDto.cs
View File

@ -21,12 +21,12 @@ namespace AsbCloudApp.Data
/// <summary>
/// Начало смены
/// </summary>
public TimeDto ShiftStart { get; set; }
public TimeDto ShiftStart { get; set; } = null!;
/// <summary>
/// Конец смены
/// </summary>
public TimeDto ShiftEnd { get; set; }
public TimeDto ShiftEnd { get; set; } = null!;
/// <summary>
/// Начало бурения
@ -41,6 +41,6 @@ namespace AsbCloudApp.Data
/// <summary>
/// Бурильщик
/// </summary>
public DrillerDto Driller { get; set; }
public DrillerDto? Driller { get; set; }
}
}

1
AsbCloudApp/Data/SimpleTimezoneDto.cs
View File

@ -1,6 +1,5 @@
namespace AsbCloudApp.Data
{
#nullable enable
/// <summary>
/// âðåìåííàÿ çîíà
/// </summary>

5
AsbCloudApp/Data/StatClusterDto.cs
View File

@ -1,4 +1,5 @@
using System.Collections.Generic;
using System.Linq;
namespace AsbCloudApp.Data
{
@ -13,11 +14,11 @@ namespace AsbCloudApp.Data
/// <summary>
/// название куста
/// </summary>
public string Caption { get; set; }
public string Caption { get; set; } = string.Empty;
/// <summary>
/// список статистик скважин куста
/// </summary>
public IEnumerable<StatWellDto> StatsWells { get; set; }
public IEnumerable<StatWellDto> StatsWells { get; set; } = Enumerable.Empty<StatWellDto>();
}
}

2
AsbCloudApp/Data/StatSectionDto.cs
View File

@ -11,6 +11,6 @@
/// <summary>
/// название секции
/// </summary>
public string Caption { get; set; }
public string Caption { get; set; } = string.Empty;
}
}

13
AsbCloudApp/Data/StatWellDto.cs
View File

@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
namespace AsbCloudApp.Data
{
@ -14,12 +15,12 @@ namespace AsbCloudApp.Data
/// <summary>
/// название
/// </summary>
public string Caption { get; set; }
public string Caption { get; set; } = string.Empty;
/// <summary>
/// тип скважины
/// </summary>
public string WellType { get; set; }
public string WellType { get; set; } = string.Empty;
/// <summary>
/// ИД состояния скважины
@ -29,7 +30,7 @@ namespace AsbCloudApp.Data
/// <summary>
/// текст состояния скважины
/// </summary>
public string State { get; set; }
public string State { get; set; } = string.Empty;
/// <summary>
/// дата прихода последней телеметрии
@ -39,16 +40,16 @@ namespace AsbCloudApp.Data
/// <summary>
/// Статистика по секциям
/// </summary>
public IEnumerable<StatSectionDto> Sections { get; set; }
public IEnumerable<StatSectionDto> Sections { get; set; } = Enumerable.Empty<StatSectionDto>();
/// <summary>
/// статистика за всю скважину
/// </summary>
public PlanFactBase<StatOperationsDto> Total { get; set; }
public PlanFactBase<StatOperationsDto> Total { get; set; } = new();
/// <summary>
/// компании участвующие в строительстве скважины
/// </summary>
public IEnumerable<CompanyDto> Companies { get; set; }
public IEnumerable<CompanyDto> Companies { get; set; } = Enumerable.Empty<CompanyDto>();
}
}

8
AsbCloudApp/Data/TelemetryDto.cs
View File

@ -9,16 +9,16 @@ namespace AsbCloudApp.Data
{
/// <inheritdoc/>
public int Id { get; set; }
/// <summary>
/// уникальный идентификатор телеметрии по которому панель оператора присылает данные
/// </summary>
public string RemoteUid { get; set; }
public string RemoteUid { get; set; } = null!;
/// <summary>
/// информация о бурении, панели оператора и контроллерах
/// </summary>
public TelemetryInfoDto Info { get; set; }
public TelemetryInfoDto? Info { get; set; }
}
/// <summary>
@ -34,6 +34,6 @@ namespace AsbCloudApp.Data
/// <summary>
/// DTO скважины
/// </summary>
public WellInfoDto Well { get; set; }
public WellInfoDto? Well { get; set; }
}
}

6
AsbCloudApp/Data/TimeDto.cs
View File

@ -118,11 +118,11 @@ namespace AsbCloudApp.Data
public static bool operator >(TimeDto a, TimeDto b) => a.TotalSeconds > b.TotalSeconds;
/// <inheritdoc/>
public int CompareTo(TimeDto other)
=> TotalSeconds - other.TotalSeconds;
public int CompareTo(TimeDto? other)
=> TotalSeconds - other?.TotalSeconds??0;
/// <inheritdoc/>
public override bool Equals(object obj)
public override bool Equals(object? obj)
{
if (ReferenceEquals(this, obj))
{