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

Merge branch 'dev' of http://test.digitaldrilling.ru:8080/DDrilling/AsbCloudServer into dev

Browse Source
This commit is contained in:
Olga Nemt 2023-04-18 10:21:55 +05:00
commit d1b8ca7e4b
43 changed files with 190 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AsbCloudApp/Services/IFileCategoryService.cs
View File

@ -16,7 +16,7 @@ namespace AsbCloudApp.Services
/// <param name="id"></param>
/// <param name="token"></param>
/// <returns></returns>
Task<FileCategoryDto> GetOrDefaultAsync(int id, CancellationToken token);
Task<FileCategoryDto?> GetOrDefaultAsync(int id, CancellationToken token);
/// <summary>
/// Получение справочника категорий файлов

2
AsbCloudApp/Services/IMeasureService.cs
View File

@ -24,7 +24,7 @@ namespace AsbCloudApp.Services
/// <param name="idCategory"></param>
/// <param name="token"></param>
/// <returns></returns>
Task<MeasureDto> GetLastAsync(int idWell, int idCategory, CancellationToken token);
Task<MeasureDto?> GetLastOrDefaultAsync(int idWell, int idCategory, CancellationToken token);
/// <summary>
/// История измерений по категории

2
AsbCloudInfrastructure/DateTimeExtentions.cs
View File

@ -2,6 +2,7 @@
namespace AsbCloudInfrastructure
{
#nullable enable
public static class DateTimeExtentions
{
/// <summary>
@ -77,4 +78,5 @@ namespace AsbCloudInfrastructure
return indexOfMiddle;
}
}
#nullable disable
}

26
AsbCloudInfrastructure/DependencyInjection.cs
View File

@ -26,6 +26,7 @@ using System;
namespace AsbCloudInfrastructure
{
#nullable enable
public static class DependencyInjection
{
public static IAsbCloudDbContext MakeContext(string connectionString)
@ -49,7 +50,7 @@ namespace AsbCloudInfrastructure
TypeAdapterConfig.GlobalSettings.Default.Config
.ForType<TimeDto, TimeOnly>()
.MapWith((source) => source == default ? default : source.MakeTimeOnly());
.MapWith((source) => source.MakeTimeOnly());
TypeAdapterConfig.GlobalSettings.Default.Config
.ForType<TimeOnly, TimeDto>()
@ -59,6 +60,7 @@ namespace AsbCloudInfrastructure
.ForType<TimeOnly, TimeDto>()
.MapWith((source) => new(source));
#pragma warning disable CS8603 // Possible null reference return.
TypeAdapterConfig.GlobalSettings.Default.Config
.ForType<WellDto, Well>()
.Ignore(dst => dst.Cluster,
@ -68,6 +70,7 @@ namespace AsbCloudInfrastructure
dst => dst.WellCompositeSrcs,
dst => dst.WellOperations,
dst => dst.WellType);
#pragma warning restore CS8603 // Possible null reference return.
TypeAdapterConfig.GlobalSettings.Default.Config
.ForType<ClusterDto, Cluster>()
@ -93,7 +96,7 @@ namespace AsbCloudInfrastructure
services.AddMemoryCache();
services.AddScoped<IAsbCloudDbContext>(provider => provider.GetService<AsbCloudDbContext>());
services.AddScoped<IAsbCloudDbContext>(provider => provider.GetRequiredService<AsbCloudDbContext>());
services.AddScoped<IEmailService, EmailService>();
services.AddSingleton(new WitsInfoService());
@ -140,25 +143,25 @@ namespace AsbCloudInfrastructure
// admin crud services:
services.AddTransient<ICrudRepository<TelemetryDto>, CrudCacheRepositoryBase<TelemetryDto, Telemetry>>(s =>
new CrudCacheRepositoryBase<TelemetryDto, Telemetry>(
s.GetService<IAsbCloudDbContext>(),
s.GetService<IMemoryCache>(),
s.GetRequiredService<IAsbCloudDbContext>(),
s.GetRequiredService<IMemoryCache>(),
dbSet => dbSet.Include(t => t.Well))); // может быть включен в сервис TelemetryService
services.AddTransient<ICrudRepository<DepositDto>, CrudCacheRepositoryBase<DepositDto, Deposit>>(s =>
new CrudCacheRepositoryBase<DepositDto, Deposit>(
s.GetService<IAsbCloudDbContext>(),
s.GetService<IMemoryCache>(),
s.GetRequiredService<IAsbCloudDbContext>(),
s.GetRequiredService<IMemoryCache>(),
dbSet => dbSet.Include(d => d.Clusters)));
services.AddTransient<ICrudRepository<CompanyDto>, CrudCacheRepositoryBase<CompanyDto, Company>>(s =>
new CrudCacheRepositoryBase<CompanyDto, Company>(
s.GetService<IAsbCloudDbContext>(),
s.GetService<IMemoryCache>(),
s.GetRequiredService<IAsbCloudDbContext>(),
s.GetRequiredService<IMemoryCache>(),
dbSet => dbSet.Include(c => c.CompanyType)));
services.AddTransient<ICrudRepository<CompanyTypeDto>, CrudCacheRepositoryBase<CompanyTypeDto, CompanyType>>();
services.AddTransient<ICrudRepository<ClusterDto>, CrudCacheRepositoryBase<ClusterDto, Cluster>>(s =>
new CrudCacheRepositoryBase<ClusterDto, Cluster>(
s.GetService<IAsbCloudDbContext>(),
s.GetService<IMemoryCache>(),
s.GetRequiredService<IAsbCloudDbContext>(),
s.GetRequiredService<IMemoryCache>(),
dbSet => dbSet
.Include(c => c.Wells)
.Include(c => c.Deposit))); // может быть включен в сервис ClusterService
@ -200,7 +203,7 @@ namespace AsbCloudInfrastructure
where TService : class
where TImplementation : class, TService
=> services.AddTransient<TService, TImplementation>()
.AddTransient(provider => new Lazy<TService>(provider.GetService<TService>));
.AddTransient(provider => new Lazy<TService>(provider.GetRequiredService<TService>));
public static IServiceCollection AddTransientLazy<TService, TImplementation>(this IServiceCollection services, Func<IServiceProvider, TImplementation> implementationFactory)
where TService : class
@ -209,4 +212,5 @@ namespace AsbCloudInfrastructure
.AddTransient(provider => new Lazy<TService>(() => implementationFactory(provider)));
}
#nullable disable
}

