diff --git a/AsbCloudApp/Data/DailyReport/TimeBalanceDto.cs b/AsbCloudApp/Data/DailyReport/TimeBalanceDto.cs
index 96f6bba6..40634148 100644
--- a/AsbCloudApp/Data/DailyReport/TimeBalanceDto.cs
+++ b/AsbCloudApp/Data/DailyReport/TimeBalanceDto.cs
@@ -94,6 +94,26 @@
/// НПВ
///
public string Npv { get; set; }
+
+ ///
+ /// Проработка перед наращиванием
+ ///
+ public string ElaborationBeforeBuilding { get; set; }
+
+ ///
+ /// Шаблонировка перед наращиванием
+ ///
+ public string TemplatingBeforeBuilding { get; set; }
+
+ ///
+ /// Промывка перед наращиванием
+ ///
+ public string FlushingBeforeBuilding { get; set; }
+
+ ///
+ /// Статический замер телесистемы
+ ///
+ public string StaticSurveying { get; set; }
}
}
diff --git a/AsbCloudApp/Data/FileInfoDto.cs b/AsbCloudApp/Data/FileInfoDto.cs
index e85c6193..63abba8f 100644
--- a/AsbCloudApp/Data/FileInfoDto.cs
+++ b/AsbCloudApp/Data/FileInfoDto.cs
@@ -39,11 +39,6 @@ namespace AsbCloudApp.Data
///
public long Size { get; set; }
- ///
- /// инфо о публикации файла на гугл диске
- ///
- public FilePublishInfoDto PublishInfo { get; set; }
-
///
/// DTO автора
///
diff --git a/AsbCloudApp/Data/FilePublishInfoDto.cs b/AsbCloudApp/Data/FilePublishInfoDto.cs
deleted file mode 100644
index 5a3fd6d2..00000000
--- a/AsbCloudApp/Data/FilePublishInfoDto.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using System;
-
-namespace AsbCloudApp.Data
-{
- ///
- ///
- ///
- public class FilePublishInfoDto
- {
- ///
- ///
- ///
- public string PublisherLogin { get; set; }
-
- ///
- ///
- ///
- public DateTime Date { get; set; }
-
- ///
- ///
- ///
- public string WebStorageFileUrl { get; set; }
- }
-}
\ No newline at end of file
diff --git a/AsbCloudApp/Data/SAUB/TelemetryDataSaubDto.cs b/AsbCloudApp/Data/SAUB/TelemetryDataSaubDto.cs
index 5b741abc..a925b27f 100644
--- a/AsbCloudApp/Data/SAUB/TelemetryDataSaubDto.cs
+++ b/AsbCloudApp/Data/SAUB/TelemetryDataSaubDto.cs
@@ -15,7 +15,7 @@ namespace AsbCloudApp.Data.SAUB
///
/// метка времени данных (legacy)
///
- public DateTime Date // TODO: remove this legacy after all panels updated
+ public DateTime Date // TODO: remove this legacy after all panels updated (> 3.2.0407)
{
get { return DateTime; }
set { DateTime = value; }
diff --git a/AsbCloudApp/Data/WellOperationDto.cs b/AsbCloudApp/Data/WellOperationDto.cs
index 4c451d26..f5caebef 100644
--- a/AsbCloudApp/Data/WellOperationDto.cs
+++ b/AsbCloudApp/Data/WellOperationDto.cs
@@ -2,6 +2,8 @@
namespace AsbCloudApp.Data
{
+ //todo: добавить валидацию
+
///
/// Операции на скважине (заведенные пользователем)
///
diff --git a/AsbCloudApp/Services/IDailyReportService.cs b/AsbCloudApp/Services/IDailyReportService.cs
index 28bc72fc..1b8a29d9 100644
--- a/AsbCloudApp/Services/IDailyReportService.cs
+++ b/AsbCloudApp/Services/IDailyReportService.cs
@@ -12,11 +12,51 @@ namespace AsbCloudApp.Services
///
public interface IDailyReportService
{
-
+ ///
+ /// получить список сформированных рапортов по скважине за период времени
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
Task> GetListAsync(int idWell, DateTime? v1, DateTime? v2, CancellationToken cancellationToken);
+
+ ///
+ /// получить из БД или генерировать данные для суточного рапорта за указанную дату
+ ///
+ ///
+ ///
+ ///
+ ///
Task GetOrGenerateAsync(int idWell, DateTime date, CancellationToken token);
+
+ ///
+ /// Добавить новый рапорт
+ ///
+ ///
+ ///
+ ///
+ ///
Task AddAsync(int idWell, DailyReportDto dto, CancellationToken token = default);
+
+ ///
+ /// изменить данные для суточного рапорта
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
Task UpdateAsync(int idWell, DateTime date, DailyReportDto dto, CancellationToken token = default);
+
+ ///
+ /// Сформировать файл рапорта
+ ///
+ ///
+ ///
+ ///
+ ///
Task MakeReportAsync(int idWell, DateTime date, CancellationToken token = default);
}
}
diff --git a/AsbCloudApp/Services/IDrillFlowChartService.cs b/AsbCloudApp/Services/IDrillFlowChartService.cs
index 54e98b71..dbe675d1 100644
--- a/AsbCloudApp/Services/IDrillFlowChartService.cs
+++ b/AsbCloudApp/Services/IDrillFlowChartService.cs
@@ -9,7 +9,7 @@ namespace AsbCloudApp.Services
///
///
///
- public interface IDrillFlowChartService : ICrudWellRelatedService
+ public interface IDrillFlowChartRepository : IRepositoryWellRelated
{
///
/// .
diff --git a/AsbCloudApp/Services/IFileService.cs b/AsbCloudApp/Services/IFileService.cs
index 23f0ee88..c1153e4e 100644
--- a/AsbCloudApp/Services/IFileService.cs
+++ b/AsbCloudApp/Services/IFileService.cs
@@ -19,27 +19,6 @@ namespace AsbCloudApp.Services
///
string RootPath { get; }
- ///
- /// получить url Google drive
- ///
- ///
- ///
- ///
- ///
- ///
- Task GetSharedUrlAsync(int idFileInfo, int idUser, IFileShareService fileShareService, CancellationToken token);
-
- ///
- /// получить url Google drive
- ///
- ///
- ///
- ///
- ///
- ///
- Task GetSharedUrlAsync(FileInfoDto dto, int idUser, IFileShareService fileShareService,
- CancellationToken token = default);
-
///
/// Сохранить файл
///
diff --git a/AsbCloudApp/Services/IFileShareService.cs b/AsbCloudApp/Services/IFileShareService.cs
deleted file mode 100644
index 98ce3ab7..00000000
--- a/AsbCloudApp/Services/IFileShareService.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace AsbCloudApp.Services
-{
- //TODO:
-
- ///
- /// Google disk
- ///
- public interface IFileShareService
- {
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- Task PublishFileToCloudAsync(string filePath, string originalName,
- CancellationToken token);
-
- ///
- ///
- ///
- ///
- ///
- ///
- Task DeleteFileAsync(string sharedFileId,
- CancellationToken token = default);
- }
-}
\ No newline at end of file
diff --git a/AsbCloudApp/Services/IMessageService.cs b/AsbCloudApp/Services/IMessageService.cs
index 98dc863d..0b2261a4 100644
--- a/AsbCloudApp/Services/IMessageService.cs
+++ b/AsbCloudApp/Services/IMessageService.cs
@@ -7,14 +7,36 @@ using System.Threading.Tasks;
namespace AsbCloudApp.Services
{
+ ///
+ /// Сервис сообщений панели оператора
+ ///
public interface IMessageService
{
+ ///
+ /// Получить сообщения по параметрам
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
Task> GetMessagesAsync(int idWell,
IEnumerable categoryids = default, DateTime begin = default,
DateTime end = default, string searchString = default,
int skip = 0, int take = 32,
CancellationToken token = default);
+ ///
+ /// Метод для сохранения сообщения от панели
+ ///
+ ///
+ ///
+ ///
+ ///
Task InsertAsync(string uid, IEnumerable dtos,
CancellationToken token);
}
diff --git a/AsbCloudApp/Services/IOperationValueService.cs b/AsbCloudApp/Services/IOperationValueService.cs
deleted file mode 100644
index a35af223..00000000
--- a/AsbCloudApp/Services/IOperationValueService.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using AsbCloudApp.Data;
-
-namespace AsbCloudApp.Services
-{
- public interface IOperationValueService : ICrudWellRelatedService
- {
- }
-}
diff --git a/AsbCloudApp/Services/IOperationsStatService.cs b/AsbCloudApp/Services/IOperationsStatService.cs
index e1292855..6ceb76e1 100644
--- a/AsbCloudApp/Services/IOperationsStatService.cs
+++ b/AsbCloudApp/Services/IOperationsStatService.cs
@@ -5,12 +5,50 @@ using System.Threading.Tasks;
namespace AsbCloudApp.Services
{
+ ///
+ /// Сервис расчета статистики по операциям вводимым вручную
+ ///
public interface IOperationsStatService
{
+ ///
+ /// Получить статистику МСП по кусту в котором находится скважина с IdWell
+ ///
+ ///
+ ///
+ ///
Task GetRopStatAsync(int idWell, CancellationToken token);
+
+ ///
+ /// Получить статистику по скважинам куста, которые доступны компании
+ ///
+ ///
+ ///
+ ///
+ ///
Task GetStatClusterAsync(int idCluster, int idCompany, CancellationToken token = default);
+
+ ///
+ /// получить статистику по скважине
+ ///
+ ///
+ ///
+ ///
Task GetWellStatAsync(int idWell, CancellationToken token = default);
+
+ ///
+ /// Получить данные для графика TVD
+ ///
+ ///
+ ///
+ ///
Task>> GetTvdAsync(int idWell, CancellationToken token);
+
+ ///
+ /// Получить статистику по набору скважин
+ ///
+ ///
+ ///
+ ///
Task> GetWellsStatAsync(IEnumerable idWells, CancellationToken token);
}
}
diff --git a/AsbCloudApp/Services/IPaginationService.cs b/AsbCloudApp/Services/IPaginationService.cs
deleted file mode 100644
index 57195edb..00000000
--- a/AsbCloudApp/Services/IPaginationService.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace AsbCloudApp.Services
-{
- public interface IPaginationService
- {
- Task> GetPageAsync(int skip = 0, int take = 32, CancellationToken token = default);
- }
-}
\ No newline at end of file
diff --git a/AsbCloudApp/Services/IReportService.cs b/AsbCloudApp/Services/IReportService.cs
index 0261e986..c66861b7 100644
--- a/AsbCloudApp/Services/IReportService.cs
+++ b/AsbCloudApp/Services/IReportService.cs
@@ -6,15 +6,57 @@ using System.Threading.Tasks;
namespace AsbCloudApp.Services
{
+ ///
+ /// Сервис рапортов
+ ///
public interface IReportService
{
+ ///
+ /// категория рапорта
+ ///
int ReportCategoryId { get; }
+
+ // TODO: rename this method
+ ///
+ /// Поставить рапорт в очередь на формирование
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
string CreateReport(int idWell, int idUser, int stepSeconds,
int format, DateTime begin, DateTime end,
Action