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

refct #3

Browse Source
This commit is contained in:
eugeniy_ivanov 2022-12-27 00:02:49 +05:00
parent 50d6143366
commit 9819c2ac0d
6 changed files with 107 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
AsbCloudApp/Data/PlannedTrajectoryDto.cs
View File

@ -27,72 +27,72 @@ namespace AsbCloudApp.Data
/// <summary> /// <summary>
/// Глубина по стволу /// Глубина по стволу
/// </summary> /// </summary>
public double? WellboreDepth { get; set; } public double WellboreDepth { get; set; }
/// <summary> /// <summary>
/// Угол зенитный /// Угол зенитный
/// </summary> /// </summary>
public double? ZenithAngle { get; set; } public double ZenithAngle { get; set; }
/// <summary> /// <summary>
/// Азимут Географ. /// Азимут Географ.
/// </summary> /// </summary>
public double? AzimuthGeo { get; set; } public double AzimuthGeo { get; set; }
/// <summary> /// <summary>
/// Азимут Магнитный /// Азимут Магнитный
/// </summary> /// </summary>
public double? AzimuthMagnetic { get; set; } public double AzimuthMagnetic { get; set; }
/// <summary> /// <summary>
/// Глубина вертикальная /// Глубина вертикальная
/// </summary> /// </summary>
public double? VerticalDepth { get; set; } public double VerticalDepth { get; set; }
/// <summary> /// <summary>
/// Абсолютная отметка /// Абсолютная отметка
/// </summary> /// </summary>
public double? AbsoluteMark { get; set; } public double AbsoluteMark { get; set; }
/// <summary> /// <summary>
/// Север отн- но устья /// Север отн- но устья
/// </summary> /// </summary>
public double? NorthOrifice { get; set; } public double NorthOrifice { get; set; }
/// <summary> /// <summary>
/// Восток отн- но устья /// Восток отн- но устья
/// </summary> /// </summary>
public double? EastOrifice { get; set; } public double EastOrifice { get; set; }
/// <summary> /// <summary>
/// Восток картографический /// Восток картографический
/// </summary> /// </summary>
public double? EastCartographic { get; set; } public double EastCartographic { get; set; }
/// <summary> /// <summary>
/// Север картографический /// Север картографический
/// </summary> /// </summary>
public double? NorthCartographic { get; set; } public double NorthCartographic { get; set; }
/// <summary> /// <summary>
/// Пространственная интенсивность /// Пространственная интенсивность
/// </summary> /// </summary>
public double? SpatialIntensity { get; set; } public double SpatialIntensity { get; set; }
/// <summary> /// <summary>
/// Интенсивность по углу /// Интенсивность по углу
/// </summary> /// </summary>
public double? AngleIntensity { get; set; } public double AngleIntensity { get; set; }
/// <summary> /// <summary>
/// Интенсивность по азимуту /// Интенсивность по азимуту
/// </summary> /// </summary>
public double? AzimuthIntensity { get; set; } public double AzimuthIntensity { get; set; }
/// <summary> /// <summary>
/// Смещение от устья /// Смещение от устья
/// </summary> /// </summary>
public double? OrificeOffset { get; set; } public double OrificeOffset { get; set; }
/// <summary> /// <summary>
/// Комментарии /// Комментарии

15
AsbCloudApp/Services/IPlannedTrajectoryImportService.cs
View File