8
AsbCloudInfrastructure/IInfrastructureMarker.cs
View File

@ -1,8 +0,0 @@
namespace AsbCloudInfrastructure
{
/// <summary>
/// Тип для поиска этой сборки
/// </summary>
public interface IInfrastructureMarker
{ }
}

7
AsbCloudInfrastructure/ReportDataSourcePgCloud.cs
View File

@ -8,6 +8,7 @@ using System.Linq;
namespace AsbCloudInfrastructure
{
#nullable enable
public class ReportDataSourcePgCloud : IReportDataSource
{
private readonly IAsbCloudDbContext context;
@ -37,6 +38,9 @@ namespace AsbCloudInfrastructure
.Include(w => w.Telemetry)
.FirstOrDefault(w => w.Id == idWell);
if(well is null)
throw new ArgumentInvalidException("idWell doesn`t exist", nameof(idWell));
idTelemetry = well?.IdTelemetry;
if (idTelemetry is null)
throw new ArgumentInvalidException($"Well {idWell} doesn't contain telemetry", nameof(idWell));
@ -49,7 +53,7 @@ namespace AsbCloudInfrastructure
.Where(u => u.IdTelemetry == idTelemetry)
.ToDictionary(u => u.IdUser, u => u);
timezoneOffset = well?.Telemetry?.Info?.TimeZoneOffsetTotalHours ?? well.Timezone?.Hours ?? 5.0;
timezoneOffset = well!.Telemetry?.Info?.TimeZoneOffsetTotalHours ?? well.Timezone?.Hours ?? 5.0;
info = new WellInfoReport
{
@ -155,4 +159,5 @@ namespace AsbCloudInfrastructure
public WellInfoReport GetWellInfo()
=> info;
}
#nullable disable
}

2
AsbCloudInfrastructure/Repository/QueryContainer.cs
View File

@ -5,6 +5,7 @@ using System.Linq;
namespace AsbCloudInfrastructure.Repository
{
#nullable enable
public class QueryContainer<TEntity> where TEntity : class, IId
{
protected readonly IAsbCloudDbContext dbContext;
@ -25,4 +26,5 @@ namespace AsbCloudInfrastructure.Repository
GetQuery = () => makeQuery(dbSet);
}
}
#nullable disable
}

2
AsbCloudInfrastructure/Repository/SetpointsRequestRepository.cs
View File

@ -11,6 +11,7 @@ using System.Linq;
namespace AsbCloudInfrastructure.Repository
{
#nullable enable
public class SetpointsRequestRepository : CrudWellRelatedCacheRepositoryBase<SetpointsRequestDto, SetpointsRequest>
{
private readonly IWellService wellService;
@ -61,4 +62,5 @@ namespace AsbCloudInfrastructure.Repository
return result;
}
}
#nullable disable
}

14
AsbCloudInfrastructure/Repository/WitsRecordRepository.cs
View File

@ -1,5 +1,4 @@
using AsbCloudApp.Services;
using AsbCloudDb;
using AsbCloudDb.Model;
using Mapster;
using Microsoft.EntityFrameworkCore;
@ -11,6 +10,7 @@ using System.Threading.Tasks;
namespace AsbCloudInfrastructure.Repository
{
#nullable enable
public class WitsRecordRepository<TDto, TEntity> : IWitsRecordRepository<TDto>
where TEntity : AsbCloudDb.Model.WITS.RecordBase, ITelemetryData
where TDto : AsbCloudApp.Data.ITelemetryData
@ -64,7 +64,10 @@ namespace AsbCloudInfrastructure.Repository
.OrderBy(d => d.DateTime)
.AsNoTracking();
var data = await query.LastOrDefaultAsync(token);
return new TDto[] { Convert(data, timezoneHours) };
if(data is not null)
return new TDto[] { Convert(data, timezoneHours) };
return Enumerable.Empty<TDto>();
}
public async Task SaveDataAsync(int idTelemetry, IEnumerable<TDto> dtos, CancellationToken token)
@ -128,9 +131,6 @@ namespace AsbCloudInfrastructure.Repository
private static TEntity Convert(TDto dto, int idTelemetry, double timezoneHours)
{
if (dto is null)
return null;
var entity = dto.Adapt<TEntity>();
entity.Recid = GetRecId(dto);
entity.IdTelemetry = idTelemetry;
@ -140,13 +140,11 @@ namespace AsbCloudInfrastructure.Repository
private static TDto Convert(TEntity entity, double timezoneHours)
{
if (entity is null)
return default;
var data = entity.Adapt<TDto>();
data.DateTime = entity.DateTime.ToRemoteDateTime(timezoneHours);
return data;
}
}
#nullable disable
}

