From 2e96f1982f305872db49b91c9b54b15738c9b470 Mon Sep 17 00:00:00 2001 From: Olga Nemt Date: Mon, 22 May 2023 14:46:19 +0500 Subject: [PATCH 1/2] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=20=D0=B1=D0=B0?= =?UTF-8?q?=D0=B3=D0=B0:=20=D0=BD=D0=B0=20=D1=81=D0=B2=D0=BE=D0=B9=D1=81?= =?UTF-8?q?=D1=82=D0=B2=D0=BE=20DateStart=20=D0=BC=D0=BE=D0=B4=D0=B5=D0=BB?= =?UTF-8?q?=D0=B8=20WellOperationDto=20=D0=BD=D0=B0=D0=B2=D0=B5=D1=88?= =?UTF-8?q?=D0=B0=D0=BD=20=D0=B0=D1=82=D1=80=D0=B8=D0=B1=D1=83=D1=82,=20?= =?UTF-8?q?=D0=BF=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D1=8F=D1=8E=D1=89=D0=B8?= =?UTF-8?q?=D0=B9=20=D0=B4=D0=B0=D1=82=D1=83=20+=20=D1=81=D0=BE=D1=85?= =?UTF-8?q?=D1=80=D0=B0=D0=BD=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BF=D0=BE=D0=BB?= =?UTF-8?q?=D1=8C=D0=B7=D0=BE=D0=B2=D0=B0=D1=82=D0=B5=D0=BB=D1=8F,=20?= =?UTF-8?q?=D0=B8=D0=BC=D0=BF=D0=BE=D1=80=D1=82=D0=B8=D1=80=D1=83=D1=8E?= =?UTF-8?q?=D1=89=D0=B5=D0=B3=D0=BE=20=D0=B4=D0=B0=D0=BD=D0=BD=D1=8B=D0=B5?= =?UTF-8?q?=20=D0=BE=20=D1=84=D0=B0=D0=BA=D1=82=D0=B8=D0=B5=D1=87=D1=81?= =?UTF-8?q?=D0=BA=D0=B8=D1=85=20=D0=BE=D0=BF=D0=B5=D1=80=D0=B0=D1=86=D0=B8?= =?UTF-8?q?=D1=8F=D1=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AsbCloudApp/Data/WellOperationDto.cs | 4 +++- AsbCloudApp/Services/IWellOperationImportService.cs | 3 ++- .../WellOperationService/WellOperationImportService.cs | 6 +++++- AsbCloudWebApi/Controllers/WellOperationController.cs | 2 +- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/AsbCloudApp/Data/WellOperationDto.cs b/AsbCloudApp/Data/WellOperationDto.cs index 35b7cae9..c2b18631 100644 --- a/AsbCloudApp/Data/WellOperationDto.cs +++ b/AsbCloudApp/Data/WellOperationDto.cs @@ -1,4 +1,5 @@ -using System; +using AsbCloudApp.ValidationAttributes; +using System; using System.ComponentModel.DataAnnotations; namespace AsbCloudApp.Data @@ -87,6 +88,7 @@ namespace AsbCloudApp.Data /// /// Дата начала операции /// + [DateValidation(AllowNull = false)] public DateTime DateStart { get; set; } /// diff --git a/AsbCloudApp/Services/IWellOperationImportService.cs b/AsbCloudApp/Services/IWellOperationImportService.cs index 5199d0a7..f8c5fac9 100644 --- a/AsbCloudApp/Services/IWellOperationImportService.cs +++ b/AsbCloudApp/Services/IWellOperationImportService.cs @@ -25,7 +25,8 @@ namespace AsbCloudApp.Services /// /// /// + /// /// Очистить старые перед импортом (если файл проходит валидацию) - void Import(int idWell, Stream stream, bool deleteWellOperationsBeforeImport = false); + void Import(int idWell, Stream stream, int idUser, bool deleteWellOperationsBeforeImport = false); } } \ No newline at end of file diff --git a/AsbCloudInfrastructure/Services/WellOperationService/WellOperationImportService.cs b/AsbCloudInfrastructure/Services/WellOperationService/WellOperationImportService.cs index 2e727acd..152f329c 100644 --- a/AsbCloudInfrastructure/Services/WellOperationService/WellOperationImportService.cs +++ b/AsbCloudInfrastructure/Services/WellOperationService/WellOperationImportService.cs @@ -73,12 +73,15 @@ namespace AsbCloudInfrastructure.Services.WellOperationService this.wellService = wellService; } - public void Import(int idWell, Stream stream, bool deleteWellOperationsBeforeImport = false) + public void Import(int idWell, Stream stream, int idUser, bool deleteWellOperationsBeforeImport = false) { using var workbook = new XLWorkbook(stream, XLEventTracking.Disabled); var operations = ParseFileStream(stream); foreach (var operation in operations) + { operation.IdWell = idWell; + operation.IdUser = idUser; + } SaveOperations(idWell, operations, deleteWellOperationsBeforeImport); } @@ -177,6 +180,7 @@ namespace AsbCloudInfrastructure.Services.WellOperationService var entity = o.Adapt(); entity.IdWell = idWell; entity.DateStart = o.DateStart.ToUtcDateTimeOffset(timezone.Hours); + entity.LastUpdateDate = DateTimeOffset.UtcNow; return entity; }); db.WellOperations.AddRange(entities); diff --git a/AsbCloudWebApi/Controllers/WellOperationController.cs b/AsbCloudWebApi/Controllers/WellOperationController.cs index 0a6183df..21aec4b5 100644 --- a/AsbCloudWebApi/Controllers/WellOperationController.cs +++ b/AsbCloudWebApi/Controllers/WellOperationController.cs @@ -308,7 +308,7 @@ namespace AsbCloudWebApi.Controllers try { - wellOperationImportService.Import(idWell, stream, (options & 1) > 0); + wellOperationImportService.Import(idWell, stream, idUser!.Value, (options & 1) > 0); } catch (FileFormatException ex) { From bc0e33aaf574e19065d18ae4ed6dfe6741a3fb4d Mon Sep 17 00:00:00 2001 From: Olga Nemt Date: Tue, 23 May 2023 10:53:31 +0500 Subject: [PATCH 2/2] =?UTF-8?q?=D0=9F=D1=80=D0=B0=D0=B2=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AsbCloudApp/Data/WellOperationDto.cs | 2 +- AsbCloudWebApi/Controllers/WellOperationController.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/AsbCloudApp/Data/WellOperationDto.cs b/AsbCloudApp/Data/WellOperationDto.cs index c2b18631..310b25d5 100644 --- a/AsbCloudApp/Data/WellOperationDto.cs +++ b/AsbCloudApp/Data/WellOperationDto.cs @@ -88,7 +88,7 @@ namespace AsbCloudApp.Data /// /// Дата начала операции /// - [DateValidation(AllowNull = false)] + [DateValidation(GtDate = "2010-01-01T00:00:00")] public DateTime DateStart { get; set; } /// diff --git a/AsbCloudWebApi/Controllers/WellOperationController.cs b/AsbCloudWebApi/Controllers/WellOperationController.cs index 21aec4b5..9d8f8a2a 100644 --- a/AsbCloudWebApi/Controllers/WellOperationController.cs +++ b/AsbCloudWebApi/Controllers/WellOperationController.cs @@ -308,7 +308,7 @@ namespace AsbCloudWebApi.Controllers try { - wellOperationImportService.Import(idWell, stream, idUser!.Value, (options & 1) > 0); + wellOperationImportService.Import(idWell, stream, idUser.Value, (options & 1) > 0); } catch (FileFormatException ex) {