@ -1,4 +1,7 @@
using System.IO; using System.IO;
using System.Threading;
using System.Threading.Tasks;
namespace AsbCloudApp.Services namespace AsbCloudApp.Services
{ {
#nullable enable #nullable enable
@ -12,20 +15,28 @@ namespace AsbCloudApp.Services
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
Stream GetTemplateFile(); Stream GetTemplateFile();
/// <summary>
/// Получить имя файла (исходя из названия скважины)
/// </summary>
/// <returns></returns>
string GetFileName(int idWell, CancellationToken token);
/// <summary> /// <summary>
/// загрузить текущую плановую траекторию в .xlsx /// загрузить текущую плановую траекторию в .xlsx
/// </summary> /// </summary>
/// <param name="idWell"></param> /// <param name="idWell"></param>
/// <param name="token"></param>
/// <returns></returns> /// <returns></returns>
Stream Export(int idWell); Task<Stream> ExportAsync(int idWell, CancellationToken token);
/// <summary> /// <summary>
/// импортировать из excel плановую траекторию /// импортировать из excel плановую траекторию
/// </summary> /// </summary>
/// <param name="idWell"></param> /// <param name="idWell"></param>
/// <param name="idUser"></param> /// <param name="idUser"></param>
/// <param name="stream"></param> /// <param name="stream"></param>
/// <param name="token"></param>
/// <param name="deleteWellOperationsBeforeImport">Очистить старые координаты перед импортом (если файл проходит валидацию)</param> /// <param name="deleteWellOperationsBeforeImport">Очистить старые координаты перед импортом (если файл проходит валидацию)</param>
void Import(int idWell, int idUser, Stream stream, bool deleteWellOperationsBeforeImport = false); Task<int> ImportAsync(int idWell, int idUser, Stream stream, CancellationToken token, bool deleteWellOperationsBeforeImport = false);
} }
#nullable disable #nullable disable
} }

10
AsbCloudApp/Services/IPlannedTrajectoryService.cs
View File

@ -18,7 +18,7 @@ namespace AsbCloudApp.Services
/// <param name="idWell"></param> /// <param name="idWell"></param>
/// <param name="token"></param> /// <param name="token"></param>
/// <returns></returns> /// <returns></returns>
Task<IEnumerable<PlannedTrajectoryDto>?> GetCoordinatesAsync(int idWell, CancellationToken token); Task<IEnumerable<PlannedTrajectoryDto>?> GetAsync(int idWell, CancellationToken token);
/// <summary> /// <summary>
/// Добавить строки с координатами /// Добавить строки с координатами
@ -50,6 +50,14 @@ namespace AsbCloudApp.Services
/// <param name="token"></param> /// <param name="token"></param>
/// <returns></returns> /// <returns></returns>
Task<int> DeleteRangeAsync(IEnumerable<int> ids, CancellationToken token); Task<int> DeleteRangeAsync(IEnumerable<int> ids, CancellationToken token);
/// <summary>
/// Удалить всю плановую траекторию по ИД скважины
/// </summary>
/// <param name="idWell"></param>
/// <param name="token"></param>
/// <returns></returns>
Task DeleteAllByIdWellAsync(int idWell, CancellationToken token);
} }
#nullable disable #nullable disable
} }

87
AsbCloudInfrastructure/Services/PlannedTrajectoryService/PlannedTrajectoryImportService.cs
View File