2
AsbCloudInfrastructure/Services/DailyReport/BlockAbstract.cs
View File

@ -2,10 +2,12 @@
namespace AsbCloudInfrastructure.Services.DailyReport
{
#nullable enable
abstract class BlockAbstract
{
public abstract CellAddress AddressBlockBegin { get; }
public abstract CellAddress AddressBlockEnd { get; }
public abstract void Draw(IXLWorksheet sheet);
}
#nullable disable
}

4
AsbCloudInfrastructure/Services/DailyReport/DailyReportBlocks/BhaBlock.cs
View File

@ -3,6 +3,7 @@ using ClosedXML.Excel;
namespace AsbCloudInfrastructure.Services.DailyReport.DailyReportBlocks
{
#nullable enable
class BhaBlock : BlockAbstract
{
private readonly BhaDto blockDto;
@ -110,7 +111,8 @@ namespace AsbCloudInfrastructure.Services.DailyReport.DailyReportBlocks
.SetFormulaA1($"{FormulaBhaBlock(AddressDurationDataStart[4], AddressDurationDataFinish[4])}").Style.SetAllBorders();
}
}
#nullable disable
}

8
AsbCloudInfrastructure/Services/DailyReport/DailyReportBlocks/DimensionlessBlock.cs
View File

@ -3,12 +3,12 @@ using ClosedXML.Excel;
namespace AsbCloudInfrastructure.Services.DailyReport.DailyReportBlocks
{
#nullable enable
internal class DimensionlessBlock : BlockAbstract
{
private readonly NoDrillingDto blockDto;
public SaubBlock SaubBlock { get; set; }
public SaubBlock SaubBlock { get; set; } = null!;
public CellAddress AddressDimensionTitle { get; }
public CellAddress AddressPreparationTitle { get; }
@ -19,7 +19,7 @@ namespace AsbCloudInfrastructure.Services.DailyReport.DailyReportBlocks
public CellAddress[] AddressPreparationValue { get; }
public CellAddress[] AddressExtensionHead { get; }
public CellAddress[] AddressExtensionValue { get; }
public CellAddress AddressBlockFormula { get; }
public CellAddress AddressBlockFormula { get; } = null!;
public override CellAddress AddressBlockBegin { get; }
public override CellAddress AddressBlockEnd { get; }
public DimensionlessBlock(CellAddress addressBlockBegin, NoDrillingDto blockDto)
@ -114,6 +114,6 @@ namespace AsbCloudInfrastructure.Services.DailyReport.DailyReportBlocks
._SetValue("Наращивание");
}
}
#nullable disable
}

3
AsbCloudInfrastructure/Services/DailyReport/DailyReportBlocks/HeadBlock.cs
View File

@ -3,7 +3,7 @@ using ClosedXML.Excel;
namespace AsbCloudInfrastructure.Services.DailyReport.DailyReportBlocks
{
#nullable enable
class HeadBlock : BlockAbstract
{
private readonly HeadDto blockDto;
@ -175,6 +175,7 @@ namespace AsbCloudInfrastructure.Services.DailyReport.DailyReportBlocks
._SetValue($"{blockDto.CountLaunchesMSE}");
}
}
#nullable disable
}

2
AsbCloudInfrastructure/Services/DailyReport/DailyReportBlocks/SaubBlock.cs
View File

@ -3,6 +3,7 @@ using ClosedXML.Excel;
namespace AsbCloudInfrastructure.Services.DailyReport.DailyReportBlocks
{
#nullable enable
internal class SaubBlock : BlockAbstract
{
private readonly SaubDto blockDto;
@ -224,5 +225,6 @@ namespace AsbCloudInfrastructure.Services.DailyReport.DailyReportBlocks
._SetValue($"Примечание: {blockDto.DeclinesReasonsROP}");
}
}
#nullable disable
}

4
AsbCloudInfrastructure/Services/DailyReport/DailyReportBlocks/SignBlock.cs
View File

@ -3,6 +3,7 @@ using ClosedXML.Excel;
namespace AsbCloudInfrastructure.Services.DailyReport.DailyReportBlocks
{
#nullable enable
internal class SignBlock : BlockAbstract
{
private readonly SignDto blockDto;
@ -10,7 +11,6 @@ namespace AsbCloudInfrastructure.Services.DailyReport.DailyReportBlocks
public CellAddress AddressDrillMaster { get; }
public CellAddress AddressSupervisorHead { get; }
public CellAddress AddressSupervisor { get; }
public CellAddress[] AddressPeriodTableDataArray { get; }
public override CellAddress AddressBlockBegin { get; }
public override CellAddress AddressBlockEnd { get; }
@ -45,7 +45,7 @@ namespace AsbCloudInfrastructure.Services.DailyReport.DailyReportBlocks
.SetValue($"{blockDto.Supervisor}");
}
}
#nullable disable
}

4
AsbCloudInfrastructure/Services/DailyReport/DailyReportMakerExcel.cs
View File

@ -6,9 +6,10 @@ using System.Collections.Generic;
using System.IO;
namespace AsbCloudInfrastructure.Services.DailyReport
{
#nullable enable
public class DailyReportMakerExcel
{
private IEnumerable<WellOperationCategoryDto> OperationCategories;
private IEnumerable<WellOperationCategoryDto> OperationCategories = null!;
public Stream MakeReportFromBlocks(DailyReportDto dto, IEnumerable<WellOperationCategoryDto> operationCategories)
{
@ -55,5 +56,6 @@ namespace AsbCloudInfrastructure.Services.DailyReport
sheet.Rows().AdjustToContents();
}
}
#nullable disable
}