@ -1,13 +1,11 @@
using AsbCloudApp.Data; using AsbCloudApp.Data;
using AsbCloudApp.Services; using AsbCloudApp.Services;
using AsbCloudDb.Model;
using ClosedXML.Excel; using ClosedXML.Excel;
using Mapster;
using Microsoft.EntityFrameworkCore;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Threading;
using System.Threading.Tasks;
namespace AsbCloudInfrastructure.Services.PlannedTrajectory namespace AsbCloudInfrastructure.Services.PlannedTrajectory
{ {
@ -18,8 +16,8 @@ namespace AsbCloudInfrastructure.Services.PlannedTrajectory
* password for PlannedTrajectoryTemplate.xlsx is Drill2022 * password for PlannedTrajectoryTemplate.xlsx is Drill2022
*/ */
private readonly IAsbCloudDbContext db;
private readonly IWellService wellService; private readonly IWellService wellService;
private readonly IPlannedTrajectoryService plannedTrajectoryService;
private const string sheetNamePlannedTrajectory = "Плановая траектория"; private const string sheetNamePlannedTrajectory = "Плановая траектория";
private const int headerRowsCount = 2; private const int headerRowsCount = 2;
@ -39,10 +37,11 @@ namespace AsbCloudInfrastructure.Services.PlannedTrajectory
private const int ColumnOrificeOffset = 14; private const int ColumnOrificeOffset = 14;
private const int ColumnComment = 15; private const int ColumnComment = 15;
public PlannedTrajectoryImportService(IAsbCloudDbContext db, IWellService wellService) public PlannedTrajectoryImportService(IWellService wellService, IPlannedTrajectoryService plannedTrajectoryService)
{ {
this.db = db;
this.wellService = wellService; this.wellService = wellService;
this.plannedTrajectoryService = plannedTrajectoryService;
} }
public Stream GetTemplateFile() public Stream GetTemplateFile()
@ -52,20 +51,21 @@ namespace AsbCloudInfrastructure.Services.PlannedTrajectory
return stream; return stream;
} }
public Stream Export(int idWell) public string GetFileName (int idWell, CancellationToken token)
{ {
var plannedTrajectorys = db.PlannedTrajectorys var fileName = wellService.GetWellCaptionByIdAsync(idWell, token) + "_plannedTrajectory.xlsx";
.Where(o => o.IdWell == idWell) return fileName;
.AsNoTracking() }
.ToList();
public async Task<Stream> ExportAsync(int idWell, CancellationToken token)
{
var plannedTrajectorys = await plannedTrajectoryService.GetAsync(idWell, token);
if (!plannedTrajectorys.Any()) if (!plannedTrajectorys.Any())
return null; return null;
var timezone = wellService.GetTimezone(idWell);
return MakeExelFileStream(plannedTrajectorys); return MakeExelFileStream(plannedTrajectorys);
} }
private Stream MakeExelFileStream(IEnumerable<AsbCloudDb.Model.PlannedTrajectory> plannedTrajectories) private Stream MakeExelFileStream(IEnumerable<PlannedTrajectoryDto> plannedTrajectories)
{ {
using Stream ecxelTemplateStream = GetTemplateFile(); using Stream ecxelTemplateStream = GetTemplateFile();
using var workbook = new XLWorkbook(ecxelTemplateStream, XLEventTracking.Disabled); using var workbook = new XLWorkbook(ecxelTemplateStream, XLEventTracking.Disabled);
@ -76,7 +76,7 @@ namespace AsbCloudInfrastructure.Services.PlannedTrajectory
return memoryStream; return memoryStream;
} }
private static void AddOperationsToWorkbook(XLWorkbook workbook, IEnumerable<AsbCloudDb.Model.PlannedTrajectory> plannedTrajectories) private static void AddOperationsToWorkbook(XLWorkbook workbook, IEnumerable<PlannedTrajectoryDto> plannedTrajectories)
{ {
if (plannedTrajectories.Any()) if (plannedTrajectories.Any())
{ {
@ -85,16 +85,16 @@ namespace AsbCloudInfrastructure.Services.PlannedTrajectory
} }
} }
private static void AddOperationsToSheet(IXLWorksheet sheet, IEnumerable<AsbCloudDb.Model.PlannedTrajectory> plannedTrajectories) private static void AddOperationsToSheet(IXLWorksheet sheet, IEnumerable<PlannedTrajectoryDto> plannedTrajectories)
{ {
var operationsList = plannedTrajectories.ToList(); var rowList = plannedTrajectories.ToList();
for (int i = 0; i < operationsList.Count; i++) for (int i = 0; i < rowList.Count; i++)
{ {
var row = sheet.Row(1 + i + headerRowsCount); var row = sheet.Row(1 + i + headerRowsCount);
AddOperationToRow(row, operationsList[i]); AddOperationToRow(row, rowList[i]);
} }
} }
private static void AddOperationToRow(IXLRow row, AsbCloudDb.Model.PlannedTrajectory trajectory) private static void AddOperationToRow(IXLRow row, PlannedTrajectoryDto trajectory)
{ {
row.Cell(ColumnWellboreDepth).Value = trajectory.WellboreDepth; row.Cell(ColumnWellboreDepth).Value = trajectory.WellboreDepth;
row.Cell(ColumnZenithAngle).Value = trajectory.ZenithAngle; row.Cell(ColumnZenithAngle).Value = trajectory.ZenithAngle;
@ -113,41 +113,25 @@ namespace AsbCloudInfrastructure.Services.PlannedTrajectory
row.Cell(ColumnComment).Value = trajectory.Comment; row.Cell(ColumnComment).Value = trajectory.Comment;
} }
public void Import(int idWell, int idUser, Stream stream, bool deletePrevRows = false) public async Task<int> ImportAsync(int idWell, int idUser, Stream stream, CancellationToken token, bool deletePrevRows = false)
{ {
using var workbook = new XLWorkbook(stream, XLEventTracking.Disabled); using var workbook = new XLWorkbook(stream, XLEventTracking.Disabled);
var trajectoryRows = ParseFileStream(stream); var trajectoryRows = ParseFileStream(stream);
foreach (var row in trajectoryRows) foreach (var row in trajectoryRows)
row.IdWell = idWell; row.IdWell = idWell;
SaveOperations(idWell, idUser, trajectoryRows, deletePrevRows); var rowsCount = await SavePlannedTrajectoryAsync(idWell, idUser, trajectoryRows, token, deletePrevRows);
return rowsCount;
} }
private void SaveOperations(int idWell, int idUser, IEnumerable<PlannedTrajectoryDto> newRows, bool deletePrevRow = false) private async Task<int> SavePlannedTrajectoryAsync(int idWell, int idUser, IEnumerable<PlannedTrajectoryDto> newRows, CancellationToken token, bool deletePrevRow = false)
{
var timezone = wellService.GetTimezone(idWell);
var transaction = db.Database.BeginTransaction();
try
{ {
if (deletePrevRow) if (deletePrevRow)
db.WellOperations.RemoveRange(db.WellOperations.Where(o => o.IdWell == idWell));
var entities = newRows.Select(o =>
{ {
var entity = o.Adapt<AsbCloudDb.Model.PlannedTrajectory>(); await plannedTrajectoryService.DeleteAllByIdWellAsync(idWell, token);
entity.IdWell = idWell;
entity.UpdateDate = DateTime.Today.ToUtcDateTimeOffset(timezone.Hours);
entity.IdUser = idUser;
return entity;
});
db.PlannedTrajectorys.AddRange(entities);
db.SaveChanges();
transaction.Commit();
}
catch
{
transaction.Rollback();
throw;
} }
var rowsCount = await plannedTrajectoryService.AddAsync(idWell, idUser, newRows, token);
return rowsCount;
} }
private IEnumerable<PlannedTrajectoryDto> ParseFileStream(Stream stream) private IEnumerable<PlannedTrajectoryDto> ParseFileStream(Stream stream)
@ -216,22 +200,11 @@ namespace AsbCloudInfrastructure.Services.PlannedTrajectory
var trajectoryRow = new PlannedTrajectoryDto(); var trajectoryRow = new PlannedTrajectoryDto();
static bool isCorrectValue(object value) static double getDoubleValue(object value, string nameParam, IXLRow row)
{ {
if (value is null)
return true;
if (value is double)
return true;
return false;
}
static double? getDoubleValue(object value, string nameParam, IXLRow row)
{
if (!isCorrectValue(value))
throw new FileFormatException($"Лист {row.Worksheet.Name}. Строка {row.RowNumber()} - некорректные данные - {nameParam}");
if (value is double _value) if (value is double _value)
return _value; return _value;
return null; throw new FileFormatException($"Лист {row.Worksheet.Name}. Строка {row.RowNumber()} - некорректные данные - {nameParam}");
} }
trajectoryRow.WellboreDepth = getDoubleValue(_wellboreDepth, "Глубина по стволу", row); trajectoryRow.WellboreDepth = getDoubleValue(_wellboreDepth, "Глубина по стволу", row);

27
AsbCloudInfrastructure/Services/PlannedTrajectoryService/PlannedTrajectoryService.cs
View File

@ -38,6 +38,22 @@ namespace AsbCloudInfrastructure.Services.PlannedTrajectory
.ConfigureAwait(false); .ConfigureAwait(false);
} }
public async Task<int> AddListAsync(int idWell, int idUser, IEnumerable<PlannedTrajectoryDto> plannedTrajectoryRows, CancellationToken token)
{
var timezone = wellService.GetTimezone(idWell);
foreach (var dto in plannedTrajectoryRows)
{
var entity = dto.Adapt<AsbCloudDb.Model.PlannedTrajectory>();
entity.IdWell = idWell;
entity.Id = default;
entity.UpdateDate = DateTime.Today.ToUtcDateTimeOffset(timezone.Hours);
entity.IdUser = idUser;
db.PlannedTrajectorys.Add(entity);
}
return await db.SaveChangesAsync(token)
.ConfigureAwait(false);
}
public async Task<int> DeleteRangeAsync(IEnumerable<int> ids, CancellationToken token) public async Task<int> DeleteRangeAsync(IEnumerable<int> ids, CancellationToken token)
{ {
var query = db.PlannedTrajectorys.Where(e => ids.Contains(e.Id)); var query = db.PlannedTrajectorys.Where(e => ids.Contains(e.Id));
@ -46,7 +62,16 @@ namespace AsbCloudInfrastructure.Services.PlannedTrajectory
.ConfigureAwait(false); .ConfigureAwait(false);
} }
public async Task<IEnumerable<PlannedTrajectoryDto>?> GetCoordinatesAsync(int idWell, CancellationToken token) public async Task DeleteAllByIdWellAsync(int idWell, CancellationToken token)
{
var query = db.PlannedTrajectorys
.Where(e => e.IdWell == idWell);
var ids = await query.Select(r => r.IdWell).ToListAsync(token);
var result = await DeleteRangeAsync(ids, token);
}
public async Task<IEnumerable<PlannedTrajectoryDto>?> GetAsync(int idWell, CancellationToken token)
{ {
var well = wellService.GetOrDefault(idWell); var well = wellService.GetOrDefault(idWell);
if (well is null || well.Timezone is null) if (well is null || well.Timezone is null)

21
AsbCloudWebApi/Controllers/PlannedTrajectoryController.cs
View File

@ -59,17 +59,11 @@ namespace AsbCloudWebApi.Controllers
[ProducesResponseType(typeof(PhysicalFileResult), (int)System.Net.HttpStatusCode.OK)] [ProducesResponseType(typeof(PhysicalFileResult), (int)System.Net.HttpStatusCode.OK)]
public async Task<IActionResult> ExportAsync([FromRoute] int idWell, CancellationToken token = default) public async Task<IActionResult> ExportAsync([FromRoute] int idWell, CancellationToken token = default)
{ {
int? idCompany = User.GetCompanyId(); if (!await CanUserAccessToWellAsync(idWell,
token).ConfigureAwait(false))
if (idCompany is null)
return Forbid(); return Forbid();
var stream = await plannedTrajectoryImportService.ExportAsync(idWell, token);
if (!await wellService.IsCompanyInvolvedInWellAsync((int)idCompany, var fileName = plannedTrajectoryImportService.GetFileName(idWell, token);
idWell, token).ConfigureAwait(false))
return Forbid();
var stream = plannedTrajectoryImportService.Export(idWell);
var fileName = await wellService.GetWellCaptionByIdAsync(idWell, token) + "_plannedTrajectory.xlsx";
return File(stream, "application/octet-stream", fileName); return File(stream, "application/octet-stream", fileName);
} }
@ -110,14 +104,13 @@ namespace AsbCloudWebApi.Controllers
try try
{ {
plannedTrajectoryImportService.Import(idWell, idUser.Value, stream, (options & 1) > 0); var result = plannedTrajectoryImportService.ImportAsync(idWell, idUser.Value, stream, token,(options & 1) > 0);
return Ok(result);
} }
catch (FileFormatException ex) catch (FileFormatException ex)
{ {
return BadRequest(ex.Message); return BadRequest(ex.Message);
} }
return Ok();
} }
@ -145,7 +138,7 @@ namespace AsbCloudWebApi.Controllers
idWell, token).ConfigureAwait(false)) idWell, token).ConfigureAwait(false))
return Forbid(); return Forbid();
var result = plannedTrajectoryService.GetCoordinatesAsync(idWell,token); var result = plannedTrajectoryService.GetAsync(idWell,token);
return Ok(result); return Ok(result);
} }