2
AsbCloudInfrastructure/Services/DailyReport/XLExtentions.cs
View File

@ -3,6 +3,7 @@ using System;
namespace AsbCloudInfrastructure.Services.DailyReport
{
#nullable enable
internal static class XLExtentions
{
public static IXLRange _SetValue(this IXLRange range, object value)
@ -156,4 +157,5 @@ namespace AsbCloudInfrastructure.Services.DailyReport
=> sheet.Range(begin.RowNumber, begin.ColumnNumber, end.RowNumber, end.ColumnNumber);
}
#nullable disable
}

2
AsbCloudInfrastructure/Services/DetectOperations/DetectableTelemetry.cs
View File

@ -2,6 +2,7 @@
namespace AsbCloudInfrastructure.Services.DetectOperations
{
#nullable enable
public class DetectableTelemetry
{
public DateTimeOffset DateTime { get; set; }
@ -13,4 +14,5 @@ namespace AsbCloudInfrastructure.Services.DetectOperations
public float BitDepth { get; set; }
public float RotorSpeed { get; set; }
}
#nullable disable
}

5
AsbCloudInfrastructure/Services/DetectOperations/DetectedOperationExportService.cs
View File

@ -12,6 +12,7 @@ using System.Threading.Tasks;
namespace AsbCloudInfrastructure.Services.DetectOperations
{
#nullable enable
internal class DetectedOperationExportService
{
private readonly IAsbCloudDbContext db;
@ -41,7 +42,8 @@ namespace AsbCloudInfrastructure.Services.DetectOperations
return;
var wells = idsWells.Select(i => wellService.GetOrDefault(i))
.Where(w => w is not null && w.IdTelemetry is not null);
.Where(w => w is not null && w.IdTelemetry is not null)
.Select(w => w!);
if (!wells.Any())
return;
@ -114,4 +116,5 @@ namespace AsbCloudInfrastructure.Services.DetectOperations
sheet.Cell(rowNumber, 6).Value = operation.Value;
}
}
#nullable enable
}

4
AsbCloudInfrastructure/Services/DetectOperations/Detectors/OperationDetectorResult.cs
View File

@ -2,10 +2,12 @@
namespace AsbCloudInfrastructure.Services.DetectOperations.Detectors
{
#nullable enable
class OperationDetectorResult
{
public int TelemetryBegin { get; set; }
public int TelemetryEnd { get; set; }
public DetectedOperation Operation { get; set; }
public DetectedOperation Operation { get; set; } = null!;
}
#nullable enable
}

2
AsbCloudInfrastructure/Services/DetectOperations/InterpolationLine.cs
View File

@ -2,6 +2,7 @@
namespace AsbCloudInfrastructure.Services.DetectOperations
{
#nullable enable
public class InterpolationLine
{
private readonly double xSum;
@ -52,4 +53,5 @@ namespace AsbCloudInfrastructure.Services.DetectOperations
public bool IsAverageYGreaterThan(double bound) =>
(ySum / count) >= bound;
}
#nullable disable
}

4
AsbCloudInfrastructure/Services/DrillingProgram/DrillingProgramMaker.cs
View File

@ -6,6 +6,7 @@ using System.Linq;
namespace AsbCloudInfrastructure.Services.DrillingProgram
{
#nullable enable
internal class DrillingProgramMaker
{
private const int maxAllowedColumns = 256;
@ -15,7 +16,7 @@ namespace AsbCloudInfrastructure.Services.DrillingProgram
var resultExcelFile = new XLWorkbook(XLEventTracking.Disabled);
var titleSheet = resultExcelFile.AddWorksheet("Титульный лист");
var marks = parts.SelectMany(p => p.File.FileMarks);
var marks = parts.SelectMany(p => p.File!.FileMarks);
var titleSheetMaker = new TitleListSheet(marks, well);
titleSheetMaker.Draw(titleSheet);
@ -128,4 +129,5 @@ namespace AsbCloudInfrastructure.Services.DrillingProgram
return rngData;
}
}
#nullable disable
}

20
AsbCloudInfrastructure/Services/DrillingProgram/DrillingProgramService.cs
View File

@ -369,10 +369,13 @@ namespace AsbCloudInfrastructure.Services.DrillingProgram
{
var file = await fileService.GetOrDefaultAsync(fileMark.IdFile, token);
var well = await wellService.GetOrDefaultAsync(file!.IdWell, token);
if (well is null)
throw new ArgumentInvalidException("idWell doesn`t exist", nameof(file.IdWell));
var user = file.Author!;
var factory = new DrillingMailBodyFactory(configuration);
var subject = factory.MakeSubject(well, "Загруженный вами документ полностью согласован");
var body = factory.MakeMailBodyForPublisherOnFullAccept(well, user.Name, file.Id, file.Name);
var body = factory.MakeMailBodyForPublisherOnFullAccept(well, user.Name ?? string.Empty, file.Id, file.Name);
emailService.EnqueueSend(user.Email, subject, body);
}
@ -381,10 +384,13 @@ namespace AsbCloudInfrastructure.Services.DrillingProgram
{
var file = await fileService.GetOrDefaultAsync(fileMark.IdFile, token);
var well = await wellService.GetOrDefaultAsync(file!.IdWell, token);
if (well is null)
throw new ArgumentInvalidException("idWell doesn`t exist", nameof(file.IdWell));
var user = file.Author!;
var factory = new DrillingMailBodyFactory(configuration);
var subject = factory.MakeSubject(well, "Загруженный вами документ отклонен");
var body = factory.MakeMailBodyForPublisherOnReject(well, user.Name, file.Id, file.Name, fileMark);
var body = factory.MakeMailBodyForPublisherOnReject(well, user.Name ?? string.Empty, file.Id, file.Name, fileMark);
emailService.EnqueueSend(user.Email, subject, body);
}
@ -392,6 +398,9 @@ namespace AsbCloudInfrastructure.Services.DrillingProgram
private async Task NotifyApproversAsync(DrillingProgramPart part, int idFile, string fileName, CancellationToken token)
{
var well = await wellService.GetOrDefaultAsync(part.IdWell, token);
if (well is null)
throw new ArgumentInvalidException("idWell doesn`t exist", nameof(part.IdWell));
var factory = new DrillingMailBodyFactory(configuration);
var subject = factory.MakeSubject(well, "Загружен новый документ для согласования.");
var users = part.RelatedUsers
@ -400,7 +409,7 @@ namespace AsbCloudInfrastructure.Services.DrillingProgram
foreach (var user in users)
{
var body = factory.MakeMailBodyForApproverNewFile(well, user.Name, idFile, fileName);
var body = factory.MakeMailBodyForApproverNewFile(well, user.Name ?? string.Empty, idFile, fileName);
emailService.EnqueueSend(user.Email, subject, body);
}
}
@ -408,9 +417,12 @@ namespace AsbCloudInfrastructure.Services.DrillingProgram
private async Task NotifyNewPublisherAsync(int idWell, UserDto user, string documentCategory, CancellationToken token)
{
var well = await wellService.GetOrDefaultAsync(idWell, token);
if (well is null)
throw new ArgumentInvalidException("idWell doesn`t exist", nameof(idWell));
var factory = new DrillingMailBodyFactory(configuration);
var subject = factory.MakeSubject(well, $"От вас ожидается загрузка на портал документа «{documentCategory}»");
var body = factory.MakeMailBodyForNewPublisher(well, user.Name, documentCategory);
var body = factory.MakeMailBodyForNewPublisher(well, user.Name ?? string.Empty, documentCategory);
emailService.EnqueueSend(user.Email, subject, body);
}

6
AsbCloudInfrastructure/Services/DrillingProgram/ImageInfo.cs
View File

@ -2,14 +2,16 @@
namespace AsbCloudInfrastructure.Services.DrillingProgram
{
#nullable enable
class ImageInfo
{
public int Id { get; set; }
public byte[] Data { get; set; }
public byte[] Data { get; set; } = null!;
public int Height { get; set; }
public int Width { get; set; }
public IXLAddress TopLeftCellAddress { get; set; }
public IXLAddress TopLeftCellAddress { get; set; } = null!;
public int Left { get; set; }
public int Top { get; set; }
}
#nullable disable
}

23
AsbCloudInfrastructure/Services/Email/BaseFactory.cs
View File

@ -1,10 +1,12 @@
using AsbCloudApp.Data;
using AsbCloudApp.Exceptions;
using Microsoft.Extensions.Configuration;
using System;
using System.IO;
namespace AsbCloudInfrastructure.Services.Email
{
#nullable enable
public class BaseFactory
{
private readonly string platformName;
@ -20,17 +22,23 @@ namespace AsbCloudInfrastructure.Services.Email
supportMail = configuration.GetValue("email:supportMail", "support@digitaldrilling.ru");
}
public static string GetImageBase64(string resourceFileName)
public static string GetOrEmptyImageBase64(string resourceFileName)
{
if (string.IsNullOrEmpty(resourceFileName))
return null;
throw new ArgumentInvalidException("ResourceFileName doesn`t exist", nameof(resourceFileName));
var baseDir = Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location);
var resoursesDir = "Res";
var baseDir = Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location)
?? string.Empty;
var resourcesDir = "Res";
var logoFilePath = Path.Combine(baseDir, resoursesDir, resourceFileName);
if(!File.Exists(logoFilePath))
var logoFilePath = Path.Combine(baseDir, resourcesDir, resourceFileName);
if (!File.Exists(logoFilePath))
{
System.Diagnostics.Trace.TraceWarning($"GetOrEmptyImageBase64(). File {logoFilePath} not found.");
return string.Empty;
}
var imageBytes = File.ReadAllBytes(logoFilePath);
var format = Path.GetExtension(resourceFileName).Trim('.');
return "data:image/" + format + ";base64," + Convert.ToBase64String(imageBytes);
@ -41,7 +49,7 @@ namespace AsbCloudInfrastructure.Services.Email
public string MakeSignatue()
{
var logo = GetImageBase64("logo_32.png");
var logo = GetOrEmptyImageBase64("logo_32.png");
var sign = $"<br><br>---<br><img src=\"{logo}\"/><br>" +
$"{companyName}<br>" +
$"Это письмо сформировано автоматически.<br>" +
@ -53,4 +61,5 @@ namespace AsbCloudInfrastructure.Services.Email
public virtual string MakeSubject(WellDto well, string action)
=> $"{well.Deposit}, {well.Cluster}, {well.Caption}. {action}";
}
#nullable disable
}

4
AsbCloudInfrastructure/Services/Email/DrillingMailBodyFactory.cs
View File

@ -6,7 +6,8 @@ using System.IO;
namespace AsbCloudInfrastructure
{
class DrillingMailBodyFactory : BaseFactory
#nullable enable
class DrillingMailBodyFactory : BaseFactory
{
private readonly string platformName;
private readonly string platformUrl;
@ -84,4 +85,5 @@ namespace AsbCloudInfrastructure
return drillingProgramHref;
}
}
#nullable disable
}

4
AsbCloudInfrastructure/Services/Email/WellFinalDocumentMailBodyFactory .cs
View File

@ -6,7 +6,8 @@ using System.IO;
namespace AsbCloudInfrastructure
{
class WellFinalDocumentMailBodyFactory : BaseFactory
#nullable enable
class WellFinalDocumentMailBodyFactory : BaseFactory
{
private readonly string platformName;
@ -29,4 +30,5 @@ namespace AsbCloudInfrastructure
return body;
}
}
#nullable disable
}

2
AsbCloudInfrastructure/Services/FileCategoryService.cs
View File

@ -10,6 +10,7 @@ using System.Threading.Tasks;
namespace AsbCloudInfrastructure.Services
{
#nullable enable
public class FileCategoryService : CrudCacheRepositoryBase<FileCategoryDto, FileCategory>, IFileCategoryService
{
public FileCategoryService(IAsbCloudDbContext context, IMemoryCache memoryCache)
@ -28,4 +29,5 @@ namespace AsbCloudInfrastructure.Services
return dtos;
}
}
#nullable disable
}

8
AsbCloudInfrastructure/Services/IConverter.cs
View File

@ -1,8 +0,0 @@
namespace AsbCloudInfrastructure.Services
{
public interface IConverter<TDto, TModel>
{
TModel Convert(TDto src);
TDto Convert(TModel src);
}
}

17
AsbCloudInfrastructure/Services/MeasureService.cs
View File

@ -13,6 +13,7 @@ using System.Threading.Tasks;
namespace AsbCloudInfrastructure.Services
{
#nullable enable
public class MeasureService : IMeasureService
{
private readonly IAsbCloudDbContext db;
@ -40,7 +41,7 @@ namespace AsbCloudInfrastructure.Services
return cache;
}
public async Task<MeasureDto> GetLastAsync(int idWell, int idCategory, CancellationToken token)
public async Task<MeasureDto?> GetLastOrDefaultAsync(int idWell, int idCategory, CancellationToken token)
{
var query = db.Measures
.Include(m => m.Category)
@ -54,8 +55,11 @@ namespace AsbCloudInfrastructure.Services
.ConfigureAwait(false);
var timezone = wellService.GetTimezone(idWell);
var dto = Convert(entity, timezone.Hours);
return dto;
if (entity is null)
return null;
return Convert(entity, timezone.Hours);
}
public async Task<IEnumerable<MeasureDto>> GetHisoryAsync(int idWell, int? idCategory = null, CancellationToken token = default)
@ -124,6 +128,9 @@ namespace AsbCloudInfrastructure.Services
.FirstOrDefaultAsync(token)
.ConfigureAwait(false);
if (entity is null)
throw new ArgumentInvalidException($"Measure doesn't exist", nameof(idWell));
entity.IsDeleted = true;
return await db.SaveChangesAsync(token).ConfigureAwait(false);
@ -140,16 +147,16 @@ namespace AsbCloudInfrastructure.Services
private MeasureDto Convert(Measure entity, double hours)
{
var dto = entity.Adapt<MeasureDto>();
dto.CategoryName = entity.Category?.Name;
dto.CategoryName = entity.Category?.Name ?? String.Empty;
dto.Timestamp = entity.Timestamp.ToRemoteDateTime(hours);
return dto;
}
private Measure Convert(MeasureDto dto, double hours)
{
var entity = dto.Adapt<Measure>();
entity.Category = null;
entity.Timestamp = dto.Timestamp.ToUtcDateTimeOffset(hours);
return entity;
}
}
#nullable disable
}

1
AsbCloudInfrastructure/Services/ProcessMap/ProcessMapReportService.cs
View File

@ -6,7 +6,6 @@ using AsbCloudApp.Services;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Numerics;
using System.Threading;
using System.Threading.Tasks;

2
AsbCloudInfrastructure/Services/ProcessMap/XLExtentions.cs
View File

@ -5,6 +5,7 @@ namespace AsbCloudInfrastructure.Services.ProcessMap;
internal static class XLExtentions
{
#nullable enable
public static IXLCell SetVal(this IXLCell cell, string value, bool adaptRowHeight = false)
{
cell.Value = value;
@ -47,4 +48,5 @@ internal static class XLExtentions
cell.Style.NumberFormat.Format = format;
return cell;
}
#nullable disable
}

3
AsbCloudInfrastructure/Services/SAUB/CsvSerializer.cs
View File

@ -1,5 +1,4 @@
using DocumentFormat.OpenXml.Drawing.Diagrams;
using System.Collections.Generic;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Reflection;

2
AsbCloudInfrastructure/Services/SAUB/EventService.cs
View File

@ -10,6 +10,7 @@ using System.Threading.Tasks;
namespace AsbCloudInfrastructure.Services.SAUB
{
#nullable enable
public class EventService : IEventService
{
private readonly IAsbCloudDbContext db;
@ -42,4 +43,5 @@ namespace AsbCloudInfrastructure.Services.SAUB
memoryCache.DropBasic<TelemetryEvent>();
}
}
#nullable disable
}

1
AsbCloudInfrastructure/Services/SAUB/SetpointsService.cs
View File

@ -113,4 +113,5 @@ namespace AsbCloudInfrastructure.Services.SAUB
public IEnumerable<SetpointInfoDto> GetSetpointsNames()
=> SetpointInfos.Values;
}
#nullable disable
}

2
AsbCloudInfrastructure/Services/SAUB/TelemetryDataSpinService.cs
View File

@ -5,6 +5,7 @@ using Mapster;
namespace AsbCloudInfrastructure.Services.SAUB
{
#nullable enable
public class TelemetryDataSpinService : TelemetryDataBaseService<TelemetryDataSpinDto, TelemetryDataSpin>
{
public TelemetryDataSpinService(
@ -28,4 +29,5 @@ namespace AsbCloudInfrastructure.Services.SAUB
return dto;
}
}
#nullable disable
}

16
AsbCloudInfrastructure/Services/SAUB/TelemetryTracker.cs
View File

@ -12,13 +12,14 @@ using System.Threading.Tasks;
namespace AsbCloudInfrastructure.Services.SAUB
{
#nullable enable
public class TelemetryTracker : ITelemetryTracker
{
class TrackerStat
{
//public int Id { get; set; }
public string RemoteUid { get; set; }
public string RemoteUid { get; set; } = null!;
/// <summary>
/// Время последнего запроса (по времени сервера)
@ -88,10 +89,14 @@ namespace AsbCloudInfrastructure.Services.SAUB
foreach (var oldReq in oldRequests)
{
var telemetryStat = telemetriesStats.GetOrAdd(oldReq.Uid, (uid) => new TrackerStat { RemoteUid = uid });
telemetryStat.TelemetryDateUtcMin = oldReq.DateMin;
telemetryStat.TelemetryDateUtcMax = oldReq.DateMax;
telemetryStat.LastTimeServer = oldReq.DateMax;
if (oldReq.Uid is not null)
{
var telemetryStat = telemetriesStats.GetOrAdd(oldReq.Uid, (uid) => new TrackerStat { RemoteUid = uid });
telemetryStat.TelemetryDateUtcMin = oldReq.DateMin;
telemetryStat.TelemetryDateUtcMax = oldReq.DateMax;
telemetryStat.LastTimeServer = oldReq.DateMax;
}
}
}).ContinueWith((t) =>
{
@ -147,4 +152,5 @@ namespace AsbCloudInfrastructure.Services.SAUB
public IEnumerable<string> GetTransmittingTelemetriesUids() =>
telemetriesStats.Keys;
}
#nullable disable
}

1
AsbCloudInfrastructure/Services/Trajectory/TrajectoryVisualizationService.cs
View File

@ -54,4 +54,5 @@ namespace AsbCloudInfrastructure.Services.Trajectory
return cartesianCoordinates;
}
}
#nullable disable
}

20
AsbCloudInfrastructure/Services/WellFinalDocumentsService.cs
View File

@ -125,18 +125,30 @@ namespace AsbCloudInfrastructure.Services
{
var category = await fileCategoryService.GetOrDefaultAsync(item.IdCategory, token);
var well = await wellService.GetOrDefaultAsync(item.IdWell, token);
if(well is null)
throw new ArgumentInvalidException("idWell doesn`t exist", nameof(item.IdWell));
SendMessage(well, user, category.Name, message);
SendMessage(well, user, category?.Name ?? string.Empty, message);
}
}
}
private void SendMessage(WellDto? well, UserDto user, string documentCategory, string message)
private void SendMessage(WellDto well, UserDto user, string documentCategory, string message)
{
var factory = new WellFinalDocumentMailBodyFactory(configuration);
var subject = factory.MakeSubject(well, documentCategory);
var body = factory.MakeMailBodyForWellFinalDocument(well, user.Name ?? user.Surname, string.Format(message, documentCategory));
emailService.EnqueueSend(user.Email, subject, body);
if(!string.IsNullOrEmpty(user.Email))
{
var body = factory.MakeMailBodyForWellFinalDocument(
well,
(user.Name ?? user.Surname ?? string.Empty),
string.Format(message, documentCategory)
);
emailService.EnqueueSend(user.Email, subject, body);
}
}
}
#nullable disable

21
AsbCloudInfrastructure/Services/WellOperationService/ScheduleReportService.cs
View File

@ -1,4 +1,5 @@
using AsbCloudApp.Data;
using AsbCloudApp.Exceptions;
using AsbCloudApp.Services;
using AsbCloudDb.Model;
using ClosedXML.Excel;
@ -11,6 +12,7 @@ using System.Threading.Tasks;
namespace AsbCloudInfrastructure.Services.WellOperationService
{
#nullable enable
public class ScheduleReportService : IScheduleReportService
{
private readonly IOperationsStatService operationsStatService;
@ -29,11 +31,11 @@ namespace AsbCloudInfrastructure.Services.WellOperationService
{
var tvd = await operationsStatService.GetTvdAsync(idWell, token);
if (!tvd.Any())
return null;
var well = await wellService.GetOrDefaultAsync(idWell, token);
if(well is null)
throw new ArgumentInvalidException("idWell doesn`t exist", nameof(idWell));
var ecxelTemplateStream = GetExcelTemplateStream();
using var workbook = new XLWorkbook(ecxelTemplateStream, XLEventTracking.Disabled);
FillScheduleSheetToWorkbook(workbook, tvd, well);
@ -80,7 +82,7 @@ namespace AsbCloudInfrastructure.Services.WellOperationService
var tvdList = tvd.ToList();
var facts = tvd
.Where(t => t.Fact is not null)
.Select(t => t.Fact)
.Select(t => t.Fact!)
.ToList();
DateTime lastFactDate = default;
@ -236,9 +238,9 @@ namespace AsbCloudInfrastructure.Services.WellOperationService
? operation.DateStart.AddHours(operation.DurationHours)
: default;
var endDatePlan = GetEndDate(planLast);
var endDateFact = GetEndDate(factLast);
var endDatePredict = GetEndDate(predictLast);
var endDatePlan = planLast is not null ? GetEndDate(planLast) : default;
var endDateFact = factLast is not null ? GetEndDate(factLast) : default;
var endDatePredict = predictLast is not null ? GetEndDate(predictLast) : default;
var endDate = endDatePredict > endDateFact
? endDatePredict
@ -301,7 +303,7 @@ namespace AsbCloudInfrastructure.Services.WellOperationService
return cell;
}
private static IXLCell SetCell(IXLRow row, int colunm, object value)
private static IXLCell SetCell(IXLRow row, int colunm, object? value)
{
var cell = row.Cell(colunm);
cell.Value = value;
@ -330,8 +332,9 @@ namespace AsbCloudInfrastructure.Services.WellOperationService
private static Stream GetExcelTemplateStream()
{
var stream = System.Reflection.Assembly.GetExecutingAssembly()
.GetManifestResourceStream("AsbCloudInfrastructure.Services.WellOperationService.ScheduleReportTemplate.xlsx");
.GetManifestResourceStream("AsbCloudInfrastructure.Services.WellOperationService.ScheduleReportTemplate.xlsx")!;
return stream;
}
}
#nullable disable
}

21
AsbCloudInfrastructure/Services/WellOperationService/WellOperationImportService.cs
View File

@ -11,6 +11,7 @@ using System.Linq;
namespace AsbCloudInfrastructure.Services.WellOperationService
{
#nullable enable
/*
* password for WellOperationImportTemplate.xlsx is ASB2020!
*/
@ -36,7 +37,7 @@ namespace AsbCloudInfrastructure.Services.WellOperationService
private readonly IAsbCloudDbContext db;
private readonly IWellService wellService;
private List<WellOperationCategory> categories = null;
private List<WellOperationCategory> categories = null!;
public List<WellOperationCategory> Categories
{
get
@ -52,7 +53,7 @@ namespace AsbCloudInfrastructure.Services.WellOperationService
}
}
private List<WellSectionType> sections = null;
private List<WellSectionType> sections = null!;
public List<WellSectionType> Sections
{
get
@ -92,9 +93,6 @@ namespace AsbCloudInfrastructure.Services.WellOperationService
.AsNoTracking()
.ToList();
if (!operations.Any())
return null;
var timezone = wellService.GetTimezone(idWell);
return MakeExelFileStream(operations, timezone.Hours);
@ -102,8 +100,12 @@ namespace AsbCloudInfrastructure.Services.WellOperationService
public Stream GetExcelTemplateStream()
{
var resourceName = System.Reflection.Assembly.GetExecutingAssembly()
.GetManifestResourceNames()
.FirstOrDefault(n => n.EndsWith("WellOperationImportTemplate.xlsx"))!;
var stream = System.Reflection.Assembly.GetExecutingAssembly()
.GetManifestResourceStream("AsbCloudInfrastructure.Services.WellOperationService.WellOperationImportTemplate.xlsx");
.GetManifestResourceStream(resourceName)!;
return stream;
}
@ -126,14 +128,16 @@ namespace AsbCloudInfrastructure.Services.WellOperationService
if (planOperations.Any())
{
var sheetPlan = workbook.Worksheets.FirstOrDefault(ws => ws.Name == sheetNamePlan);
AddOperationsToSheet(sheetPlan, planOperations, timezoneOffset);
if (sheetPlan is not null)
AddOperationsToSheet(sheetPlan, planOperations, timezoneOffset);
}
var factOperations = operations.Where(o => o.IdType == 1);
if (factOperations.Any())
{
var sheetFact = workbook.Worksheets.FirstOrDefault(ws => ws.Name == sheetNameFact);
AddOperationsToSheet(sheetFact, factOperations, timezoneOffset);
if (sheetFact is not null)
AddOperationsToSheet(sheetFact, factOperations, timezoneOffset);
}
}
@ -328,4 +332,5 @@ namespace AsbCloudInfrastructure.Services.WellOperationService
return operation;
}
}
#nullable disable
}

4
AsbCloudInfrastructure/Startup.cs
View File

@ -13,6 +13,7 @@ using AsbCloudInfrastructure.Background;
namespace AsbCloudInfrastructure
{
#nullable enable
public class Startup
{
public static void BeforeRunHandler(IHost host)
@ -20,7 +21,7 @@ namespace AsbCloudInfrastructure
using var scope = host.Services.CreateScope();
var provider = scope.ServiceProvider;
var context = provider.GetService<IAsbCloudDbContext>();
var context = provider.GetRequiredService<IAsbCloudDbContext>();
context.Database.SetCommandTimeout(TimeSpan.FromSeconds(2 * 60));
context.Database.Migrate();
@ -70,4 +71,5 @@ namespace AsbCloudInfrastructure
return bytes.ToString("### ### ###");
}
}
#nullable disable
}

2
AsbCloudWebApi/Controllers/MeasureController.cs
View File

@ -44,7 +44,7 @@ namespace AsbCloudWebApi.Controllers
if (!await CanUserAccessToWellAsync(idWell, token).ConfigureAwait(false))
return Forbid();
var result = await measureService.GetLastAsync(idWell, idCategory, token).ConfigureAwait(false);
var result = await measureService.GetLastOrDefaultAsync(idWell, idCategory, token).ConfigureAwait(false);
return Ok(result);
}