From 0ec04f529a70d00c159b35cea863793b59a20126 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A4=D1=80=D0=BE=D0=BB=D0=BE=D0=B2?= Date: Tue, 9 Nov 2021 17:58:42 +0500 Subject: [PATCH 1/6] update client --- src/services/api/index.ts | 9 ++ src/services/api/models/AuthDto.ts | 2 +- src/services/api/models/ClusterDto.ts | 2 +- .../models/ClusterDtoPaginationContainer.ts | 12 +++ src/services/api/models/CompanyDto.ts | 2 +- .../models/CompanyDtoPaginationContainer.ts | 12 +++ src/services/api/models/DatesRangeDto.ts | 2 +- src/services/api/models/DepositDto.ts | 2 +- .../models/DepositDtoPaginationContainer.ts | 12 +++ src/services/api/models/DrillFlowChartDto.ts | 2 +- src/services/api/models/DrillParamsDto.ts | 2 +- src/services/api/models/EventDto.ts | 2 +- src/services/api/models/FileInfoDto.ts | 6 +- .../models/FileInfoDtoPaginationContainer.ts | 2 +- src/services/api/models/FileMarkDto.ts | 15 +++ src/services/api/models/FilePublishInfoDto.ts | 9 ++ src/services/api/models/MeasureDto.ts | 2 +- src/services/api/models/MessageDto.ts | 2 +- .../models/MessageDtoPaginationContainer.ts | 2 +- src/services/api/models/StatClusterDto.ts | 2 +- src/services/api/models/StatOperationsDto.ts | 2 +- .../models/StatOperationsDtoPlanFactBase.ts | 2 +- src/services/api/models/StatSectionDto.ts | 2 +- src/services/api/models/StatWellDto.ts | 2 +- .../api/models/TelemetryDataSaubDto.ts | 2 +- .../api/models/TelemetryDataSpinDto.ts | 2 +- src/services/api/models/TelemetryDto.ts | 2 +- .../models/TelemetryDtoPaginationContainer.ts | 12 +++ src/services/api/models/TelemetryInfoDto.ts | 2 +- .../api/models/TelemetryMessageDto.ts | 2 +- .../api/models/TelemetryOperationDto.ts | 2 +- ...elemetryOperationDtoPaginationContainer.ts | 2 +- .../models/TelemetryOperationDurationDto.ts | 2 +- src/services/api/models/TelemetryUserDto.ts | 2 +- src/services/api/models/UserDto.ts | 2 +- .../api/models/UserDtoPaginationContainer.ts | 12 +++ src/services/api/models/UserRoleDto.ts | 2 +- .../models/UserRoleDtoPaginationContainer.ts | 12 +++ src/services/api/models/UserTokenDto.ts | 2 +- src/services/api/models/WellCompositeDto.ts | 2 +- src/services/api/models/WellDepthToDayDto.ts | 2 +- .../api/models/WellDepthToIntervalDto.ts | 2 +- src/services/api/models/WellDto.ts | 2 +- .../api/models/WellDtoPaginationContainer.ts | 12 +++ .../api/models/WellOperationCategoryDto.ts | 2 +- src/services/api/models/WellOperationDto.ts | 2 +- .../WellOperationDtoPaginationContainer.ts | 2 +- .../WellOperationDtoPlanFactPredictBase.ts | 2 +- src/services/api/models/WellParamsDto.ts | 2 +- .../api/services/AdminClusterService.ts | 35 +++--- .../api/services/AdminCompanyService.ts | 35 +++--- .../api/services/AdminDepositService.ts | 35 +++--- .../api/services/AdminTelemetryService.ts | 39 +++---- .../api/services/AdminUserRoleService.ts | 35 +++--- src/services/api/services/AdminUserService.ts | 35 +++--- src/services/api/services/AdminWellService.ts | 35 +++--- src/services/api/services/AuthService.ts | 24 ++--- src/services/api/services/ClusterService.ts | 6 +- src/services/api/services/DepositService.ts | 6 +- .../api/services/DrillFlowChartService.ts | 36 +++---- .../api/services/DrillParamsService.ts | 48 ++++----- .../api/services/DrillingProgramService.ts | 53 ++++++++-- src/services/api/services/FileService.ts | 100 +++++++++++------- src/services/api/services/MeasureService.ts | 56 +++++----- src/services/api/services/MessageService.ts | 20 ++-- src/services/api/services/ReportService.ts | 46 ++++---- .../api/services/TelemetryAnalyticsService.ts | 46 ++++---- .../api/services/TelemetryDataSaubService.ts | 24 ++--- .../api/services/TelemetryDataSpinService.ts | 24 ++--- src/services/api/services/TelemetryService.ts | 24 ++--- .../api/services/WellCompositeService.ts | 10 +- .../api/services/WellOperationService.ts | 78 +++++++------- .../api/services/WellOperationStatService.ts | 18 ++-- src/services/api/services/WellService.ts | 14 +-- 74 files changed, 636 insertions(+), 445 deletions(-) create mode 100644 src/services/api/models/ClusterDtoPaginationContainer.ts create mode 100644 src/services/api/models/CompanyDtoPaginationContainer.ts create mode 100644 src/services/api/models/DepositDtoPaginationContainer.ts create mode 100644 src/services/api/models/FileMarkDto.ts create mode 100644 src/services/api/models/FilePublishInfoDto.ts create mode 100644 src/services/api/models/TelemetryDtoPaginationContainer.ts create mode 100644 src/services/api/models/UserDtoPaginationContainer.ts create mode 100644 src/services/api/models/UserRoleDtoPaginationContainer.ts create mode 100644 src/services/api/models/WellDtoPaginationContainer.ts diff --git a/src/services/api/index.ts b/src/services/api/index.ts index 36b4c1c..63ab684 100644 --- a/src/services/api/index.ts +++ b/src/services/api/index.ts @@ -6,14 +6,19 @@ export { OpenAPI } from './core/OpenAPI'; export type { AuthDto } from './models/AuthDto'; export type { ClusterDto } from './models/ClusterDto'; +export type { ClusterDtoPaginationContainer } from './models/ClusterDtoPaginationContainer'; export type { CompanyDto } from './models/CompanyDto'; +export type { CompanyDtoPaginationContainer } from './models/CompanyDtoPaginationContainer'; export type { DatesRangeDto } from './models/DatesRangeDto'; export type { DepositDto } from './models/DepositDto'; +export type { DepositDtoPaginationContainer } from './models/DepositDtoPaginationContainer'; export type { DrillFlowChartDto } from './models/DrillFlowChartDto'; export type { DrillParamsDto } from './models/DrillParamsDto'; export type { EventDto } from './models/EventDto'; export type { FileInfoDto } from './models/FileInfoDto'; export type { FileInfoDtoPaginationContainer } from './models/FileInfoDtoPaginationContainer'; +export type { FileMarkDto } from './models/FileMarkDto'; +export type { FilePublishInfoDto } from './models/FilePublishInfoDto'; export type { MeasureDto } from './models/MeasureDto'; export type { MessageDto } from './models/MessageDto'; export type { MessageDtoPaginationContainer } from './models/MessageDtoPaginationContainer'; @@ -25,6 +30,7 @@ export type { StatWellDto } from './models/StatWellDto'; export type { TelemetryDataSaubDto } from './models/TelemetryDataSaubDto'; export type { TelemetryDataSpinDto } from './models/TelemetryDataSpinDto'; export type { TelemetryDto } from './models/TelemetryDto'; +export type { TelemetryDtoPaginationContainer } from './models/TelemetryDtoPaginationContainer'; export type { TelemetryInfoDto } from './models/TelemetryInfoDto'; export type { TelemetryMessageDto } from './models/TelemetryMessageDto'; export type { TelemetryOperationDto } from './models/TelemetryOperationDto'; @@ -32,12 +38,15 @@ export type { TelemetryOperationDtoPaginationContainer } from './models/Telemetr export type { TelemetryOperationDurationDto } from './models/TelemetryOperationDurationDto'; export type { TelemetryUserDto } from './models/TelemetryUserDto'; export type { UserDto } from './models/UserDto'; +export type { UserDtoPaginationContainer } from './models/UserDtoPaginationContainer'; export type { UserRoleDto } from './models/UserRoleDto'; +export type { UserRoleDtoPaginationContainer } from './models/UserRoleDtoPaginationContainer'; export type { UserTokenDto } from './models/UserTokenDto'; export type { WellCompositeDto } from './models/WellCompositeDto'; export type { WellDepthToDayDto } from './models/WellDepthToDayDto'; export type { WellDepthToIntervalDto } from './models/WellDepthToIntervalDto'; export type { WellDto } from './models/WellDto'; +export type { WellDtoPaginationContainer } from './models/WellDtoPaginationContainer'; export type { WellOperationCategoryDto } from './models/WellOperationCategoryDto'; export type { WellOperationDto } from './models/WellOperationDto'; export type { WellOperationDtoPaginationContainer } from './models/WellOperationDtoPaginationContainer'; diff --git a/src/services/api/models/AuthDto.ts b/src/services/api/models/AuthDto.ts index bd6f347..a8317bf 100644 --- a/src/services/api/models/AuthDto.ts +++ b/src/services/api/models/AuthDto.ts @@ -5,4 +5,4 @@ export type AuthDto = { login?: string | null; password?: string | null; -} +} \ No newline at end of file diff --git a/src/services/api/models/ClusterDto.ts b/src/services/api/models/ClusterDto.ts index 226f3a0..ec20834 100644 --- a/src/services/api/models/ClusterDto.ts +++ b/src/services/api/models/ClusterDto.ts @@ -11,4 +11,4 @@ export type ClusterDto = { latitude?: number | null; longitude?: number | null; wells?: Array | null; -} +} \ No newline at end of file diff --git a/src/services/api/models/ClusterDtoPaginationContainer.ts b/src/services/api/models/ClusterDtoPaginationContainer.ts new file mode 100644 index 0000000..ae329ff --- /dev/null +++ b/src/services/api/models/ClusterDtoPaginationContainer.ts @@ -0,0 +1,12 @@ +/* istanbul ignore file */ +/* tslint:disable */ +/* eslint-disable */ + +import type { ClusterDto } from './ClusterDto'; + +export type ClusterDtoPaginationContainer = { + skip?: number; + take?: number; + count?: number; + items?: Array | null; +} \ No newline at end of file diff --git a/src/services/api/models/CompanyDto.ts b/src/services/api/models/CompanyDto.ts index 85fb2ad..e532790 100644 --- a/src/services/api/models/CompanyDto.ts +++ b/src/services/api/models/CompanyDto.ts @@ -6,4 +6,4 @@ export type CompanyDto = { id?: number; caption?: string | null; companyTypeCaption?: string | null; -} +} \ No newline at end of file diff --git a/src/services/api/models/CompanyDtoPaginationContainer.ts b/src/services/api/models/CompanyDtoPaginationContainer.ts new file mode 100644 index 0000000..006ad77 --- /dev/null +++ b/src/services/api/models/CompanyDtoPaginationContainer.ts @@ -0,0 +1,12 @@ +/* istanbul ignore file */ +/* tslint:disable */ +/* eslint-disable */ + +import type { CompanyDto } from './CompanyDto'; + +export type CompanyDtoPaginationContainer = { + skip?: number; + take?: number; + count?: number; + items?: Array | null; +} \ No newline at end of file diff --git a/src/services/api/models/DatesRangeDto.ts b/src/services/api/models/DatesRangeDto.ts index acbe4e8..1a9132f 100644 --- a/src/services/api/models/DatesRangeDto.ts +++ b/src/services/api/models/DatesRangeDto.ts @@ -5,4 +5,4 @@ export type DatesRangeDto = { from?: string; to?: string; -} +} \ No newline at end of file diff --git a/src/services/api/models/DepositDto.ts b/src/services/api/models/DepositDto.ts index c57ae4a..c142448 100644 --- a/src/services/api/models/DepositDto.ts +++ b/src/services/api/models/DepositDto.ts @@ -11,4 +11,4 @@ export type DepositDto = { latitude?: number | null; longitude?: number | null; clusters?: Array | null; -} +} \ No newline at end of file diff --git a/src/services/api/models/DepositDtoPaginationContainer.ts b/src/services/api/models/DepositDtoPaginationContainer.ts new file mode 100644 index 0000000..861b9bd --- /dev/null +++ b/src/services/api/models/DepositDtoPaginationContainer.ts @@ -0,0 +1,12 @@ +/* istanbul ignore file */ +/* tslint:disable */ +/* eslint-disable */ + +import type { DepositDto } from './DepositDto'; + +export type DepositDtoPaginationContainer = { + skip?: number; + take?: number; + count?: number; + items?: Array | null; +} \ No newline at end of file diff --git a/src/services/api/models/DrillFlowChartDto.ts b/src/services/api/models/DrillFlowChartDto.ts index ec4a959..7da53b9 100644 --- a/src/services/api/models/DrillFlowChartDto.ts +++ b/src/services/api/models/DrillFlowChartDto.ts @@ -19,4 +19,4 @@ export type DrillFlowChartDto = { rotorSpeedMax?: number; flowMin?: number; flowMax?: number; -} +} \ No newline at end of file diff --git a/src/services/api/models/DrillParamsDto.ts b/src/services/api/models/DrillParamsDto.ts index 406c87a..560b831 100644 --- a/src/services/api/models/DrillParamsDto.ts +++ b/src/services/api/models/DrillParamsDto.ts @@ -23,4 +23,4 @@ export type DrillParamsDto = { flowMin?: number; flowAvg?: number; flowMax?: number; -} +} \ No newline at end of file diff --git a/src/services/api/models/EventDto.ts b/src/services/api/models/EventDto.ts index e7e334b..e4d90a1 100644 --- a/src/services/api/models/EventDto.ts +++ b/src/services/api/models/EventDto.ts @@ -9,4 +9,4 @@ export type EventDto = { tag?: string | null; eventType?: number; idSound?: number; -} +} \ No newline at end of file diff --git a/src/services/api/models/FileInfoDto.ts b/src/services/api/models/FileInfoDto.ts index d727028..c960d37 100644 --- a/src/services/api/models/FileInfoDto.ts +++ b/src/services/api/models/FileInfoDto.ts @@ -2,6 +2,8 @@ /* tslint:disable */ /* eslint-disable */ +import type { FileMarkDto } from './FileMarkDto'; +import type { FilePublishInfoDto } from './FilePublishInfoDto'; import type { UserDto } from './UserDto'; export type FileInfoDto = { @@ -12,5 +14,7 @@ export type FileInfoDto = { name?: string | null; uploadDate?: string; size?: number; + publishInfo?: FilePublishInfoDto; author?: UserDto; -} + fileMarks?: Array | null; +} \ No newline at end of file diff --git a/src/services/api/models/FileInfoDtoPaginationContainer.ts b/src/services/api/models/FileInfoDtoPaginationContainer.ts index 7bf4f27..6a8d883 100644 --- a/src/services/api/models/FileInfoDtoPaginationContainer.ts +++ b/src/services/api/models/FileInfoDtoPaginationContainer.ts @@ -9,4 +9,4 @@ export type FileInfoDtoPaginationContainer = { take?: number; count?: number; items?: Array | null; -} +} \ No newline at end of file diff --git a/src/services/api/models/FileMarkDto.ts b/src/services/api/models/FileMarkDto.ts new file mode 100644 index 0000000..4acce19 --- /dev/null +++ b/src/services/api/models/FileMarkDto.ts @@ -0,0 +1,15 @@ +/* istanbul ignore file */ +/* tslint:disable */ +/* eslint-disable */ + +import type { UserDto } from './UserDto'; + +export type FileMarkDto = { + id?: number; + idFile?: number; + idMarkType?: number; + dateCreated?: string; + comment?: string | null; + isDeleted?: boolean; + user?: UserDto; +} \ No newline at end of file diff --git a/src/services/api/models/FilePublishInfoDto.ts b/src/services/api/models/FilePublishInfoDto.ts new file mode 100644 index 0000000..8d0a093 --- /dev/null +++ b/src/services/api/models/FilePublishInfoDto.ts @@ -0,0 +1,9 @@ +/* istanbul ignore file */ +/* tslint:disable */ +/* eslint-disable */ + +export type FilePublishInfoDto = { + publisherLogin?: string | null; + date?: string; + webStorageFileUrl?: string | null; +} \ No newline at end of file diff --git a/src/services/api/models/MeasureDto.ts b/src/services/api/models/MeasureDto.ts index 5a846f9..dea91c6 100644 --- a/src/services/api/models/MeasureDto.ts +++ b/src/services/api/models/MeasureDto.ts @@ -9,4 +9,4 @@ export type MeasureDto = { categoryName?: string | null; timestamp?: string; data?: Record | null; -} +} \ No newline at end of file diff --git a/src/services/api/models/MessageDto.ts b/src/services/api/models/MessageDto.ts index 081e545..1c5001b 100644 --- a/src/services/api/models/MessageDto.ts +++ b/src/services/api/models/MessageDto.ts @@ -9,4 +9,4 @@ export type MessageDto = { wellDepth?: number; user?: string | null; message?: string | null; -} +} \ No newline at end of file diff --git a/src/services/api/models/MessageDtoPaginationContainer.ts b/src/services/api/models/MessageDtoPaginationContainer.ts index e41bc14..360fed6 100644 --- a/src/services/api/models/MessageDtoPaginationContainer.ts +++ b/src/services/api/models/MessageDtoPaginationContainer.ts @@ -9,4 +9,4 @@ export type MessageDtoPaginationContainer = { take?: number; count?: number; items?: Array | null; -} +} \ No newline at end of file diff --git a/src/services/api/models/StatClusterDto.ts b/src/services/api/models/StatClusterDto.ts index 5bd051a..8f18c1a 100644 --- a/src/services/api/models/StatClusterDto.ts +++ b/src/services/api/models/StatClusterDto.ts @@ -8,4 +8,4 @@ export type StatClusterDto = { id?: number; caption?: string | null; statsWells?: Array | null; -} +} \ No newline at end of file diff --git a/src/services/api/models/StatOperationsDto.ts b/src/services/api/models/StatOperationsDto.ts index 40c7510..6941292 100644 --- a/src/services/api/models/StatOperationsDto.ts +++ b/src/services/api/models/StatOperationsDto.ts @@ -13,4 +13,4 @@ export type StatOperationsDto = { bhaDownSpeed?: number; casingDownSpeed?: number; nonProductiveHours?: number; -} +} \ No newline at end of file diff --git a/src/services/api/models/StatOperationsDtoPlanFactBase.ts b/src/services/api/models/StatOperationsDtoPlanFactBase.ts index cd15dfe..b15856d 100644 --- a/src/services/api/models/StatOperationsDtoPlanFactBase.ts +++ b/src/services/api/models/StatOperationsDtoPlanFactBase.ts @@ -7,4 +7,4 @@ import type { StatOperationsDto } from './StatOperationsDto'; export type StatOperationsDtoPlanFactBase = { plan?: StatOperationsDto; fact?: StatOperationsDto; -} +} \ No newline at end of file diff --git a/src/services/api/models/StatSectionDto.ts b/src/services/api/models/StatSectionDto.ts index 934eb6d..ec2edfe 100644 --- a/src/services/api/models/StatSectionDto.ts +++ b/src/services/api/models/StatSectionDto.ts @@ -9,4 +9,4 @@ export type StatSectionDto = { fact?: StatOperationsDto; id?: number; caption?: string | null; -} +} \ No newline at end of file diff --git a/src/services/api/models/StatWellDto.ts b/src/services/api/models/StatWellDto.ts index 0ef8103..171afff 100644 --- a/src/services/api/models/StatWellDto.ts +++ b/src/services/api/models/StatWellDto.ts @@ -16,4 +16,4 @@ export type StatWellDto = { sections?: Array | null; total?: StatOperationsDtoPlanFactBase; companies?: Array | null; -} +} \ No newline at end of file diff --git a/src/services/api/models/TelemetryDataSaubDto.ts b/src/services/api/models/TelemetryDataSaubDto.ts index 91367bf..c801502 100644 --- a/src/services/api/models/TelemetryDataSaubDto.ts +++ b/src/services/api/models/TelemetryDataSaubDto.ts @@ -42,4 +42,4 @@ export type TelemetryDataSaubDto = { flowDeltaLimitMax?: number | null; idFeedRegulator?: number | null; mseState?: number | null; -} +} \ No newline at end of file diff --git a/src/services/api/models/TelemetryDataSpinDto.ts b/src/services/api/models/TelemetryDataSpinDto.ts index 169aa0f..8a88f08 100644 --- a/src/services/api/models/TelemetryDataSpinDto.ts +++ b/src/services/api/models/TelemetryDataSpinDto.ts @@ -69,4 +69,4 @@ export type TelemetryDataSpinDto = { pidMuxTorqueLeftLimit?: number | null; state?: number | null; breakAngleLeft?: number | null; -} +} \ No newline at end of file diff --git a/src/services/api/models/TelemetryDto.ts b/src/services/api/models/TelemetryDto.ts index b152295..a1eb21a 100644 --- a/src/services/api/models/TelemetryDto.ts +++ b/src/services/api/models/TelemetryDto.ts @@ -8,4 +8,4 @@ export type TelemetryDto = { id?: number; remoteUid?: string | null; info?: TelemetryInfoDto; -} +} \ No newline at end of file diff --git a/src/services/api/models/TelemetryDtoPaginationContainer.ts b/src/services/api/models/TelemetryDtoPaginationContainer.ts new file mode 100644 index 0000000..0d23b24 --- /dev/null +++ b/src/services/api/models/TelemetryDtoPaginationContainer.ts @@ -0,0 +1,12 @@ +/* istanbul ignore file */ +/* tslint:disable */ +/* eslint-disable */ + +import type { TelemetryDto } from './TelemetryDto'; + +export type TelemetryDtoPaginationContainer = { + skip?: number; + take?: number; + count?: number; + items?: Array | null; +} \ No newline at end of file diff --git a/src/services/api/models/TelemetryInfoDto.ts b/src/services/api/models/TelemetryInfoDto.ts index 01b57bc..0486f7c 100644 --- a/src/services/api/models/TelemetryInfoDto.ts +++ b/src/services/api/models/TelemetryInfoDto.ts @@ -14,4 +14,4 @@ export type TelemetryInfoDto = { saubPlcVersion?: string | null; spinPlcVersion?: string | null; comment?: string | null; -} +} \ No newline at end of file diff --git a/src/services/api/models/TelemetryMessageDto.ts b/src/services/api/models/TelemetryMessageDto.ts index 492da5c..ea9f006 100644 --- a/src/services/api/models/TelemetryMessageDto.ts +++ b/src/services/api/models/TelemetryMessageDto.ts @@ -12,4 +12,4 @@ export type TelemetryMessageDto = { arg1?: string | null; arg2?: string | null; arg3?: string | null; -} +} \ No newline at end of file diff --git a/src/services/api/models/TelemetryOperationDto.ts b/src/services/api/models/TelemetryOperationDto.ts index 4b24faa..97cb3b5 100644 --- a/src/services/api/models/TelemetryOperationDto.ts +++ b/src/services/api/models/TelemetryOperationDto.ts @@ -9,4 +9,4 @@ export type TelemetryOperationDto = { endDate?: string; startWellDepth?: number; endWellDepth?: number; -} +} \ No newline at end of file diff --git a/src/services/api/models/TelemetryOperationDtoPaginationContainer.ts b/src/services/api/models/TelemetryOperationDtoPaginationContainer.ts index 06d02c5..d09351d 100644 --- a/src/services/api/models/TelemetryOperationDtoPaginationContainer.ts +++ b/src/services/api/models/TelemetryOperationDtoPaginationContainer.ts @@ -9,4 +9,4 @@ export type TelemetryOperationDtoPaginationContainer = { take?: number; count?: number; items?: Array | null; -} +} \ No newline at end of file diff --git a/src/services/api/models/TelemetryOperationDurationDto.ts b/src/services/api/models/TelemetryOperationDurationDto.ts index dc090a7..361a705 100644 --- a/src/services/api/models/TelemetryOperationDurationDto.ts +++ b/src/services/api/models/TelemetryOperationDurationDto.ts @@ -5,4 +5,4 @@ export type TelemetryOperationDurationDto = { operationName?: string | null; duration?: number; -} +} \ No newline at end of file diff --git a/src/services/api/models/TelemetryUserDto.ts b/src/services/api/models/TelemetryUserDto.ts index b4959fc..4bd727c 100644 --- a/src/services/api/models/TelemetryUserDto.ts +++ b/src/services/api/models/TelemetryUserDto.ts @@ -8,4 +8,4 @@ export type TelemetryUserDto = { surname?: string | null; patronymic?: string | null; level?: number; -} +} \ No newline at end of file diff --git a/src/services/api/models/UserDto.ts b/src/services/api/models/UserDto.ts index 748389f..8c5ae2f 100644 --- a/src/services/api/models/UserDto.ts +++ b/src/services/api/models/UserDto.ts @@ -18,4 +18,4 @@ export type UserDto = { idRole?: number | null; password?: string | null; company?: CompanyDto; -} +} \ No newline at end of file diff --git a/src/services/api/models/UserDtoPaginationContainer.ts b/src/services/api/models/UserDtoPaginationContainer.ts new file mode 100644 index 0000000..650abe0 --- /dev/null +++ b/src/services/api/models/UserDtoPaginationContainer.ts @@ -0,0 +1,12 @@ +/* istanbul ignore file */ +/* tslint:disable */ +/* eslint-disable */ + +import type { UserDto } from './UserDto'; + +export type UserDtoPaginationContainer = { + skip?: number; + take?: number; + count?: number; + items?: Array | null; +} \ No newline at end of file diff --git a/src/services/api/models/UserRoleDto.ts b/src/services/api/models/UserRoleDto.ts index c0810e1..ad7f1d2 100644 --- a/src/services/api/models/UserRoleDto.ts +++ b/src/services/api/models/UserRoleDto.ts @@ -8,4 +8,4 @@ export type UserRoleDto = { id?: number; caption?: string | null; users?: Array | null; -} +} \ No newline at end of file diff --git a/src/services/api/models/UserRoleDtoPaginationContainer.ts b/src/services/api/models/UserRoleDtoPaginationContainer.ts new file mode 100644 index 0000000..d77dd06 --- /dev/null +++ b/src/services/api/models/UserRoleDtoPaginationContainer.ts @@ -0,0 +1,12 @@ +/* istanbul ignore file */ +/* tslint:disable */ +/* eslint-disable */ + +import type { UserRoleDto } from './UserRoleDto'; + +export type UserRoleDtoPaginationContainer = { + skip?: number; + take?: number; + count?: number; + items?: Array | null; +} \ No newline at end of file diff --git a/src/services/api/models/UserTokenDto.ts b/src/services/api/models/UserTokenDto.ts index c7a5f92..feff474 100644 --- a/src/services/api/models/UserTokenDto.ts +++ b/src/services/api/models/UserTokenDto.ts @@ -15,4 +15,4 @@ export type UserTokenDto = { companyName?: string | null; roleName?: string | null; token?: string | null; -} +} \ No newline at end of file diff --git a/src/services/api/models/WellCompositeDto.ts b/src/services/api/models/WellCompositeDto.ts index 2db927d..aab2a1b 100644 --- a/src/services/api/models/WellCompositeDto.ts +++ b/src/services/api/models/WellCompositeDto.ts @@ -6,4 +6,4 @@ export type WellCompositeDto = { idWell?: number; idWellSrc?: number; idWellSectionType?: number; -} +} \ No newline at end of file diff --git a/src/services/api/models/WellDepthToDayDto.ts b/src/services/api/models/WellDepthToDayDto.ts index 6db8d80..51cef5f 100644 --- a/src/services/api/models/WellDepthToDayDto.ts +++ b/src/services/api/models/WellDepthToDayDto.ts @@ -6,4 +6,4 @@ export type WellDepthToDayDto = { wellDepth?: number; bitDepth?: number; date?: string; -} +} \ No newline at end of file diff --git a/src/services/api/models/WellDepthToIntervalDto.ts b/src/services/api/models/WellDepthToIntervalDto.ts index 72d34a2..a92c110 100644 --- a/src/services/api/models/WellDepthToIntervalDto.ts +++ b/src/services/api/models/WellDepthToIntervalDto.ts @@ -5,4 +5,4 @@ export type WellDepthToIntervalDto = { intervalStartDate?: string; intervalDepthProgress?: number; -} +} \ No newline at end of file diff --git a/src/services/api/models/WellDto.ts b/src/services/api/models/WellDto.ts index ebc03bc..9cf1c29 100644 --- a/src/services/api/models/WellDto.ts +++ b/src/services/api/models/WellDto.ts @@ -16,4 +16,4 @@ export type WellDto = { idState?: number; lastTelemetryDate?: string; telemetry?: TelemetryDto; -} +} \ No newline at end of file diff --git a/src/services/api/models/WellDtoPaginationContainer.ts b/src/services/api/models/WellDtoPaginationContainer.ts new file mode 100644 index 0000000..f3f299d --- /dev/null +++ b/src/services/api/models/WellDtoPaginationContainer.ts @@ -0,0 +1,12 @@ +/* istanbul ignore file */ +/* tslint:disable */ +/* eslint-disable */ + +import type { WellDto } from './WellDto'; + +export type WellDtoPaginationContainer = { + skip?: number; + take?: number; + count?: number; + items?: Array | null; +} \ No newline at end of file diff --git a/src/services/api/models/WellOperationCategoryDto.ts b/src/services/api/models/WellOperationCategoryDto.ts index b682abd..5581c68 100644 --- a/src/services/api/models/WellOperationCategoryDto.ts +++ b/src/services/api/models/WellOperationCategoryDto.ts @@ -6,4 +6,4 @@ export type WellOperationCategoryDto = { id?: number; name?: string | null; code?: number; -} +} \ No newline at end of file diff --git a/src/services/api/models/WellOperationDto.ts b/src/services/api/models/WellOperationDto.ts index 7702acf..c0e6f17 100644 --- a/src/services/api/models/WellOperationDto.ts +++ b/src/services/api/models/WellOperationDto.ts @@ -16,4 +16,4 @@ export type WellOperationDto = { dateStart?: string; durationHours?: number; comment?: string | null; -} +} \ No newline at end of file diff --git a/src/services/api/models/WellOperationDtoPaginationContainer.ts b/src/services/api/models/WellOperationDtoPaginationContainer.ts index eaa7dc5..4dbd6b7 100644 --- a/src/services/api/models/WellOperationDtoPaginationContainer.ts +++ b/src/services/api/models/WellOperationDtoPaginationContainer.ts @@ -9,4 +9,4 @@ export type WellOperationDtoPaginationContainer = { take?: number; count?: number; items?: Array | null; -} +} \ No newline at end of file diff --git a/src/services/api/models/WellOperationDtoPlanFactPredictBase.ts b/src/services/api/models/WellOperationDtoPlanFactPredictBase.ts index d753775..86b2a67 100644 --- a/src/services/api/models/WellOperationDtoPlanFactPredictBase.ts +++ b/src/services/api/models/WellOperationDtoPlanFactPredictBase.ts @@ -8,4 +8,4 @@ export type WellOperationDtoPlanFactPredictBase = { plan?: WellOperationDto; fact?: WellOperationDto; predict?: WellOperationDto; -} +} \ No newline at end of file diff --git a/src/services/api/models/WellParamsDto.ts b/src/services/api/models/WellParamsDto.ts index 4f01852..7c77820 100644 --- a/src/services/api/models/WellParamsDto.ts +++ b/src/services/api/models/WellParamsDto.ts @@ -8,4 +8,4 @@ export type WellParamsDto = { longitude?: number | null; idWellType?: number; idState?: number; -} +} \ No newline at end of file diff --git a/src/services/api/services/AdminClusterService.ts b/src/services/api/services/AdminClusterService.ts index f4ded6c..e79634a 100644 --- a/src/services/api/services/AdminClusterService.ts +++ b/src/services/api/services/AdminClusterService.ts @@ -2,6 +2,7 @@ /* tslint:disable */ /* eslint-disable */ import type { ClusterDto } from '../models/ClusterDto'; +import type { ClusterDtoPaginationContainer } from '../models/ClusterDtoPaginationContainer'; import { request as __request } from '../core/request'; export class AdminClusterService { @@ -10,13 +11,13 @@ export class AdminClusterService { * Получить страницу с записями в PaginationContainer * @param skip пропустить skip записей * @param take получить take записей - * @returns any Success + * @returns ClusterDtoPaginationContainer Success * @throws ApiError */ public static async getPage( - skip: number, - take: number = 32, - ): Promise { +skip: number, +take: number = 32, +): Promise { const result = await __request({ method: 'GET', path: `/api/admin/cluster`, @@ -31,12 +32,12 @@ export class AdminClusterService { /** * Добавить запись * @param requestBody запись - * @returns any Success + * @returns number Success * @throws ApiError */ public static async insert( - requestBody?: ClusterDto, - ): Promise { +requestBody?: ClusterDto, +): Promise { const result = await __request({ method: 'POST', path: `/api/admin/cluster`, @@ -48,12 +49,12 @@ export class AdminClusterService { /** * Получить одну запись по Id * @param id id записи - * @returns any Success + * @returns ClusterDto Success * @throws ApiError */ public static async get( - id: number, - ): Promise { +id: number, +): Promise { const result = await __request({ method: 'GET', path: `/api/admin/cluster/${id}`, @@ -65,13 +66,13 @@ export class AdminClusterService { * Редактировать запись по id * @param id id записи * @param requestBody запись - * @returns any Success + * @returns number Success * @throws ApiError */ public static async put( - id: number, - requestBody?: ClusterDto, - ): Promise { +id: number, +requestBody?: ClusterDto, +): Promise { const result = await __request({ method: 'PUT', path: `/api/admin/cluster/${id}`, @@ -83,12 +84,12 @@ export class AdminClusterService { /** * Удалить запись по id * @param id id записи - * @returns any Success + * @returns number Success * @throws ApiError */ public static async delete( - id: number, - ): Promise { +id: number, +): Promise { const result = await __request({ method: 'DELETE', path: `/api/admin/cluster/${id}`, diff --git a/src/services/api/services/AdminCompanyService.ts b/src/services/api/services/AdminCompanyService.ts index fb8d668..6b9cbbb 100644 --- a/src/services/api/services/AdminCompanyService.ts +++ b/src/services/api/services/AdminCompanyService.ts @@ -2,6 +2,7 @@ /* tslint:disable */ /* eslint-disable */ import type { CompanyDto } from '../models/CompanyDto'; +import type { CompanyDtoPaginationContainer } from '../models/CompanyDtoPaginationContainer'; import { request as __request } from '../core/request'; export class AdminCompanyService { @@ -10,13 +11,13 @@ export class AdminCompanyService { * Получить страницу с записями в PaginationContainer * @param skip пропустить skip записей * @param take получить take записей - * @returns any Success + * @returns CompanyDtoPaginationContainer Success * @throws ApiError */ public static async getPage( - skip: number, - take: number = 32, - ): Promise { +skip: number, +take: number = 32, +): Promise { const result = await __request({ method: 'GET', path: `/api/admin/company`, @@ -31,12 +32,12 @@ export class AdminCompanyService { /** * Добавить запись * @param requestBody запись - * @returns any Success + * @returns number Success * @throws ApiError */ public static async insert( - requestBody?: CompanyDto, - ): Promise { +requestBody?: CompanyDto, +): Promise { const result = await __request({ method: 'POST', path: `/api/admin/company`, @@ -48,12 +49,12 @@ export class AdminCompanyService { /** * Получить одну запись по Id * @param id id записи - * @returns any Success + * @returns CompanyDto Success * @throws ApiError */ public static async get( - id: number, - ): Promise { +id: number, +): Promise { const result = await __request({ method: 'GET', path: `/api/admin/company/${id}`, @@ -65,13 +66,13 @@ export class AdminCompanyService { * Редактировать запись по id * @param id id записи * @param requestBody запись - * @returns any Success + * @returns number Success * @throws ApiError */ public static async put( - id: number, - requestBody?: CompanyDto, - ): Promise { +id: number, +requestBody?: CompanyDto, +): Promise { const result = await __request({ method: 'PUT', path: `/api/admin/company/${id}`, @@ -83,12 +84,12 @@ export class AdminCompanyService { /** * Удалить запись по id * @param id id записи - * @returns any Success + * @returns number Success * @throws ApiError */ public static async delete( - id: number, - ): Promise { +id: number, +): Promise { const result = await __request({ method: 'DELETE', path: `/api/admin/company/${id}`, diff --git a/src/services/api/services/AdminDepositService.ts b/src/services/api/services/AdminDepositService.ts index 8878335..13a0364 100644 --- a/src/services/api/services/AdminDepositService.ts +++ b/src/services/api/services/AdminDepositService.ts @@ -2,6 +2,7 @@ /* tslint:disable */ /* eslint-disable */ import type { DepositDto } from '../models/DepositDto'; +import type { DepositDtoPaginationContainer } from '../models/DepositDtoPaginationContainer'; import { request as __request } from '../core/request'; export class AdminDepositService { @@ -10,13 +11,13 @@ export class AdminDepositService { * Получить страницу с записями в PaginationContainer * @param skip пропустить skip записей * @param take получить take записей - * @returns any Success + * @returns DepositDtoPaginationContainer Success * @throws ApiError */ public static async getPage( - skip: number, - take: number = 32, - ): Promise { +skip: number, +take: number = 32, +): Promise { const result = await __request({ method: 'GET', path: `/api/admin/deposit`, @@ -31,12 +32,12 @@ export class AdminDepositService { /** * Добавить запись * @param requestBody запись - * @returns any Success + * @returns number Success * @throws ApiError */ public static async insert( - requestBody?: DepositDto, - ): Promise { +requestBody?: DepositDto, +): Promise { const result = await __request({ method: 'POST', path: `/api/admin/deposit`, @@ -48,12 +49,12 @@ export class AdminDepositService { /** * Получить одну запись по Id * @param id id записи - * @returns any Success + * @returns DepositDto Success * @throws ApiError */ public static async get( - id: number, - ): Promise { +id: number, +): Promise { const result = await __request({ method: 'GET', path: `/api/admin/deposit/${id}`, @@ -65,13 +66,13 @@ export class AdminDepositService { * Редактировать запись по id * @param id id записи * @param requestBody запись - * @returns any Success + * @returns number Success * @throws ApiError */ public static async put( - id: number, - requestBody?: DepositDto, - ): Promise { +id: number, +requestBody?: DepositDto, +): Promise { const result = await __request({ method: 'PUT', path: `/api/admin/deposit/${id}`, @@ -83,12 +84,12 @@ export class AdminDepositService { /** * Удалить запись по id * @param id id записи - * @returns any Success + * @returns number Success * @throws ApiError */ public static async delete( - id: number, - ): Promise { +id: number, +): Promise { const result = await __request({ method: 'DELETE', path: `/api/admin/deposit/${id}`, diff --git a/src/services/api/services/AdminTelemetryService.ts b/src/services/api/services/AdminTelemetryService.ts index ce158b8..f094362 100644 --- a/src/services/api/services/AdminTelemetryService.ts +++ b/src/services/api/services/AdminTelemetryService.ts @@ -2,6 +2,7 @@ /* tslint:disable */ /* eslint-disable */ import type { TelemetryDto } from '../models/TelemetryDto'; +import type { TelemetryDtoPaginationContainer } from '../models/TelemetryDtoPaginationContainer'; import { request as __request } from '../core/request'; export class AdminTelemetryService { @@ -25,8 +26,8 @@ export class AdminTelemetryService { * @throws ApiError */ public static async mergeTelemetries( - requestBody?: Array, - ): Promise { +requestBody?: Array, +): Promise { const result = await __request({ method: 'POST', path: `/merge`, @@ -39,13 +40,13 @@ export class AdminTelemetryService { * Получить страницу с записями в PaginationContainer * @param skip пропустить skip записей * @param take получить take записей - * @returns any Success + * @returns TelemetryDtoPaginationContainer Success * @throws ApiError */ public static async getPage( - skip: number, - take: number = 32, - ): Promise { +skip: number, +take: number = 32, +): Promise { const result = await __request({ method: 'GET', path: `/api/admin/telemetry`, @@ -60,12 +61,12 @@ export class AdminTelemetryService { /** * Добавить запись * @param requestBody запись - * @returns any Success + * @returns number Success * @throws ApiError */ public static async insert( - requestBody?: TelemetryDto, - ): Promise { +requestBody?: TelemetryDto, +): Promise { const result = await __request({ method: 'POST', path: `/api/admin/telemetry`, @@ -77,12 +78,12 @@ export class AdminTelemetryService { /** * Получить одну запись по Id * @param id id записи - * @returns any Success + * @returns TelemetryDto Success * @throws ApiError */ public static async get( - id: number, - ): Promise { +id: number, +): Promise { const result = await __request({ method: 'GET', path: `/api/admin/telemetry/${id}`, @@ -94,13 +95,13 @@ export class AdminTelemetryService { * Редактировать запись по id * @param id id записи * @param requestBody запись - * @returns any Success + * @returns number Success * @throws ApiError */ public static async put( - id: number, - requestBody?: TelemetryDto, - ): Promise { +id: number, +requestBody?: TelemetryDto, +): Promise { const result = await __request({ method: 'PUT', path: `/api/admin/telemetry/${id}`, @@ -112,12 +113,12 @@ export class AdminTelemetryService { /** * Удалить запись по id * @param id id записи - * @returns any Success + * @returns number Success * @throws ApiError */ public static async delete( - id: number, - ): Promise { +id: number, +): Promise { const result = await __request({ method: 'DELETE', path: `/api/admin/telemetry/${id}`, diff --git a/src/services/api/services/AdminUserRoleService.ts b/src/services/api/services/AdminUserRoleService.ts index 5a5333b..5dd8522 100644 --- a/src/services/api/services/AdminUserRoleService.ts +++ b/src/services/api/services/AdminUserRoleService.ts @@ -2,6 +2,7 @@ /* tslint:disable */ /* eslint-disable */ import type { UserRoleDto } from '../models/UserRoleDto'; +import type { UserRoleDtoPaginationContainer } from '../models/UserRoleDtoPaginationContainer'; import { request as __request } from '../core/request'; export class AdminUserRoleService { @@ -10,13 +11,13 @@ export class AdminUserRoleService { * Получить страницу с записями в PaginationContainer * @param skip пропустить skip записей * @param take получить take записей - * @returns any Success + * @returns UserRoleDtoPaginationContainer Success * @throws ApiError */ public static async getPage( - skip: number, - take: number = 32, - ): Promise { +skip: number, +take: number = 32, +): Promise { const result = await __request({ method: 'GET', path: `/api/admin/user/role`, @@ -31,12 +32,12 @@ export class AdminUserRoleService { /** * Добавить запись * @param requestBody запись - * @returns any Success + * @returns number Success * @throws ApiError */ public static async insert( - requestBody?: UserRoleDto, - ): Promise { +requestBody?: UserRoleDto, +): Promise { const result = await __request({ method: 'POST', path: `/api/admin/user/role`, @@ -48,12 +49,12 @@ export class AdminUserRoleService { /** * Получить одну запись по Id * @param id id записи - * @returns any Success + * @returns UserRoleDto Success * @throws ApiError */ public static async get( - id: number, - ): Promise { +id: number, +): Promise { const result = await __request({ method: 'GET', path: `/api/admin/user/role/${id}`, @@ -65,13 +66,13 @@ export class AdminUserRoleService { * Редактировать запись по id * @param id id записи * @param requestBody запись - * @returns any Success + * @returns number Success * @throws ApiError */ public static async put( - id: number, - requestBody?: UserRoleDto, - ): Promise { +id: number, +requestBody?: UserRoleDto, +): Promise { const result = await __request({ method: 'PUT', path: `/api/admin/user/role/${id}`, @@ -83,12 +84,12 @@ export class AdminUserRoleService { /** * Удалить запись по id * @param id id записи - * @returns any Success + * @returns number Success * @throws ApiError */ public static async delete( - id: number, - ): Promise { +id: number, +): Promise { const result = await __request({ method: 'DELETE', path: `/api/admin/user/role/${id}`, diff --git a/src/services/api/services/AdminUserService.ts b/src/services/api/services/AdminUserService.ts index f4dba1d..ec213c0 100644 --- a/src/services/api/services/AdminUserService.ts +++ b/src/services/api/services/AdminUserService.ts @@ -2,6 +2,7 @@ /* tslint:disable */ /* eslint-disable */ import type { UserDto } from '../models/UserDto'; +import type { UserDtoPaginationContainer } from '../models/UserDtoPaginationContainer'; import { request as __request } from '../core/request'; export class AdminUserService { @@ -10,13 +11,13 @@ export class AdminUserService { * Получить страницу с записями в PaginationContainer * @param skip пропустить skip записей * @param take получить take записей - * @returns any Success + * @returns UserDtoPaginationContainer Success * @throws ApiError */ public static async getPage( - skip: number, - take: number = 32, - ): Promise { +skip: number, +take: number = 32, +): Promise { const result = await __request({ method: 'GET', path: `/api/admin/user`, @@ -31,12 +32,12 @@ export class AdminUserService { /** * Добавить запись * @param requestBody запись - * @returns any Success + * @returns number Success * @throws ApiError */ public static async insert( - requestBody?: UserDto, - ): Promise { +requestBody?: UserDto, +): Promise { const result = await __request({ method: 'POST', path: `/api/admin/user`, @@ -48,12 +49,12 @@ export class AdminUserService { /** * Получить одну запись по Id * @param id id записи - * @returns any Success + * @returns UserDto Success * @throws ApiError */ public static async get( - id: number, - ): Promise { +id: number, +): Promise { const result = await __request({ method: 'GET', path: `/api/admin/user/${id}`, @@ -65,13 +66,13 @@ export class AdminUserService { * Редактировать запись по id * @param id id записи * @param requestBody запись - * @returns any Success + * @returns number Success * @throws ApiError */ public static async put( - id: number, - requestBody?: UserDto, - ): Promise { +id: number, +requestBody?: UserDto, +): Promise { const result = await __request({ method: 'PUT', path: `/api/admin/user/${id}`, @@ -83,12 +84,12 @@ export class AdminUserService { /** * Удалить запись по id * @param id id записи - * @returns any Success + * @returns number Success * @throws ApiError */ public static async delete( - id: number, - ): Promise { +id: number, +): Promise { const result = await __request({ method: 'DELETE', path: `/api/admin/user/${id}`, diff --git a/src/services/api/services/AdminWellService.ts b/src/services/api/services/AdminWellService.ts index cbabf24..361cbaf 100644 --- a/src/services/api/services/AdminWellService.ts +++ b/src/services/api/services/AdminWellService.ts @@ -2,6 +2,7 @@ /* tslint:disable */ /* eslint-disable */ import type { WellDto } from '../models/WellDto'; +import type { WellDtoPaginationContainer } from '../models/WellDtoPaginationContainer'; import { request as __request } from '../core/request'; export class AdminWellService { @@ -10,13 +11,13 @@ export class AdminWellService { * Получить страницу с записями в PaginationContainer * @param skip пропустить skip записей * @param take получить take записей - * @returns any Success + * @returns WellDtoPaginationContainer Success * @throws ApiError */ public static async getPage( - skip: number, - take: number = 32, - ): Promise { +skip: number, +take: number = 32, +): Promise { const result = await __request({ method: 'GET', path: `/api/admin/well`, @@ -31,12 +32,12 @@ export class AdminWellService { /** * Добавить запись * @param requestBody запись - * @returns any Success + * @returns number Success * @throws ApiError */ public static async insert( - requestBody?: WellDto, - ): Promise { +requestBody?: WellDto, +): Promise { const result = await __request({ method: 'POST', path: `/api/admin/well`, @@ -48,12 +49,12 @@ export class AdminWellService { /** * Получить одну запись по Id * @param id id записи - * @returns any Success + * @returns WellDto Success * @throws ApiError */ public static async get( - id: number, - ): Promise { +id: number, +): Promise { const result = await __request({ method: 'GET', path: `/api/admin/well/${id}`, @@ -65,13 +66,13 @@ export class AdminWellService { * Редактировать запись по id * @param id id записи * @param requestBody запись - * @returns any Success + * @returns number Success * @throws ApiError */ public static async put( - id: number, - requestBody?: WellDto, - ): Promise { +id: number, +requestBody?: WellDto, +): Promise { const result = await __request({ method: 'PUT', path: `/api/admin/well/${id}`, @@ -83,12 +84,12 @@ export class AdminWellService { /** * Удалить запись по id * @param id id записи - * @returns any Success + * @returns number Success * @throws ApiError */ public static async delete( - id: number, - ): Promise { +id: number, +): Promise { const result = await __request({ method: 'DELETE', path: `/api/admin/well/${id}`, diff --git a/src/services/api/services/AuthService.ts b/src/services/api/services/AuthService.ts index 27732bd..b42a63b 100644 --- a/src/services/api/services/AuthService.ts +++ b/src/services/api/services/AuthService.ts @@ -10,13 +10,13 @@ export class AuthService { /** * Аутентификация пользователя - * @param requestBody + * @param requestBody * @returns UserTokenDto новый токен * @throws ApiError */ public static async login( - requestBody?: AuthDto, - ): Promise { +requestBody?: AuthDto, +): Promise { const result = await __request({ method: 'POST', path: `/auth/login`, @@ -42,14 +42,14 @@ export class AuthService { } /** - * Регистрация пользователя. Доступна администратору - * @param requestBody + * Отправить заявку на регистрацию. Заявка подтверждается администратором. + * @param requestBody Информация о новом пользователе * @returns any Success * @throws ApiError */ public static async register( - requestBody?: UserDto, - ): Promise { +requestBody?: UserDto, +): Promise { const result = await __request({ method: 'POST', path: `/auth`, @@ -60,15 +60,15 @@ export class AuthService { /** * Смена пароля пользователя. Доступна пользователю и администратору - * @param idUser - * @param requestBody + * @param idUser + * @param requestBody * @returns any Success * @throws ApiError */ public static async changePassword( - idUser: number, - requestBody?: string, - ): Promise { +idUser: number, +requestBody?: string, +): Promise { const result = await __request({ method: 'PUT', path: `/auth/${idUser}/ChangePassword`, diff --git a/src/services/api/services/ClusterService.ts b/src/services/api/services/ClusterService.ts index 6a2ea4b..5c6dada 100644 --- a/src/services/api/services/ClusterService.ts +++ b/src/services/api/services/ClusterService.ts @@ -22,13 +22,13 @@ export class ClusterService { /** * Получение доступных пользователю скважин - * @param idCluster + * @param idCluster * @returns WellDto Success * @throws ApiError */ public static async getWells( - idCluster: number, - ): Promise> { +idCluster: number, +): Promise> { const result = await __request({ method: 'GET', path: `/api/cluster/${idCluster}`, diff --git a/src/services/api/services/DepositService.ts b/src/services/api/services/DepositService.ts index 2bfdce1..906f947 100644 --- a/src/services/api/services/DepositService.ts +++ b/src/services/api/services/DepositService.ts @@ -35,13 +35,13 @@ export class DepositService { /** * Получает список доступных пользователю кустов месторождения - * @param depositId + * @param depositId * @returns ClusterDto Success * @throws ApiError */ public static async getClusters( - depositId: number, - ): Promise> { +depositId: number, +): Promise> { const result = await __request({ method: 'GET', path: `/api/deposit/${depositId}`, diff --git a/src/services/api/services/DrillFlowChartService.ts b/src/services/api/services/DrillFlowChartService.ts index 13da462..eb37d76 100644 --- a/src/services/api/services/DrillFlowChartService.ts +++ b/src/services/api/services/DrillFlowChartService.ts @@ -14,9 +14,9 @@ export class DrillFlowChartService { * @throws ApiError */ public static async get( - idWell: number, - updateFrom?: string, - ): Promise> { +idWell: number, +updateFrom?: string, +): Promise> { const result = await __request({ method: 'GET', path: `/api/well/${idWell}/drillFlowChart`, @@ -35,9 +35,9 @@ export class DrillFlowChartService { * @throws ApiError */ public static async insert( - idWell: number, - requestBody?: DrillFlowChartDto, - ): Promise { +idWell: number, +requestBody?: DrillFlowChartDto, +): Promise { const result = await __request({ method: 'POST', path: `/api/well/${idWell}/drillFlowChart`, @@ -54,9 +54,9 @@ export class DrillFlowChartService { * @throws ApiError */ public static async edit( - idWell: number, - requestBody?: DrillFlowChartDto, - ): Promise { +idWell: number, +requestBody?: DrillFlowChartDto, +): Promise { const result = await __request({ method: 'PUT', path: `/api/well/${idWell}/drillFlowChart`, @@ -73,9 +73,9 @@ export class DrillFlowChartService { * @throws ApiError */ public static async delete( - idWell: number, - drillFlowChartParamsId?: number, - ): Promise { +idWell: number, +drillFlowChartParamsId?: number, +): Promise { const result = await __request({ method: 'DELETE', path: `/api/well/${idWell}/drillFlowChart`, @@ -94,9 +94,9 @@ export class DrillFlowChartService { * @throws ApiError */ public static async getByTelemetry( - uid: string, - updateFrom?: string, - ): Promise> { +uid: string, +updateFrom?: string, +): Promise> { const result = await __request({ method: 'GET', path: `/api/telemetry/${uid}/drillFlowChart`, @@ -115,9 +115,9 @@ export class DrillFlowChartService { * @throws ApiError */ public static async insertRange( - idWell: number, - requestBody?: Array, - ): Promise { +idWell: number, +requestBody?: Array, +): Promise { const result = await __request({ method: 'POST', path: `/api/well/${idWell}/drillFlowChart/range`, diff --git a/src/services/api/services/DrillParamsService.ts b/src/services/api/services/DrillParamsService.ts index 483dfd3..e789268 100644 --- a/src/services/api/services/DrillParamsService.ts +++ b/src/services/api/services/DrillParamsService.ts @@ -15,10 +15,10 @@ export class DrillParamsService { * @throws ApiError */ public static async getDefault( - idWell: number, - startDepth?: number, - endDepth?: number, - ): Promise { +idWell: number, +startDepth?: number, +endDepth?: number, +): Promise { const result = await __request({ method: 'GET', path: `/api/well/${idWell}/drillParams/autoParams`, @@ -37,8 +37,8 @@ export class DrillParamsService { * @throws ApiError */ public static async getAll( - idWell: number, - ): Promise> { +idWell: number, +): Promise> { const result = await __request({ method: 'GET', path: `/api/well/${idWell}/drillParams`, @@ -54,9 +54,9 @@ export class DrillParamsService { * @throws ApiError */ public static async insert( - idWell: number, - requestBody?: DrillParamsDto, - ): Promise { +idWell: number, +requestBody?: DrillParamsDto, +): Promise { const result = await __request({ method: 'POST', path: `/api/well/${idWell}/drillParams`, @@ -74,10 +74,10 @@ export class DrillParamsService { * @throws ApiError */ public static async update( - idWell: number, - dtoId?: number, - requestBody?: DrillParamsDto, - ): Promise { +idWell: number, +dtoId?: number, +requestBody?: DrillParamsDto, +): Promise { const result = await __request({ method: 'PUT', path: `/api/well/${idWell}/drillParams`, @@ -97,9 +97,9 @@ export class DrillParamsService { * @throws ApiError */ public static async delete( - idWell: number, - drillParamsId?: number, - ): Promise { +idWell: number, +drillParamsId?: number, +): Promise { const result = await __request({ method: 'DELETE', path: `/api/well/${idWell}/drillParams`, @@ -118,9 +118,9 @@ export class DrillParamsService { * @throws ApiError */ public static async insertRange( - idWell: number, - requestBody?: Array, - ): Promise { +idWell: number, +requestBody?: Array, +): Promise { const result = await __request({ method: 'POST', path: `/api/well/${idWell}/drillParams/range`, @@ -137,9 +137,9 @@ export class DrillParamsService { * @throws ApiError */ public static async save( - idWell: number, - requestBody?: Array, - ): Promise { +idWell: number, +requestBody?: Array, +): Promise { const result = await __request({ method: 'POST', path: `/api/well/${idWell}/drillParams/save`, @@ -155,8 +155,8 @@ export class DrillParamsService { * @throws ApiError */ public static async getCompositeAll( - idWell: number, - ): Promise> { +idWell: number, +): Promise> { const result = await __request({ method: 'GET', path: `/api/well/${idWell}/drillParams/composite`, diff --git a/src/services/api/services/DrillingProgramService.ts b/src/services/api/services/DrillingProgramService.ts index 22d5db4..d42abb3 100644 --- a/src/services/api/services/DrillingProgramService.ts +++ b/src/services/api/services/DrillingProgramService.ts @@ -1,6 +1,7 @@ /* istanbul ignore file */ /* tslint:disable */ /* eslint-disable */ +import type { FileMarkDto } from '../models/FileMarkDto'; import { request as __request } from '../core/request'; export class DrillingProgramService { @@ -12,8 +13,8 @@ export class DrillingProgramService { * @throws ApiError */ public static async get( - idWell: number, - ): Promise { +idWell: number, +): Promise { const result = await __request({ method: 'GET', path: `/api/well/${idWell}/drillingProgram`, @@ -22,14 +23,14 @@ export class DrillingProgramService { } /** - * Возвращает ссылку на файл программы бурения в облаке + * Создает программу бурения * @param idWell id скважины * @returns string Success * @throws ApiError */ - public static async getFileWebLink( - idWell: number, - ): Promise { + public static async getOrCreateSharedUrl( +idWell: number, +): Promise { const result = await __request({ method: 'GET', path: `/api/well/${idWell}/drillingProgram/webUrl`, @@ -37,4 +38,44 @@ export class DrillingProgramService { return result.body; } + /** + * Создает метку для файла входящего в проргамму бурения + * @param idWell id скважины + * @param requestBody метка файла + * @returns any Success + * @throws ApiError + */ + public static async createFileMark( +idWell: number, +requestBody?: FileMarkDto, +): Promise { + const result = await __request({ + method: 'POST', + path: `/api/well/${idWell}/drillingProgram/fileMark`, + body: requestBody, + }); + return result.body; + } + + /** + * Помечает метку у файла входящего, в проргамму бурения, как удаленную + * @param idWell id скважины + * @param idMark id метки + * @returns number Success + * @throws ApiError + */ + public static async deleteFileMark( +idWell: number, +idMark?: number, +): Promise { + const result = await __request({ + method: 'DELETE', + path: `/api/well/${idWell}/drillingProgram/fileMark`, + query: { + 'idMark': idMark, + }, + }); + return result.body; + } + } \ No newline at end of file diff --git a/src/services/api/services/FileService.ts b/src/services/api/services/FileService.ts index 125112f..95fb68b 100644 --- a/src/services/api/services/FileService.ts +++ b/src/services/api/services/FileService.ts @@ -1,8 +1,8 @@ /* istanbul ignore file */ /* tslint:disable */ /* eslint-disable */ -import type { FileInfoDto } from '../models/FileInfoDto'; import type { FileInfoDtoPaginationContainer } from '../models/FileInfoDtoPaginationContainer'; +import type { FileMarkDto } from '../models/FileMarkDto'; import { request as __request } from '../core/request'; export class FileService { @@ -11,15 +11,15 @@ export class FileService { * Сохраняет переданные файлы и информацию о них * @param idWell id скважины * @param idCategory id категории файла - * @param requestBody + * @param requestBody * @returns number Success * @throws ApiError */ public static async saveFiles( - idWell: number, - idCategory?: number, - requestBody?: any, - ): Promise { +idWell: number, +idCategory?: number, +requestBody?: any, +): Promise { const result = await __request({ method: 'POST', path: `/api/well/${idWell}/files`, @@ -45,15 +45,15 @@ export class FileService { * @throws ApiError */ public static async getFilesInfo( - idWell: number, - idCategory: number, - companyName?: string, - fileName?: string, - begin?: string, - end?: string, - skip: number = 0, - take: number = 32, - ): Promise { +idWell: number, +idCategory: number, +companyName?: string, +fileName?: string, +begin?: string, +end?: string, +skip: number = 0, +take: number = 32, +): Promise { const result = await __request({ method: 'GET', path: `/api/well/${idWell}/files`, @@ -70,24 +70,6 @@ export class FileService { return result.body; } - /** - * Возвращает информацию о файлах для скважины в выбраной категории - * @param idWell id скважины - * @param idCategory id категории файла - * @returns FileInfoDto Success - * @throws ApiError - */ - public static async getInfosByCategory( - idWell: number, - idCategory: number, - ): Promise> { - const result = await __request({ - method: 'GET', - path: `/api/well/${idWell}/files/category/${idCategory}`, - }); - return result.body; - } - /** * Возвращает файл с диска на сервере * @param idWell id скважины @@ -96,9 +78,9 @@ export class FileService { * @throws ApiError */ public static async getFile( - idWell: number, - fileId: number, - ): Promise { +idWell: number, +fileId: number, +): Promise { const result = await __request({ method: 'GET', path: `/api/well/${idWell}/files/${fileId}`, @@ -114,9 +96,9 @@ export class FileService { * @throws ApiError */ public static async delete( - idWell: number, - idFile: number, - ): Promise { +idWell: number, +idFile: number, +): Promise { const result = await __request({ method: 'DELETE', path: `/api/well/${idWell}/files/${idFile}`, @@ -124,4 +106,44 @@ export class FileService { return result.body; } + /** + * Создает метку для файла + * @param idWell id скважины + * @param requestBody метка файла + * @returns any Success + * @throws ApiError + */ + public static async createFileMark( +idWell: number, +requestBody?: FileMarkDto, +): Promise { + const result = await __request({ + method: 'POST', + path: `/api/well/${idWell}/files/fileMark`, + body: requestBody, + }); + return result.body; + } + + /** + * Помечает метку у файла как удаленную + * @param idWell id скважины + * @param idMark id метки + * @returns number Success + * @throws ApiError + */ + public static async deleteFileMark( +idWell: number, +idMark?: number, +): Promise { + const result = await __request({ + method: 'DELETE', + path: `/api/well/${idWell}/files/fileMark`, + query: { + 'idMark': idMark, + }, + }); + return result.body; + } + } \ No newline at end of file diff --git a/src/services/api/services/MeasureService.ts b/src/services/api/services/MeasureService.ts index 6f59d4a..b1d012f 100644 --- a/src/services/api/services/MeasureService.ts +++ b/src/services/api/services/MeasureService.ts @@ -7,13 +7,13 @@ import { request as __request } from '../core/request'; export class MeasureService { /** - * @param idWell + * @param idWell * @returns any Success * @throws ApiError */ public static async getCategories( - idWell: number, - ): Promise { +idWell: number, +): Promise { const result = await __request({ method: 'GET', path: `/api/well/${idWell}/measure/categories`, @@ -22,15 +22,15 @@ export class MeasureService { } /** - * @param idWell - * @param idCategory + * @param idWell + * @param idCategory * @returns any Success * @throws ApiError */ public static async getLast( - idWell: number, - idCategory: number, - ): Promise { +idWell: number, +idCategory: number, +): Promise { const result = await __request({ method: 'GET', path: `/api/well/${idWell}/measure/last/${idCategory}`, @@ -39,15 +39,15 @@ export class MeasureService { } /** - * @param idWell - * @param idCategory + * @param idWell + * @param idCategory * @returns any Success * @throws ApiError */ public static async getHisory( - idWell: number, - idCategory: number, - ): Promise { +idWell: number, +idCategory: number, +): Promise { const result = await __request({ method: 'GET', path: `/api/well/${idWell}/measure/history`, @@ -56,15 +56,15 @@ export class MeasureService { } /** - * @param idWell - * @param requestBody + * @param idWell + * @param requestBody * @returns any Success * @throws ApiError */ public static async insert( - idWell: number, - requestBody?: MeasureDto, - ): Promise { +idWell: number, +requestBody?: MeasureDto, +): Promise { const result = await __request({ method: 'POST', path: `/api/well/${idWell}/measure`, @@ -74,15 +74,15 @@ export class MeasureService { } /** - * @param idWell - * @param requestBody + * @param idWell + * @param requestBody * @returns any Success * @throws ApiError */ public static async update( - idWell: number, - requestBody?: MeasureDto, - ): Promise { +idWell: number, +requestBody?: MeasureDto, +): Promise { const result = await __request({ method: 'PUT', path: `/api/well/${idWell}/measure`, @@ -92,15 +92,15 @@ export class MeasureService { } /** - * @param idWell - * @param idData + * @param idWell + * @param idData * @returns any Success * @throws ApiError */ public static async markAsDelete( - idWell: number, - idData: number, - ): Promise { +idWell: number, +idData: number, +): Promise { const result = await __request({ method: 'DELETE', path: `/api/well/${idWell}/measure/history/${idData}`, diff --git a/src/services/api/services/MessageService.ts b/src/services/api/services/MessageService.ts index 09b71d5..8adaa2f 100644 --- a/src/services/api/services/MessageService.ts +++ b/src/services/api/services/MessageService.ts @@ -20,14 +20,14 @@ export class MessageService { * @throws ApiError */ public static async getMessages( - idWell: number, - skip: number, - take: number = 32, - categoryids?: Array, - begin?: string, - end?: string, - searchString?: string, - ): Promise { +idWell: number, +skip: number, +take: number = 32, +categoryids?: Array, +begin?: string, +end?: string, +searchString?: string, +): Promise { const result = await __request({ method: 'GET', path: `/api/well/${idWell}/message`, @@ -50,8 +50,8 @@ export class MessageService { * @throws ApiError */ public static async getMessagesDateRange( - idWell: number, - ): Promise { +idWell: number, +): Promise { const result = await __request({ method: 'GET', path: `/api/well/${idWell}/message/datesRange`, diff --git a/src/services/api/services/ReportService.ts b/src/services/api/services/ReportService.ts index cc99805..e540c4c 100644 --- a/src/services/api/services/ReportService.ts +++ b/src/services/api/services/ReportService.ts @@ -17,12 +17,12 @@ export class ReportService { * @throws ApiError */ public static async createReport( - idWell: number, - stepSeconds?: number, - format?: number, - begin?: string, - end?: string, - ): Promise { +idWell: number, +stepSeconds?: number, +format?: number, +begin?: string, +end?: string, +): Promise { const result = await __request({ method: 'POST', path: `/api/well/${idWell}/report`, @@ -43,8 +43,8 @@ export class ReportService { * @throws ApiError */ public static async getAllReportsNamesByWell( - idWell: number, - ): Promise> { +idWell: number, +): Promise> { const result = await __request({ method: 'GET', path: `/api/well/${idWell}/report`, @@ -55,7 +55,7 @@ export class ReportService { /** * @deprecated * Возвращает имена отчетов, хранящихся на диске, - * которые подходят под указанные параметры + * которые подходят под указанные параметры * @param idWell id скважины * @param stepSeconds шаг интервала * @param format формат отчета (0-PDF, 1-LAS) @@ -65,12 +65,12 @@ export class ReportService { * @throws ApiError */ public static async getSuitableReportsNames( - idWell: number, - stepSeconds?: number, - format?: number, - begin?: string, - end?: string, - ): Promise> { +idWell: number, +stepSeconds?: number, +format?: number, +begin?: string, +end?: string, +): Promise> { const result = await __request({ method: 'GET', path: `/api/well/${idWell}/report/suitableReports`, @@ -95,12 +95,12 @@ export class ReportService { * @throws ApiError */ public static async getReportSize( - idWell: number, - stepSeconds?: number, - format?: number, - begin?: string, - end?: string, - ): Promise { +idWell: number, +stepSeconds?: number, +format?: number, +begin?: string, +end?: string, +): Promise { const result = await __request({ method: 'GET', path: `/api/well/${idWell}/report/reportSize`, @@ -121,8 +121,8 @@ export class ReportService { * @throws ApiError */ public static async getReportsDateRange( - idWell: number, - ): Promise { +idWell: number, +): Promise { const result = await __request({ method: 'GET', path: `/api/well/${idWell}/report/datesRange`, diff --git a/src/services/api/services/TelemetryAnalyticsService.ts b/src/services/api/services/TelemetryAnalyticsService.ts index d1d2d9f..b4f828c 100644 --- a/src/services/api/services/TelemetryAnalyticsService.ts +++ b/src/services/api/services/TelemetryAnalyticsService.ts @@ -22,13 +22,13 @@ export class TelemetryAnalyticsService { * @throws ApiError */ public static async getOperationsByWell( - idWell: number, - skip: number, - take: number = 32, - categoryIds?: Array, - begin?: string, - end?: string, - ): Promise { +idWell: number, +skip: number, +take: number = 32, +categoryIds?: Array, +begin?: string, +end?: string, +): Promise { const result = await __request({ method: 'GET', path: `/api/well/${idWell}/telemetryAnalytics/operationsByWell`, @@ -50,8 +50,8 @@ export class TelemetryAnalyticsService { * @throws ApiError */ public static async getWellDepthToDay( - idWell: number, - ): Promise> { +idWell: number, +): Promise> { const result = await __request({ method: 'GET', path: `/api/well/${idWell}/telemetryAnalytics/wellDepthToDay`, @@ -68,10 +68,10 @@ export class TelemetryAnalyticsService { * @throws ApiError */ public static async getWellDepthToInterval( - idWell: number, - intervalSeconds?: number, - workBeginSeconds?: number, - ): Promise> { +idWell: number, +intervalSeconds?: number, +workBeginSeconds?: number, +): Promise> { const result = await __request({ method: 'GET', path: `/api/well/${idWell}/telemetryAnalytics/wellDepthToInterval`, @@ -92,10 +92,10 @@ export class TelemetryAnalyticsService { * @throws ApiError */ public static async getOperationsSummary( - idWell: number, - begin?: string, - end?: string, - ): Promise> { +idWell: number, +begin?: string, +end?: string, +): Promise> { const result = await __request({ method: 'GET', path: `/api/well/${idWell}/telemetryAnalytics/operationsSummary`, @@ -116,10 +116,10 @@ export class TelemetryAnalyticsService { * @throws ApiError */ public static async getOperationsToInterval( - idWell: number, - intervalSeconds?: number, - workBeginSeconds?: number, - ): Promise> { +idWell: number, +intervalSeconds?: number, +workBeginSeconds?: number, +): Promise> { const result = await __request({ method: 'GET', path: `/api/well/${idWell}/telemetryAnalytics/operationsToInterval`, @@ -138,8 +138,8 @@ export class TelemetryAnalyticsService { * @throws ApiError */ public static async getOperationsDateRange( - idWell: number, - ): Promise { +idWell: number, +): Promise { const result = await __request({ method: 'GET', path: `/api/well/${idWell}/telemetryAnalytics/datesRange`, diff --git a/src/services/api/services/TelemetryDataSaubService.ts b/src/services/api/services/TelemetryDataSaubService.ts index 8854704..2aea521 100644 --- a/src/services/api/services/TelemetryDataSaubService.ts +++ b/src/services/api/services/TelemetryDataSaubService.ts @@ -15,9 +15,9 @@ export class TelemetryDataSaubService { * @throws ApiError */ public static async postData( - uid: string, - requestBody?: Array, - ): Promise { +uid: string, +requestBody?: Array, +): Promise { const result = await __request({ method: 'POST', path: `/api/TelemetryDataSaub/${uid}`, @@ -28,20 +28,20 @@ export class TelemetryDataSaubService { /** * Возвращает данные САУБ по скважине. - * По умолчанию за последние 10 минут. + * По умолчанию за последние 10 минут. * @param idWell id скважины * @param begin дата начала выборки. По умолчанию: текущее время - intervalSec * @param intervalSec интервал времени даты начала выборки, секунды * @param approxPointsCount желаемое количество точек. Если в выборке точек будет больше, то выборка будет прорежена. - * @returns any Success + * @returns TelemetryDataSaubDto Success * @throws ApiError */ public static async getData( - idWell: number, - begin?: string, - intervalSec: number = 600, - approxPointsCount: number = 1024, - ): Promise { +idWell: number, +begin?: string, +intervalSec: number = 600, +approxPointsCount: number = 1024, +): Promise { const result = await __request({ method: 'GET', path: `/api/TelemetryDataSaub/${idWell}`, @@ -61,8 +61,8 @@ export class TelemetryDataSaubService { * @throws ApiError */ public static async getDataDatesRange( - idWell: number, - ): Promise { +idWell: number, +): Promise { const result = await __request({ method: 'GET', path: `/api/TelemetryDataSaub/${idWell}/datesRange`, diff --git a/src/services/api/services/TelemetryDataSpinService.ts b/src/services/api/services/TelemetryDataSpinService.ts index 71add2c..f3fd261 100644 --- a/src/services/api/services/TelemetryDataSpinService.ts +++ b/src/services/api/services/TelemetryDataSpinService.ts @@ -15,9 +15,9 @@ export class TelemetryDataSpinService { * @throws ApiError */ public static async postData( - uid: string, - requestBody?: Array, - ): Promise { +uid: string, +requestBody?: Array, +): Promise { const result = await __request({ method: 'POST', path: `/api/TelemetryDataSpin/${uid}`, @@ -28,20 +28,20 @@ export class TelemetryDataSpinService { /** * Возвращает данные САУБ по скважине. - * По умолчанию за последние 10 минут. + * По умолчанию за последние 10 минут. * @param idWell id скважины * @param begin дата начала выборки. По умолчанию: текущее время - intervalSec * @param intervalSec интервал времени даты начала выборки, секунды * @param approxPointsCount желаемое количество точек. Если в выборке точек будет больше, то выборка будет прорежена. - * @returns any Success + * @returns TelemetryDataSpinDto Success * @throws ApiError */ public static async getData( - idWell: number, - begin?: string, - intervalSec: number = 600, - approxPointsCount: number = 1024, - ): Promise { +idWell: number, +begin?: string, +intervalSec: number = 600, +approxPointsCount: number = 1024, +): Promise { const result = await __request({ method: 'GET', path: `/api/TelemetryDataSpin/${idWell}`, @@ -61,8 +61,8 @@ export class TelemetryDataSpinService { * @throws ApiError */ public static async getDataDatesRange( - idWell: number, - ): Promise { +idWell: number, +): Promise { const result = await __request({ method: 'GET', path: `/api/TelemetryDataSpin/${idWell}/datesRange`, diff --git a/src/services/api/services/TelemetryService.ts b/src/services/api/services/TelemetryService.ts index c00b1c8..24e426c 100644 --- a/src/services/api/services/TelemetryService.ts +++ b/src/services/api/services/TelemetryService.ts @@ -17,9 +17,9 @@ export class TelemetryService { * @throws ApiError */ public static async postInfo( - uid: string, - requestBody?: TelemetryInfoDto, - ): Promise { +uid: string, +requestBody?: TelemetryInfoDto, +): Promise { const result = await __request({ method: 'POST', path: `/api/telemetry/${uid}/info`, @@ -36,9 +36,9 @@ export class TelemetryService { * @throws ApiError */ public static async postMessages( - uid: string, - requestBody?: Array, - ): Promise { +uid: string, +requestBody?: Array, +): Promise { const result = await __request({ method: 'POST', path: `/api/telemetry/${uid}/message`, @@ -55,9 +55,9 @@ export class TelemetryService { * @throws ApiError */ public static async postEvents( - uid: string, - requestBody?: Array, - ): Promise { +uid: string, +requestBody?: Array, +): Promise { const result = await __request({ method: 'POST', path: `/api/telemetry/${uid}/event`, @@ -74,9 +74,9 @@ export class TelemetryService { * @throws ApiError */ public static async postUsers( - uid: string, - requestBody?: Array, - ): Promise { +uid: string, +requestBody?: Array, +): Promise { const result = await __request({ method: 'POST', path: `/api/telemetry/${uid}/user`, diff --git a/src/services/api/services/WellCompositeService.ts b/src/services/api/services/WellCompositeService.ts index 05eb0ae..cd54063 100644 --- a/src/services/api/services/WellCompositeService.ts +++ b/src/services/api/services/WellCompositeService.ts @@ -13,8 +13,8 @@ export class WellCompositeService { * @throws ApiError */ public static async get( - idWell: number, - ): Promise> { +idWell: number, +): Promise> { const result = await __request({ method: 'GET', path: `/api/well/${idWell}/composite`, @@ -30,9 +30,9 @@ export class WellCompositeService { * @throws ApiError */ public static async save( - idWell: number, - requestBody?: Array, - ): Promise { +idWell: number, +requestBody?: Array, +): Promise { const result = await __request({ method: 'POST', path: `/api/well/${idWell}/composite`, diff --git a/src/services/api/services/WellOperationService.ts b/src/services/api/services/WellOperationService.ts index d30efa7..036cc7a 100644 --- a/src/services/api/services/WellOperationService.ts +++ b/src/services/api/services/WellOperationService.ts @@ -10,13 +10,13 @@ export class WellOperationService { /** * Возвращает список имен типов операций на скважине - * @param idWell + * @param idWell * @returns WellOperationCategoryDto Success * @throws ApiError */ public static async getCategories( - idWell: string, - ): Promise> { +idWell: string, +): Promise> { const result = await __request({ method: 'GET', path: `/api/well/${idWell}/wellOperations/categories`, @@ -34,23 +34,23 @@ export class WellOperationService { * @param end фильтр по окончанию операции * @param minDepth фильтр по минимальной глубине скважины * @param maxDepth фильтр по максимальной глубине скважины - * @param skip - * @param take + * @param skip + * @param take * @returns WellOperationDtoPaginationContainer Success * @throws ApiError */ public static async getOperations( - idWell: number, - opertaionType?: number, - sectionTypeIds?: Array, - operationCategoryIds?: Array, - begin?: string, - end?: string, - minDepth: number = -1.7976931348623157e+308, - maxDepth: number = 1.7976931348623157e+308, - skip: number = 0, - take: number = 32, - ): Promise { +idWell: number, +opertaionType?: number, +sectionTypeIds?: Array, +operationCategoryIds?: Array, +begin?: string, +end?: string, +minDepth: number = -1.7976931348623157e+308, +maxDepth: number = 1.7976931348623157e+308, +skip: number = 0, +take: number = 32, +): Promise { const result = await __request({ method: 'GET', path: `/api/well/${idWell}/wellOperations`, @@ -77,9 +77,9 @@ export class WellOperationService { * @throws ApiError */ public static async insertRange( - idWell: number, - requestBody?: Array, - ): Promise> { +idWell: number, +requestBody?: Array, +): Promise> { const result = await __request({ method: 'POST', path: `/api/well/${idWell}/wellOperations`, @@ -96,9 +96,9 @@ export class WellOperationService { * @throws ApiError */ public static async get( - idWell: number, - idOperation: number, - ): Promise { +idWell: number, +idOperation: number, +): Promise { const result = await __request({ method: 'GET', path: `/api/well/${idWell}/wellOperations/${idOperation}`, @@ -115,10 +115,10 @@ export class WellOperationService { * @throws ApiError */ public static async update( - idWell: number, - idOperation: number, - requestBody?: WellOperationDto, - ): Promise { +idWell: number, +idOperation: number, +requestBody?: WellOperationDto, +): Promise { const result = await __request({ method: 'PUT', path: `/api/well/${idWell}/wellOperations/${idOperation}`, @@ -135,9 +135,9 @@ export class WellOperationService { * @throws ApiError */ public static async delete( - idWell: number, - idOperation: number, - ): Promise { +idWell: number, +idOperation: number, +): Promise { const result = await __request({ method: 'DELETE', path: `/api/well/${idWell}/wellOperations/${idOperation}`, @@ -149,15 +149,15 @@ export class WellOperationService { * Импортирует операции из excel (xlsx) файла * @param idWell id скважины * @param options Удалить операции перед импортом = 1, если фал валидный - * @param requestBody + * @param requestBody * @returns any Success * @throws ApiError */ public static async import( - idWell: number, - options: number, - requestBody?: any, - ): Promise { +idWell: number, +options: number, +requestBody?: any, +): Promise { const result = await __request({ method: 'POST', path: `/api/well/${idWell}/wellOperations/import/${options}`, @@ -173,8 +173,8 @@ export class WellOperationService { * @throws ApiError */ public static async export( - idWell: number, - ): Promise { +idWell: number, +): Promise { const result = await __request({ method: 'GET', path: `/api/well/${idWell}/wellOperations/export`, @@ -184,13 +184,13 @@ export class WellOperationService { /** * Возвращает шаблон файла импорта - * @param idWell + * @param idWell * @returns string Success * @throws ApiError */ public static async getTamplate( - idWell: string, - ): Promise { +idWell: string, +): Promise { const result = await __request({ method: 'GET', path: `/api/well/${idWell}/wellOperations/tamplate`, diff --git a/src/services/api/services/WellOperationStatService.ts b/src/services/api/services/WellOperationStatService.ts index 6019a8d..c419643 100644 --- a/src/services/api/services/WellOperationStatService.ts +++ b/src/services/api/services/WellOperationStatService.ts @@ -15,8 +15,8 @@ export class WellOperationStatService { * @throws ApiError */ public static async getStatCluster( - idCluster: number, - ): Promise { +idCluster: number, +): Promise { const result = await __request({ method: 'GET', path: `/api/cluster/${idCluster}/stat`, @@ -31,8 +31,8 @@ export class WellOperationStatService { * @throws ApiError */ public static async getWellsStat( - idWells?: Array, - ): Promise> { +idWells?: Array, +): Promise> { const result = await __request({ method: 'GET', path: `/api/wellsStats`, @@ -50,8 +50,8 @@ export class WellOperationStatService { * @throws ApiError */ public static async getStatWell( - idWell: number, - ): Promise { +idWell: number, +): Promise { const result = await __request({ method: 'GET', path: `/api/well/${idWell}/stat`, @@ -61,13 +61,13 @@ export class WellOperationStatService { /** * Получает данные для графика глубина-днь - * @param idWell + * @param idWell * @returns WellOperationDtoPlanFactPredictBase Success * @throws ApiError */ public static async getTvd( - idWell: number, - ): Promise> { +idWell: number, +): Promise> { const result = await __request({ method: 'GET', path: `/api/well/${idWell}/tvd`, diff --git a/src/services/api/services/WellService.ts b/src/services/api/services/WellService.ts index d71b14c..c46ed7c 100644 --- a/src/services/api/services/WellService.ts +++ b/src/services/api/services/WellService.ts @@ -24,15 +24,15 @@ export class WellService { * Редактирует указанные поля скважины * @param idWell Id скважины * @param requestBody Объект параметров скважины. - * IdWellType: 1 - Наклонно-направленная, 2 - Горизонтальная. - * State: 0 - Неизвестно, 1 - В работе, 2 - Завершена. + * IdWellType: 1 - Наклонно-направленная, 2 - Горизонтальная. + * State: 0 - Неизвестно, 1 - В работе, 2 - Завершена. * @returns number Success * @throws ApiError */ public static async updateWell( - idWell?: number, - requestBody?: WellParamsDto, - ): Promise { +idWell?: number, +requestBody?: WellParamsDto, +): Promise { const result = await __request({ method: 'PUT', path: `/api/well`, @@ -51,8 +51,8 @@ export class WellService { * @throws ApiError */ public static async get( - idWell?: number, - ): Promise { +idWell?: number, +): Promise { const result = await __request({ method: 'GET', path: `/api/well/getWell`, From a6d330e276c7d8a91a99d0e3a6c28ea6039f8dbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A4=D1=80=D0=BE=D0=BB=D0=BE=D0=B2?= Date: Tue, 9 Nov 2021 17:59:53 +0500 Subject: [PATCH 2/6] update api codeGen and add scripts --- package-lock.json | 159 ++++++++++++++++++++++++++++++---------------- package.json | 6 +- 2 files changed, 109 insertions(+), 56 deletions(-) diff --git a/package-lock.json b/package-lock.json index 05b98eb..9a4e208 100644 --- a/package-lock.json +++ b/package-lock.json @@ -42,14 +42,32 @@ } }, "@apidevtools/json-schema-ref-parser": { - "version": "9.0.7", - "resolved": "https://registry.npmjs.org/@apidevtools/json-schema-ref-parser/-/json-schema-ref-parser-9.0.7.tgz", - "integrity": "sha512-QdwOGF1+eeyFh+17v2Tz626WX0nucd1iKOm6JUTUvCZdbolblCOOQCxGrQPY0f7jEhn36PiAWqZnsC2r5vmUWg==", + "version": "9.0.9", + "resolved": "https://registry.npmjs.org/@apidevtools/json-schema-ref-parser/-/json-schema-ref-parser-9.0.9.tgz", + "integrity": "sha512-GBD2Le9w2+lVFoc4vswGI/TjkNIZSVp7+9xPf+X3uidBfWnAeUWmquteSyt0+VCrhNMWj/FTABISQrD3Z/YA+w==", "dev": true, "requires": { "@jsdevtools/ono": "^7.1.3", + "@types/json-schema": "^7.0.6", "call-me-maybe": "^1.0.1", - "js-yaml": "^3.13.1" + "js-yaml": "^4.1.0" + }, + "dependencies": { + "argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true + }, + "js-yaml": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "dev": true, + "requires": { + "argparse": "^2.0.1" + } + } } }, "@babel/code-frame": { @@ -2416,9 +2434,9 @@ "integrity": "sha512-1z8k4wzFnNjVK/tlxvrWuK5WMt6mydWWP7+zvH5eFep4oj+UkrfiJTRtjCeBXNpwaA/FYqqtb4/QS4ianFpIRA==" }, "@types/minimist": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.1.tgz", - "integrity": "sha512-fZQQafSREFyuZcdWFAExYjBiCL7AUCdgsk80iO0q4yihYYdcIiH28CcuPTGFgLOCC8RlW49GSQxdHwZP+I7CNg==", + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.2.tgz", + "integrity": "sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==", "dev": true }, "@types/node": { @@ -7335,6 +7353,12 @@ "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==" }, + "globalyzer": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/globalyzer/-/globalyzer-0.1.0.tgz", + "integrity": "sha512-40oNTM9UfG6aBmuKxk/giHn5nQ8RVz/SS4Ir6zgzOv9/qC3kKZ9v4etGTcJbEl/NyVQH7FGU7d+X1egr57Md2Q==", + "dev": true + }, "globby": { "version": "11.0.3", "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.3.tgz", @@ -7348,6 +7372,12 @@ "slash": "^3.0.0" } }, + "globrex": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/globrex/-/globrex-0.1.2.tgz", + "integrity": "sha512-uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg==", + "dev": true + }, "graceful-fs": { "version": "4.2.6", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz", @@ -9891,12 +9921,12 @@ "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=" }, "json-schema-ref-parser": { - "version": "9.0.7", - "resolved": "https://registry.npmjs.org/json-schema-ref-parser/-/json-schema-ref-parser-9.0.7.tgz", - "integrity": "sha512-uxU9Ix+MVszvCTvBucQiIcNEny3oAEFg7EQHSZw2bquCCuqUqEPEczIdv/Uqo1Zv4/wDPZqOI+ulrMk1ncMtjQ==", + "version": "9.0.9", + "resolved": "https://registry.npmjs.org/json-schema-ref-parser/-/json-schema-ref-parser-9.0.9.tgz", + "integrity": "sha512-qcP2lmGy+JUoQJ4DOQeLaZDqH9qSkeGCK3suKWxJXS82dg728Mn3j97azDMaOUmJAN4uCq91LdPx4K7E8F1a7Q==", "dev": true, "requires": { - "@apidevtools/json-schema-ref-parser": "9.0.7" + "@apidevtools/json-schema-ref-parser": "9.0.9" } }, "json-schema-traverse": { @@ -10245,9 +10275,9 @@ "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=" }, "map-obj": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.2.0.tgz", - "integrity": "sha512-NAq0fCmZYGz9UFEQyndp7sisrow4GroyGeKluyKC/chuITZsPyOyC1UJZPJlVFImhXdROIP5xqouRLThT3BbpQ==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.3.0.tgz", + "integrity": "sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==", "dev": true }, "map-visit": { @@ -10340,14 +10370,23 @@ "lru-cache": "^6.0.0" } }, + "is-core-module": { + "version": "2.8.0", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.0.tgz", + "integrity": "sha512-vd15qHsaqrRL7dtH6QNuy0ndJmRDrS9HAM1CAiSifNUFv4x1a0CCVsj18hJ1mShxIG6T2i1sO78MkP56r0nYRw==", + "dev": true, + "requires": { + "has": "^1.0.3" + } + }, "normalize-package-data": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.2.tgz", - "integrity": "sha512-6CdZocmfGaKnIHPVFhJJZ3GuR8SsLKvDANFp47Jmy51aKIr8akjAWTSxtpI+MBgBFdSMRyo4hMpDlT6dTffgZg==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz", + "integrity": "sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==", "dev": true, "requires": { "hosted-git-info": "^4.0.1", - "resolve": "^1.20.0", + "is-core-module": "^2.5.0", "semver": "^7.3.4", "validate-npm-package-license": "^3.0.1" } @@ -10365,8 +10404,9 @@ }, "dependencies": { "hosted-git-info": { - "version": "2.8.8", - "resolved": "", + "version": "2.8.9", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz", + "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==", "dev": true }, "normalize-package-data": { @@ -10414,16 +10454,6 @@ } } }, - "resolve": { - "version": "1.20.0", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz", - "integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==", - "dev": true, - "requires": { - "is-core-module": "^2.2.0", - "path-parse": "^1.0.6" - } - }, "semver": { "version": "7.3.5", "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", @@ -10440,9 +10470,9 @@ "dev": true }, "yargs-parser": { - "version": "20.2.7", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.7.tgz", - "integrity": "sha512-FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw==", + "version": "20.2.9", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", + "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==", "dev": true } } @@ -11184,16 +11214,18 @@ } }, "openapi-typescript": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/openapi-typescript/-/openapi-typescript-3.2.0.tgz", - "integrity": "sha512-7tdJ5iL9dpk7/1njKp5Oh3Ue1uYoes5kv87JmYgH6fgC7EcrJxyp328SwQnQUg9+fF+nhMNYhZ4SJ0zK8z+Udg==", + "version": "3.4.1", + "resolved": "https://registry.npmjs.org/openapi-typescript/-/openapi-typescript-3.4.1.tgz", + "integrity": "sha512-d84pa1OLdL9lHByP9NdxGFfEnUxletlGbUZgsLl4WUb0I3izIMOr5JCJVLTOeBdOfgYkUI/+q2rhTkZK9bkGzA==", "dev": true, "requires": { - "js-yaml": "^4.0.0", - "kleur": "^4.1.3", + "hosted-git-info": "^3.0.8", + "js-yaml": "^4.1.0", + "kleur": "^4.1.4", "meow": "^9.0.0", "mime": "^2.5.2", - "prettier": "^2.2.1" + "prettier": "^2.3.0", + "tiny-glob": "^0.2.9" }, "dependencies": { "argparse": { @@ -11202,10 +11234,19 @@ "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", "dev": true }, + "hosted-git-info": { + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-3.0.8.tgz", + "integrity": "sha512-aXpmwoOhRBrw6X3j0h5RloK4x1OzsxMPyxqIHyNfSe2pypkVTZFpEiRoSipPEPlMrh0HW/XsjkJ5WgnCirpNUw==", + "dev": true, + "requires": { + "lru-cache": "^6.0.0" + } + }, "js-yaml": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.0.0.tgz", - "integrity": "sha512-pqon0s+4ScYUvX30wxQi3PogGFAlUyH0awepWvwkj4jD4v+ova3RiYw8bmA6x2rDrEaj8i/oWKoRxpVNW+Re8Q==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", "dev": true, "requires": { "argparse": "^2.0.1" @@ -11218,9 +11259,9 @@ "dev": true }, "mime": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/mime/-/mime-2.5.2.tgz", - "integrity": "sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg==", + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz", + "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==", "dev": true } } @@ -11253,9 +11294,9 @@ "dev": true }, "js-yaml": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.0.0.tgz", - "integrity": "sha512-pqon0s+4ScYUvX30wxQi3PogGFAlUyH0awepWvwkj4jD4v+ova3RiYw8bmA6x2rDrEaj8i/oWKoRxpVNW+Re8Q==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", "dev": true, "requires": { "argparse": "^2.0.1" @@ -12703,9 +12744,9 @@ "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=" }, "prettier": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.2.1.tgz", - "integrity": "sha512-PqyhM2yCjg/oKkFPtTGUojv7gnZAoG80ttl45O6x2Ug/rMJw4wcc9k6aaf2hibP7BGVCCM33gZoGjyvt9mm16Q==", + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.4.1.tgz", + "integrity": "sha512-9fbDAXSBcc6Bs1mZrDYb3XKzDLm4EXXL9sC1LqKP5rZkT6KRr/rf9amVUcODVXgguK/isJz0d0hP72WeaKWsvA==", "dev": true }, "pretty-bytes": { @@ -15655,6 +15696,16 @@ "resolved": "https://registry.npmjs.org/timsort/-/timsort-0.3.0.tgz", "integrity": "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=" }, + "tiny-glob": { + "version": "0.2.9", + "resolved": "https://registry.npmjs.org/tiny-glob/-/tiny-glob-0.2.9.tgz", + "integrity": "sha512-g/55ssRPUjShh+xkfx9UPDXqhckHEsHr4Vd9zX55oSdGZc/MD0m3sferOkwWtp98bv+kcVfEHtRJgBVJzelrzg==", + "dev": true, + "requires": { + "globalyzer": "0.1.0", + "globrex": "^0.1.2" + } + }, "tiny-invariant": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.1.0.tgz", @@ -15871,9 +15922,9 @@ "integrity": "sha512-qOcYwxaByStAWrBf4x0fibwZvMRG+r4cQoTjbPtUlrWjBHbmCAww1i448U0GJ+3cNNEtebDteo/cHOR3xJ4wEw==" }, "uglify-js": { - "version": "3.13.3", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.13.3.tgz", - "integrity": "sha512-otIc7O9LyxpUcQoXzj2hL4LPWKklO6LJWoJUzNa8A17Xgi4fOeDC8FBDOLHnC/Slo1CQgsZMcM6as0M76BZaig==", + "version": "3.14.3", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.14.3.tgz", + "integrity": "sha512-mic3aOdiq01DuSVx0TseaEzMIVqebMZ0Z3vaeDhFEh9bsc24hV1TFvN74reA2vs08D0ZWfNjAcJ3UbVLaBss+g==", "dev": true, "optional": true }, diff --git a/package.json b/package.json index 24738ee..a17e3a7 100644 --- a/package.json +++ b/package.json @@ -27,12 +27,14 @@ "start": "craco start", "build": "craco build", "test": "craco test", + "update_openapi":"npx openapi -i http://127.0.0.1:5000/swagger/v1/swagger.json -o src/services/api", + "update_openapi_server":"npx openapi -i http://192.168.1.70:5000/swagger/v1/swagger.json -o src/services/api", "react_start": "react-scripts start", "react_build": "react-scripts build", "react_test": "react-scripts test", "eject": "react-scripts eject" }, - "proxy": "http://192.168.1.70:5000", + "proxy": "http://192.168.1.58:5000", "eslintConfig": { "extends": [ "react-app", @@ -53,7 +55,7 @@ }, "devDependencies": { "@types/react": "^17.0.3", - "openapi-typescript": "^3.2.0", + "openapi-typescript": "^3.4.1", "openapi-typescript-codegen": "^0.9.3" } } From 497d106a9de5a15f38e2c26cbf0b83ee711832df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A4=D1=80=D0=BE=D0=BB=D0=BE=D0=B2?= Date: Tue, 9 Nov 2021 18:01:00 +0500 Subject: [PATCH 3/6] Add marks and action_confirms to drilling program page. --- src/components/Mark.jsx | 25 +++++++ src/pages/Documents/DocumentsTemplate.jsx | 3 +- src/pages/Documents/DrillingProgram.jsx | 79 +++++++++++++++++------ 3 files changed, 87 insertions(+), 20 deletions(-) create mode 100644 src/components/Mark.jsx diff --git a/src/components/Mark.jsx b/src/components/Mark.jsx new file mode 100644 index 0000000..c865eda --- /dev/null +++ b/src/components/Mark.jsx @@ -0,0 +1,25 @@ +import {Tooltip, Tag, Typography, Popconfirm, Button } from 'antd' +import {UserView} from './UserView' + +const markTypes = { + 0 : {color:"orange", text : "неизвестно"}, + 1 : {color:"green", text : "согласовано"}, +} + +const {Text} = Typography + +export const Mark = ({mark, onDelete}) => { + const markType = markTypes[mark.idMarkType]??markTypes[0] + return }> + + + {`${markType.text} ${new Date(mark.dateCreated).toLocaleString()}`} + + {(!mark?.isDeleted)&& + + + + } + + +} \ No newline at end of file diff --git a/src/pages/Documents/DocumentsTemplate.jsx b/src/pages/Documents/DocumentsTemplate.jsx index 6409392..497dd05 100644 --- a/src/pages/Documents/DocumentsTemplate.jsx +++ b/src/pages/Documents/DocumentsTemplate.jsx @@ -17,7 +17,7 @@ const pageSize = 12 const { RangePicker } = DatePicker const { Search } = Input -export default function DocumentsTemplate({ idCategory, idWell, accept, headerChild, onChange }) { +export default function DocumentsTemplate({ idCategory, idWell, accept, headerChild, customColumns, onChange}) { const [page, setPage] = useState(1) const [filterDataRange, setFilterDataRange] = useState([]) const [filterCompanyName, setFilterCompanyName] = useState([]) @@ -79,6 +79,7 @@ export default function DocumentsTemplate({ idCategory, idWell, accept, headerCh key: "company", render: (_, record) => }, + ...(customColumns??[]) ] const update = () => { diff --git a/src/pages/Documents/DrillingProgram.jsx b/src/pages/Documents/DrillingProgram.jsx index 09adc6c..4fd7062 100644 --- a/src/pages/Documents/DrillingProgram.jsx +++ b/src/pages/Documents/DrillingProgram.jsx @@ -1,4 +1,4 @@ -import {Button, Tooltip} from 'antd' +import {Popconfirm, Button, Tooltip} from 'antd' import { FileExcelOutlined } from '@ant-design/icons' import { useEffect, useState } from "react" import {invokeWebApiWrapperAsync, download} from '../../components/factory' @@ -6,6 +6,7 @@ import DocumentsTemplate from './DocumentsTemplate' import LoaderPortal from '../../components/LoaderPortal' import { Flex } from '../../components/Grid' import {DrillingProgramService, WellService} from '../../services/api' +import {Mark} from '../../components/Mark' const idFileCategoryDrillingProgramItems = 13; @@ -14,6 +15,7 @@ export default function DrillingProgram({idWell}) { const [showLoader, setShowLoader] = useState(false) const [tooltip, setTooltip] = useState('нет файлов для формирования') const [wellLabel, setWellLabel] = useState(`${idWell}`) + const [childKey, setChildKey] = useState(); useEffect(() => invokeWebApiWrapperAsync( async () => { @@ -33,8 +35,11 @@ export default function DrillingProgram({idWell}) { "Не удалось загрузить программу бурения") const openProgramPreview = () => invokeWebApiWrapperAsync(async()=>{ - const filWebUrl = await DrillingProgramService.getFileWebLink(idWell) - window.open(filWebUrl, '_blank') + const filWebUrl = await DrillingProgramService.getOrCreateSharedUrl(idWell) + if(filWebUrl && filWebUrl.length > 0) + window.open(filWebUrl, '_blank'); + else + throw new Error("Сервер вернул плохую ссылку") }, setShowLoader, "Не удалось создать быстрый просмотр программы") @@ -46,7 +51,10 @@ export default function DrillingProgram({idWell}) { return } - if(files.every(fileInfo => fileInfo?.name.toLowerCase().endsWith('.xlsx'))){ + const isAllFilesAreExcel = files.every(fileInfo => fileInfo?.name.toLowerCase().endsWith('.xlsx')) + const isAnyFileMarked = files.some(file => file?.fileMarks.some(m => m?.idMarkType === 1 && !m?.isDeleted)) + + if(isAllFilesAreExcel && isAnyFileMarked){ setTooltip('Программа доступна для скачивания') selDownloadButtonEnabled(true) } @@ -55,6 +63,41 @@ export default function DrillingProgram({idWell}) { } } + const customColumns = [ + { + title: "Метки", + key: "fileMarks", + render: (_, record) => renderMarksColumn(record?.id, record?.fileMarks) + }, + ] + + const renderMarksColumn=(idFile, marks)=>{ + const validMarks = marks?.filter(m => !(m?.isDeleted)) + if(validMarks?.length) + return validMarks.map(mark => deleteMark(mark.id)}/>) + + return true && + addMarkToFile(idFile)}> + + + } + + const addMarkToFile = async (idFile) => { + const mark = { + idFile: idFile, + idMarkType: 1, + isDeleted:false, + comment: ''} + await DrillingProgramService.createFileMark(idWell, mark) + selDownloadButtonEnabled(true) + setChildKey(Date.now()) + } + + const deleteMark = async (idMark) => { + await DrillingProgramService.deleteFileMark(idWell, idMark) + setChildKey(Date.now()) + } + const downloadButton =
Программа бурения @@ -66,22 +109,18 @@ export default function DrillingProgram({idWell}) { Сформировать и скачать - - - - - + + Программа бурения {wellLabel}.xlsx + +
@@ -92,6 +131,8 @@ export default function DrillingProgram({idWell}) { idCategory={idFileCategoryDrillingProgramItems} accept='.xlsx' headerChild={downloadButton} - onChange={filesUpdated} /> + onChange={filesUpdated} + customColumns = {customColumns} + key = {childKey}/> ) } \ No newline at end of file From 421143a77c744d392b0b42a7b536f2ebaebb4bed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A4=D1=80=D0=BE=D0=BB=D0=BE=D0=B2?= Date: Thu, 11 Nov 2021 12:22:21 +0500 Subject: [PATCH 4/6] =?UTF-8?q?CF2-90=20=D0=A0=D0=B5=D0=B0=D0=BB=D0=B8?= =?UTF-8?q?=D0=B7=D0=BE=D0=B2=D0=B0=D1=82=D1=8C=20=D0=B2=D0=BE=20=D0=B2?= =?UTF-8?q?=D0=BA=D0=BB=D0=B0=D0=B4=D0=BA=D0=B5=20=D0=BF=D1=80=D0=BE=D0=B3?= =?UTF-8?q?=D1=80=D0=B0=D0=BC=D0=BC=D0=B0=20=D0=B1=D1=83=D1=80=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D1=8F=20=D0=B8=D0=BD=D1=84=D0=BE=D1=80=D0=BC=D0=B0=D1=86?= =?UTF-8?q?=D0=B8=D0=BE=D0=BD=D0=BD=D0=BE=D0=B5=20=D1=81=D0=BE=D0=BE=D0=B1?= =?UTF-8?q?=D1=89=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BE=20=D0=B4=D0=B0=D1=82?= =?UTF-8?q?=D0=B5,=20=D0=B2=D1=80=D0=B5=D0=BC=D0=B5=D0=BD=D0=B8=20=D0=B8?= =?UTF-8?q?=20=D0=A4=D0=98=D0=9E=20=D0=BF=D0=BE=D1=81=D0=BB=D0=B5=D0=B4?= =?UTF-8?q?=D0=BD=D0=B5=D0=B3=D0=BE=20=D0=B4=D0=B0=D0=B1=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=BD=D0=BE=D0=B3=D0=BE=20=D0=B8=D0=B7=D0=BC=D0=B5?= =?UTF-8?q?=D0=BD=D0=B5=D0=BD=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/Documents/DocumentsTemplate.jsx | 4 ++-- src/pages/Documents/DrillingProgram.jsx | 19 +++++++++++++++++-- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/src/pages/Documents/DocumentsTemplate.jsx b/src/pages/Documents/DocumentsTemplate.jsx index 497dd05..fb8eff9 100644 --- a/src/pages/Documents/DocumentsTemplate.jsx +++ b/src/pages/Documents/DocumentsTemplate.jsx @@ -17,7 +17,7 @@ const pageSize = 12 const { RangePicker } = DatePicker const { Search } = Input -export default function DocumentsTemplate({ idCategory, idWell, accept, headerChild, customColumns, onChange}) { +export default function DocumentsTemplate({ idCategory, idWell, accept, headerChild, customColumns, beforeTable, onChange}) { const [page, setPage] = useState(1) const [filterDataRange, setFilterDataRange] = useState([]) const [filterCompanyName, setFilterCompanyName] = useState([]) @@ -175,7 +175,7 @@ export default function DocumentsTemplate({ idCategory, idWell, accept, headerCh    {headerChild} - + {beforeTable} invokeWebApiWrapperAsync( async () => { @@ -61,6 +64,8 @@ export default function DrillingProgram({idWell}) { else{ setTooltip('Список файлов содержит недопустимые типы файлов') } + const last = files.reduce((pre, cur) => pre.uploadDate > cur.uploadDate ? pre : cur) + setLastUpdatedFile(last); } const customColumns = [ @@ -125,8 +130,18 @@ export default function DrillingProgram({idWell}) { + const lastUpdatedFileView = lastUpdatedFile && + + Последнее изменние: +  "{lastUpdatedFile.name}" +  [{formatBytes(lastUpdatedFile.size)}] +  загружен: {new Date(lastUpdatedFile.uploadDate).toLocaleString()} +  автор: + + return( Date: Mon, 15 Nov 2021 14:01:17 +0500 Subject: [PATCH 5/6] Services updated --- src/services/api/index.ts | 1 + src/services/api/models/AuthDto.ts | 2 +- src/services/api/models/ClusterDto.ts | 2 +- src/services/api/models/CompanyDto.ts | 2 +- src/services/api/models/DatesRangeDto.ts | 2 +- src/services/api/models/DepositDto.ts | 2 +- src/services/api/models/DrillFlowChartDto.ts | 2 +- src/services/api/models/DrillParamsDto.ts | 2 +- src/services/api/models/EventDto.ts | 2 +- src/services/api/models/FileInfoDto.ts | 2 +- .../models/FileInfoDtoPaginationContainer.ts | 2 +- src/services/api/models/FileMarkDto.ts | 2 +- src/services/api/models/MeasureDto.ts | 2 +- src/services/api/models/MessageDto.ts | 2 +- .../models/MessageDtoPaginationContainer.ts | 2 +- src/services/api/models/StatClusterDto.ts | 2 +- src/services/api/models/StatOperationsDto.ts | 2 +- .../models/StatOperationsDtoPlanFactBase.ts | 2 +- src/services/api/models/StatSectionDto.ts | 2 +- src/services/api/models/StatWellDto.ts | 2 +- .../api/models/TelemetryDataSaubDto.ts | 5 +- .../api/models/TelemetryDataSpinDto.ts | 3 +- src/services/api/models/TelemetryDto.ts | 2 +- src/services/api/models/TelemetryInfoDto.ts | 2 +- .../api/models/TelemetryMessageDto.ts | 2 +- .../api/models/TelemetryOperationDto.ts | 2 +- ...elemetryOperationDtoPaginationContainer.ts | 2 +- .../models/TelemetryOperationDurationDto.ts | 2 +- src/services/api/models/TelemetryUserDto.ts | 2 +- src/services/api/models/UserDto.ts | 2 +- src/services/api/models/UserRoleDto.ts | 2 +- src/services/api/models/UserTokenDto.ts | 2 +- src/services/api/models/WellCompositeDto.ts | 2 +- src/services/api/models/WellDepthToDayDto.ts | 2 +- .../api/models/WellDepthToIntervalDto.ts | 2 +- src/services/api/models/WellDto.ts | 2 +- .../api/models/WellOperationCategoryDto.ts | 2 +- src/services/api/models/WellOperationDto.ts | 2 +- .../WellOperationDtoPaginationContainer.ts | 2 +- .../WellOperationDtoPlanFactPredictBase.ts | 2 +- src/services/api/models/WellParamsDto.ts | 2 +- .../api/services/AdminClusterService.ts | 24 ++--- .../api/services/AdminCompanyService.ts | 24 ++--- .../api/services/AdminDepositService.ts | 24 ++--- .../api/services/AdminTelemetryService.ts | 28 +++--- .../api/services/AdminUserRoleService.ts | 24 ++--- src/services/api/services/AdminUserService.ts | 24 ++--- src/services/api/services/AdminWellService.ts | 24 ++--- src/services/api/services/AuthService.ts | 20 ++-- src/services/api/services/ClusterService.ts | 6 +- src/services/api/services/DepositService.ts | 6 +- .../api/services/DrillFlowChartService.ts | 36 +++---- .../api/services/DrillParamsService.ts | 48 ++++----- .../api/services/DrillingProgramService.ts | 20 ++-- src/services/api/services/FileService.ts | 52 +++++----- src/services/api/services/MeasureService.ts | 56 +++++------ src/services/api/services/MessageService.ts | 20 ++-- src/services/api/services/ReportService.ts | 46 ++++----- .../api/services/RequerstTrackerService.ts | 98 +++++++++++++++++++ .../api/services/TelemetryAnalyticsService.ts | 46 ++++----- .../api/services/TelemetryDataSaubService.ts | 22 ++--- .../api/services/TelemetryDataSpinService.ts | 22 ++--- src/services/api/services/TelemetryService.ts | 24 ++--- .../api/services/WellCompositeService.ts | 10 +- .../api/services/WellOperationService.ts | 78 +++++++-------- .../api/services/WellOperationStatService.ts | 18 ++-- src/services/api/services/WellService.ts | 14 +-- 67 files changed, 498 insertions(+), 401 deletions(-) create mode 100644 src/services/api/services/RequerstTrackerService.ts diff --git a/src/services/api/index.ts b/src/services/api/index.ts index 63ab684..2a11d14 100644 --- a/src/services/api/index.ts +++ b/src/services/api/index.ts @@ -70,6 +70,7 @@ export { FileService } from './services/FileService'; export { MeasureService } from './services/MeasureService'; export { MessageService } from './services/MessageService'; export { ReportService } from './services/ReportService'; +export { RequerstTrackerService } from './services/RequerstTrackerService'; export { TelemetryAnalyticsService } from './services/TelemetryAnalyticsService'; export { TelemetryDataSaubService } from './services/TelemetryDataSaubService'; export { TelemetryDataSpinService } from './services/TelemetryDataSpinService'; diff --git a/src/services/api/models/AuthDto.ts b/src/services/api/models/AuthDto.ts index a8317bf..bd6f347 100644 --- a/src/services/api/models/AuthDto.ts +++ b/src/services/api/models/AuthDto.ts @@ -5,4 +5,4 @@ export type AuthDto = { login?: string | null; password?: string | null; -} \ No newline at end of file +} diff --git a/src/services/api/models/ClusterDto.ts b/src/services/api/models/ClusterDto.ts index ec20834..226f3a0 100644 --- a/src/services/api/models/ClusterDto.ts +++ b/src/services/api/models/ClusterDto.ts @@ -11,4 +11,4 @@ export type ClusterDto = { latitude?: number | null; longitude?: number | null; wells?: Array | null; -} \ No newline at end of file +} diff --git a/src/services/api/models/CompanyDto.ts b/src/services/api/models/CompanyDto.ts index e532790..85fb2ad 100644 --- a/src/services/api/models/CompanyDto.ts +++ b/src/services/api/models/CompanyDto.ts @@ -6,4 +6,4 @@ export type CompanyDto = { id?: number; caption?: string | null; companyTypeCaption?: string | null; -} \ No newline at end of file +} diff --git a/src/services/api/models/DatesRangeDto.ts b/src/services/api/models/DatesRangeDto.ts index 1a9132f..acbe4e8 100644 --- a/src/services/api/models/DatesRangeDto.ts +++ b/src/services/api/models/DatesRangeDto.ts @@ -5,4 +5,4 @@ export type DatesRangeDto = { from?: string; to?: string; -} \ No newline at end of file +} diff --git a/src/services/api/models/DepositDto.ts b/src/services/api/models/DepositDto.ts index c142448..c57ae4a 100644 --- a/src/services/api/models/DepositDto.ts +++ b/src/services/api/models/DepositDto.ts @@ -11,4 +11,4 @@ export type DepositDto = { latitude?: number | null; longitude?: number | null; clusters?: Array | null; -} \ No newline at end of file +} diff --git a/src/services/api/models/DrillFlowChartDto.ts b/src/services/api/models/DrillFlowChartDto.ts index 7da53b9..ec4a959 100644 --- a/src/services/api/models/DrillFlowChartDto.ts +++ b/src/services/api/models/DrillFlowChartDto.ts @@ -19,4 +19,4 @@ export type DrillFlowChartDto = { rotorSpeedMax?: number; flowMin?: number; flowMax?: number; -} \ No newline at end of file +} diff --git a/src/services/api/models/DrillParamsDto.ts b/src/services/api/models/DrillParamsDto.ts index 560b831..406c87a 100644 --- a/src/services/api/models/DrillParamsDto.ts +++ b/src/services/api/models/DrillParamsDto.ts @@ -23,4 +23,4 @@ export type DrillParamsDto = { flowMin?: number; flowAvg?: number; flowMax?: number; -} \ No newline at end of file +} diff --git a/src/services/api/models/EventDto.ts b/src/services/api/models/EventDto.ts index e4d90a1..e7e334b 100644 --- a/src/services/api/models/EventDto.ts +++ b/src/services/api/models/EventDto.ts @@ -9,4 +9,4 @@ export type EventDto = { tag?: string | null; eventType?: number; idSound?: number; -} \ No newline at end of file +} diff --git a/src/services/api/models/FileInfoDto.ts b/src/services/api/models/FileInfoDto.ts index c960d37..9ca4e63 100644 --- a/src/services/api/models/FileInfoDto.ts +++ b/src/services/api/models/FileInfoDto.ts @@ -17,4 +17,4 @@ export type FileInfoDto = { publishInfo?: FilePublishInfoDto; author?: UserDto; fileMarks?: Array | null; -} \ No newline at end of file +} diff --git a/src/services/api/models/FileInfoDtoPaginationContainer.ts b/src/services/api/models/FileInfoDtoPaginationContainer.ts index 6a8d883..7bf4f27 100644 --- a/src/services/api/models/FileInfoDtoPaginationContainer.ts +++ b/src/services/api/models/FileInfoDtoPaginationContainer.ts @@ -9,4 +9,4 @@ export type FileInfoDtoPaginationContainer = { take?: number; count?: number; items?: Array | null; -} \ No newline at end of file +} diff --git a/src/services/api/models/FileMarkDto.ts b/src/services/api/models/FileMarkDto.ts index 4acce19..9838d66 100644 --- a/src/services/api/models/FileMarkDto.ts +++ b/src/services/api/models/FileMarkDto.ts @@ -12,4 +12,4 @@ export type FileMarkDto = { comment?: string | null; isDeleted?: boolean; user?: UserDto; -} \ No newline at end of file +} diff --git a/src/services/api/models/MeasureDto.ts b/src/services/api/models/MeasureDto.ts index dea91c6..5a846f9 100644 --- a/src/services/api/models/MeasureDto.ts +++ b/src/services/api/models/MeasureDto.ts @@ -9,4 +9,4 @@ export type MeasureDto = { categoryName?: string | null; timestamp?: string; data?: Record | null; -} \ No newline at end of file +} diff --git a/src/services/api/models/MessageDto.ts b/src/services/api/models/MessageDto.ts index 1c5001b..081e545 100644 --- a/src/services/api/models/MessageDto.ts +++ b/src/services/api/models/MessageDto.ts @@ -9,4 +9,4 @@ export type MessageDto = { wellDepth?: number; user?: string | null; message?: string | null; -} \ No newline at end of file +} diff --git a/src/services/api/models/MessageDtoPaginationContainer.ts b/src/services/api/models/MessageDtoPaginationContainer.ts index 360fed6..e41bc14 100644 --- a/src/services/api/models/MessageDtoPaginationContainer.ts +++ b/src/services/api/models/MessageDtoPaginationContainer.ts @@ -9,4 +9,4 @@ export type MessageDtoPaginationContainer = { take?: number; count?: number; items?: Array | null; -} \ No newline at end of file +} diff --git a/src/services/api/models/StatClusterDto.ts b/src/services/api/models/StatClusterDto.ts index 8f18c1a..5bd051a 100644 --- a/src/services/api/models/StatClusterDto.ts +++ b/src/services/api/models/StatClusterDto.ts @@ -8,4 +8,4 @@ export type StatClusterDto = { id?: number; caption?: string | null; statsWells?: Array | null; -} \ No newline at end of file +} diff --git a/src/services/api/models/StatOperationsDto.ts b/src/services/api/models/StatOperationsDto.ts index 6941292..40c7510 100644 --- a/src/services/api/models/StatOperationsDto.ts +++ b/src/services/api/models/StatOperationsDto.ts @@ -13,4 +13,4 @@ export type StatOperationsDto = { bhaDownSpeed?: number; casingDownSpeed?: number; nonProductiveHours?: number; -} \ No newline at end of file +} diff --git a/src/services/api/models/StatOperationsDtoPlanFactBase.ts b/src/services/api/models/StatOperationsDtoPlanFactBase.ts index b15856d..cd15dfe 100644 --- a/src/services/api/models/StatOperationsDtoPlanFactBase.ts +++ b/src/services/api/models/StatOperationsDtoPlanFactBase.ts @@ -7,4 +7,4 @@ import type { StatOperationsDto } from './StatOperationsDto'; export type StatOperationsDtoPlanFactBase = { plan?: StatOperationsDto; fact?: StatOperationsDto; -} \ No newline at end of file +} diff --git a/src/services/api/models/StatSectionDto.ts b/src/services/api/models/StatSectionDto.ts index ec2edfe..934eb6d 100644 --- a/src/services/api/models/StatSectionDto.ts +++ b/src/services/api/models/StatSectionDto.ts @@ -9,4 +9,4 @@ export type StatSectionDto = { fact?: StatOperationsDto; id?: number; caption?: string | null; -} \ No newline at end of file +} diff --git a/src/services/api/models/StatWellDto.ts b/src/services/api/models/StatWellDto.ts index 171afff..0ef8103 100644 --- a/src/services/api/models/StatWellDto.ts +++ b/src/services/api/models/StatWellDto.ts @@ -16,4 +16,4 @@ export type StatWellDto = { sections?: Array | null; total?: StatOperationsDtoPlanFactBase; companies?: Array | null; -} \ No newline at end of file +} diff --git a/src/services/api/models/TelemetryDataSaubDto.ts b/src/services/api/models/TelemetryDataSaubDto.ts index c801502..0f7df6e 100644 --- a/src/services/api/models/TelemetryDataSaubDto.ts +++ b/src/services/api/models/TelemetryDataSaubDto.ts @@ -3,10 +3,9 @@ /* eslint-disable */ export type TelemetryDataSaubDto = { - id?: number; + idTelemetry?: number; date?: string; mode?: number | null; - idTelemetry?: number; user?: string | null; wellDepth?: number | null; bitDepth?: number | null; @@ -42,4 +41,4 @@ export type TelemetryDataSaubDto = { flowDeltaLimitMax?: number | null; idFeedRegulator?: number | null; mseState?: number | null; -} \ No newline at end of file +} diff --git a/src/services/api/models/TelemetryDataSpinDto.ts b/src/services/api/models/TelemetryDataSpinDto.ts index 8a88f08..facd55a 100644 --- a/src/services/api/models/TelemetryDataSpinDto.ts +++ b/src/services/api/models/TelemetryDataSpinDto.ts @@ -3,7 +3,6 @@ /* eslint-disable */ export type TelemetryDataSpinDto = { - id?: number; idTelemetry?: number; date?: string; topDriveSpeed?: number | null; @@ -69,4 +68,4 @@ export type TelemetryDataSpinDto = { pidMuxTorqueLeftLimit?: number | null; state?: number | null; breakAngleLeft?: number | null; -} \ No newline at end of file +} diff --git a/src/services/api/models/TelemetryDto.ts b/src/services/api/models/TelemetryDto.ts index a1eb21a..b152295 100644 --- a/src/services/api/models/TelemetryDto.ts +++ b/src/services/api/models/TelemetryDto.ts @@ -8,4 +8,4 @@ export type TelemetryDto = { id?: number; remoteUid?: string | null; info?: TelemetryInfoDto; -} \ No newline at end of file +} diff --git a/src/services/api/models/TelemetryInfoDto.ts b/src/services/api/models/TelemetryInfoDto.ts index 0486f7c..01b57bc 100644 --- a/src/services/api/models/TelemetryInfoDto.ts +++ b/src/services/api/models/TelemetryInfoDto.ts @@ -14,4 +14,4 @@ export type TelemetryInfoDto = { saubPlcVersion?: string | null; spinPlcVersion?: string | null; comment?: string | null; -} \ No newline at end of file +} diff --git a/src/services/api/models/TelemetryMessageDto.ts b/src/services/api/models/TelemetryMessageDto.ts index ea9f006..492da5c 100644 --- a/src/services/api/models/TelemetryMessageDto.ts +++ b/src/services/api/models/TelemetryMessageDto.ts @@ -12,4 +12,4 @@ export type TelemetryMessageDto = { arg1?: string | null; arg2?: string | null; arg3?: string | null; -} \ No newline at end of file +} diff --git a/src/services/api/models/TelemetryOperationDto.ts b/src/services/api/models/TelemetryOperationDto.ts index 97cb3b5..4b24faa 100644 --- a/src/services/api/models/TelemetryOperationDto.ts +++ b/src/services/api/models/TelemetryOperationDto.ts @@ -9,4 +9,4 @@ export type TelemetryOperationDto = { endDate?: string; startWellDepth?: number; endWellDepth?: number; -} \ No newline at end of file +} diff --git a/src/services/api/models/TelemetryOperationDtoPaginationContainer.ts b/src/services/api/models/TelemetryOperationDtoPaginationContainer.ts index d09351d..06d02c5 100644 --- a/src/services/api/models/TelemetryOperationDtoPaginationContainer.ts +++ b/src/services/api/models/TelemetryOperationDtoPaginationContainer.ts @@ -9,4 +9,4 @@ export type TelemetryOperationDtoPaginationContainer = { take?: number; count?: number; items?: Array | null; -} \ No newline at end of file +} diff --git a/src/services/api/models/TelemetryOperationDurationDto.ts b/src/services/api/models/TelemetryOperationDurationDto.ts index 361a705..dc090a7 100644 --- a/src/services/api/models/TelemetryOperationDurationDto.ts +++ b/src/services/api/models/TelemetryOperationDurationDto.ts @@ -5,4 +5,4 @@ export type TelemetryOperationDurationDto = { operationName?: string | null; duration?: number; -} \ No newline at end of file +} diff --git a/src/services/api/models/TelemetryUserDto.ts b/src/services/api/models/TelemetryUserDto.ts index 4bd727c..b4959fc 100644 --- a/src/services/api/models/TelemetryUserDto.ts +++ b/src/services/api/models/TelemetryUserDto.ts @@ -8,4 +8,4 @@ export type TelemetryUserDto = { surname?: string | null; patronymic?: string | null; level?: number; -} \ No newline at end of file +} diff --git a/src/services/api/models/UserDto.ts b/src/services/api/models/UserDto.ts index 8c5ae2f..748389f 100644 --- a/src/services/api/models/UserDto.ts +++ b/src/services/api/models/UserDto.ts @@ -18,4 +18,4 @@ export type UserDto = { idRole?: number | null; password?: string | null; company?: CompanyDto; -} \ No newline at end of file +} diff --git a/src/services/api/models/UserRoleDto.ts b/src/services/api/models/UserRoleDto.ts index ad7f1d2..c0810e1 100644 --- a/src/services/api/models/UserRoleDto.ts +++ b/src/services/api/models/UserRoleDto.ts @@ -8,4 +8,4 @@ export type UserRoleDto = { id?: number; caption?: string | null; users?: Array | null; -} \ No newline at end of file +} diff --git a/src/services/api/models/UserTokenDto.ts b/src/services/api/models/UserTokenDto.ts index feff474..c7a5f92 100644 --- a/src/services/api/models/UserTokenDto.ts +++ b/src/services/api/models/UserTokenDto.ts @@ -15,4 +15,4 @@ export type UserTokenDto = { companyName?: string | null; roleName?: string | null; token?: string | null; -} \ No newline at end of file +} diff --git a/src/services/api/models/WellCompositeDto.ts b/src/services/api/models/WellCompositeDto.ts index aab2a1b..2db927d 100644 --- a/src/services/api/models/WellCompositeDto.ts +++ b/src/services/api/models/WellCompositeDto.ts @@ -6,4 +6,4 @@ export type WellCompositeDto = { idWell?: number; idWellSrc?: number; idWellSectionType?: number; -} \ No newline at end of file +} diff --git a/src/services/api/models/WellDepthToDayDto.ts b/src/services/api/models/WellDepthToDayDto.ts index 51cef5f..6db8d80 100644 --- a/src/services/api/models/WellDepthToDayDto.ts +++ b/src/services/api/models/WellDepthToDayDto.ts @@ -6,4 +6,4 @@ export type WellDepthToDayDto = { wellDepth?: number; bitDepth?: number; date?: string; -} \ No newline at end of file +} diff --git a/src/services/api/models/WellDepthToIntervalDto.ts b/src/services/api/models/WellDepthToIntervalDto.ts index a92c110..72d34a2 100644 --- a/src/services/api/models/WellDepthToIntervalDto.ts +++ b/src/services/api/models/WellDepthToIntervalDto.ts @@ -5,4 +5,4 @@ export type WellDepthToIntervalDto = { intervalStartDate?: string; intervalDepthProgress?: number; -} \ No newline at end of file +} diff --git a/src/services/api/models/WellDto.ts b/src/services/api/models/WellDto.ts index 9cf1c29..ebc03bc 100644 --- a/src/services/api/models/WellDto.ts +++ b/src/services/api/models/WellDto.ts @@ -16,4 +16,4 @@ export type WellDto = { idState?: number; lastTelemetryDate?: string; telemetry?: TelemetryDto; -} \ No newline at end of file +} diff --git a/src/services/api/models/WellOperationCategoryDto.ts b/src/services/api/models/WellOperationCategoryDto.ts index 5581c68..b682abd 100644 --- a/src/services/api/models/WellOperationCategoryDto.ts +++ b/src/services/api/models/WellOperationCategoryDto.ts @@ -6,4 +6,4 @@ export type WellOperationCategoryDto = { id?: number; name?: string | null; code?: number; -} \ No newline at end of file +} diff --git a/src/services/api/models/WellOperationDto.ts b/src/services/api/models/WellOperationDto.ts index c0e6f17..7702acf 100644 --- a/src/services/api/models/WellOperationDto.ts +++ b/src/services/api/models/WellOperationDto.ts @@ -16,4 +16,4 @@ export type WellOperationDto = { dateStart?: string; durationHours?: number; comment?: string | null; -} \ No newline at end of file +} diff --git a/src/services/api/models/WellOperationDtoPaginationContainer.ts b/src/services/api/models/WellOperationDtoPaginationContainer.ts index 4dbd6b7..eaa7dc5 100644 --- a/src/services/api/models/WellOperationDtoPaginationContainer.ts +++ b/src/services/api/models/WellOperationDtoPaginationContainer.ts @@ -9,4 +9,4 @@ export type WellOperationDtoPaginationContainer = { take?: number; count?: number; items?: Array | null; -} \ No newline at end of file +} diff --git a/src/services/api/models/WellOperationDtoPlanFactPredictBase.ts b/src/services/api/models/WellOperationDtoPlanFactPredictBase.ts index 86b2a67..d753775 100644 --- a/src/services/api/models/WellOperationDtoPlanFactPredictBase.ts +++ b/src/services/api/models/WellOperationDtoPlanFactPredictBase.ts @@ -8,4 +8,4 @@ export type WellOperationDtoPlanFactPredictBase = { plan?: WellOperationDto; fact?: WellOperationDto; predict?: WellOperationDto; -} \ No newline at end of file +} diff --git a/src/services/api/models/WellParamsDto.ts b/src/services/api/models/WellParamsDto.ts index 7c77820..4f01852 100644 --- a/src/services/api/models/WellParamsDto.ts +++ b/src/services/api/models/WellParamsDto.ts @@ -8,4 +8,4 @@ export type WellParamsDto = { longitude?: number | null; idWellType?: number; idState?: number; -} \ No newline at end of file +} diff --git a/src/services/api/services/AdminClusterService.ts b/src/services/api/services/AdminClusterService.ts index e79634a..f76b7bb 100644 --- a/src/services/api/services/AdminClusterService.ts +++ b/src/services/api/services/AdminClusterService.ts @@ -15,9 +15,9 @@ export class AdminClusterService { * @throws ApiError */ public static async getPage( -skip: number, -take: number = 32, -): Promise { + skip: number, + take: number = 32, + ): Promise { const result = await __request({ method: 'GET', path: `/api/admin/cluster`, @@ -36,8 +36,8 @@ take: number = 32, * @throws ApiError */ public static async insert( -requestBody?: ClusterDto, -): Promise { + requestBody?: ClusterDto, + ): Promise { const result = await __request({ method: 'POST', path: `/api/admin/cluster`, @@ -53,8 +53,8 @@ requestBody?: ClusterDto, * @throws ApiError */ public static async get( -id: number, -): Promise { + id: number, + ): Promise { const result = await __request({ method: 'GET', path: `/api/admin/cluster/${id}`, @@ -70,9 +70,9 @@ id: number, * @throws ApiError */ public static async put( -id: number, -requestBody?: ClusterDto, -): Promise { + id: number, + requestBody?: ClusterDto, + ): Promise { const result = await __request({ method: 'PUT', path: `/api/admin/cluster/${id}`, @@ -88,8 +88,8 @@ requestBody?: ClusterDto, * @throws ApiError */ public static async delete( -id: number, -): Promise { + id: number, + ): Promise { const result = await __request({ method: 'DELETE', path: `/api/admin/cluster/${id}`, diff --git a/src/services/api/services/AdminCompanyService.ts b/src/services/api/services/AdminCompanyService.ts index 6b9cbbb..fd07059 100644 --- a/src/services/api/services/AdminCompanyService.ts +++ b/src/services/api/services/AdminCompanyService.ts @@ -15,9 +15,9 @@ export class AdminCompanyService { * @throws ApiError */ public static async getPage( -skip: number, -take: number = 32, -): Promise { + skip: number, + take: number = 32, + ): Promise { const result = await __request({ method: 'GET', path: `/api/admin/company`, @@ -36,8 +36,8 @@ take: number = 32, * @throws ApiError */ public static async insert( -requestBody?: CompanyDto, -): Promise { + requestBody?: CompanyDto, + ): Promise { const result = await __request({ method: 'POST', path: `/api/admin/company`, @@ -53,8 +53,8 @@ requestBody?: CompanyDto, * @throws ApiError */ public static async get( -id: number, -): Promise { + id: number, + ): Promise { const result = await __request({ method: 'GET', path: `/api/admin/company/${id}`, @@ -70,9 +70,9 @@ id: number, * @throws ApiError */ public static async put( -id: number, -requestBody?: CompanyDto, -): Promise { + id: number, + requestBody?: CompanyDto, + ): Promise { const result = await __request({ method: 'PUT', path: `/api/admin/company/${id}`, @@ -88,8 +88,8 @@ requestBody?: CompanyDto, * @throws ApiError */ public static async delete( -id: number, -): Promise { + id: number, + ): Promise { const result = await __request({ method: 'DELETE', path: `/api/admin/company/${id}`, diff --git a/src/services/api/services/AdminDepositService.ts b/src/services/api/services/AdminDepositService.ts index 13a0364..eca13dc 100644 --- a/src/services/api/services/AdminDepositService.ts +++ b/src/services/api/services/AdminDepositService.ts @@ -15,9 +15,9 @@ export class AdminDepositService { * @throws ApiError */ public static async getPage( -skip: number, -take: number = 32, -): Promise { + skip: number, + take: number = 32, + ): Promise { const result = await __request({ method: 'GET', path: `/api/admin/deposit`, @@ -36,8 +36,8 @@ take: number = 32, * @throws ApiError */ public static async insert( -requestBody?: DepositDto, -): Promise { + requestBody?: DepositDto, + ): Promise { const result = await __request({ method: 'POST', path: `/api/admin/deposit`, @@ -53,8 +53,8 @@ requestBody?: DepositDto, * @throws ApiError */ public static async get( -id: number, -): Promise { + id: number, + ): Promise { const result = await __request({ method: 'GET', path: `/api/admin/deposit/${id}`, @@ -70,9 +70,9 @@ id: number, * @throws ApiError */ public static async put( -id: number, -requestBody?: DepositDto, -): Promise { + id: number, + requestBody?: DepositDto, + ): Promise { const result = await __request({ method: 'PUT', path: `/api/admin/deposit/${id}`, @@ -88,8 +88,8 @@ requestBody?: DepositDto, * @throws ApiError */ public static async delete( -id: number, -): Promise { + id: number, + ): Promise { const result = await __request({ method: 'DELETE', path: `/api/admin/deposit/${id}`, diff --git a/src/services/api/services/AdminTelemetryService.ts b/src/services/api/services/AdminTelemetryService.ts index f094362..ce56002 100644 --- a/src/services/api/services/AdminTelemetryService.ts +++ b/src/services/api/services/AdminTelemetryService.ts @@ -26,8 +26,8 @@ export class AdminTelemetryService { * @throws ApiError */ public static async mergeTelemetries( -requestBody?: Array, -): Promise { + requestBody?: Array, + ): Promise { const result = await __request({ method: 'POST', path: `/merge`, @@ -44,9 +44,9 @@ requestBody?: Array, * @throws ApiError */ public static async getPage( -skip: number, -take: number = 32, -): Promise { + skip: number, + take: number = 32, + ): Promise { const result = await __request({ method: 'GET', path: `/api/admin/telemetry`, @@ -65,8 +65,8 @@ take: number = 32, * @throws ApiError */ public static async insert( -requestBody?: TelemetryDto, -): Promise { + requestBody?: TelemetryDto, + ): Promise { const result = await __request({ method: 'POST', path: `/api/admin/telemetry`, @@ -82,8 +82,8 @@ requestBody?: TelemetryDto, * @throws ApiError */ public static async get( -id: number, -): Promise { + id: number, + ): Promise { const result = await __request({ method: 'GET', path: `/api/admin/telemetry/${id}`, @@ -99,9 +99,9 @@ id: number, * @throws ApiError */ public static async put( -id: number, -requestBody?: TelemetryDto, -): Promise { + id: number, + requestBody?: TelemetryDto, + ): Promise { const result = await __request({ method: 'PUT', path: `/api/admin/telemetry/${id}`, @@ -117,8 +117,8 @@ requestBody?: TelemetryDto, * @throws ApiError */ public static async delete( -id: number, -): Promise { + id: number, + ): Promise { const result = await __request({ method: 'DELETE', path: `/api/admin/telemetry/${id}`, diff --git a/src/services/api/services/AdminUserRoleService.ts b/src/services/api/services/AdminUserRoleService.ts index 5dd8522..0abe50b 100644 --- a/src/services/api/services/AdminUserRoleService.ts +++ b/src/services/api/services/AdminUserRoleService.ts @@ -15,9 +15,9 @@ export class AdminUserRoleService { * @throws ApiError */ public static async getPage( -skip: number, -take: number = 32, -): Promise { + skip: number, + take: number = 32, + ): Promise { const result = await __request({ method: 'GET', path: `/api/admin/user/role`, @@ -36,8 +36,8 @@ take: number = 32, * @throws ApiError */ public static async insert( -requestBody?: UserRoleDto, -): Promise { + requestBody?: UserRoleDto, + ): Promise { const result = await __request({ method: 'POST', path: `/api/admin/user/role`, @@ -53,8 +53,8 @@ requestBody?: UserRoleDto, * @throws ApiError */ public static async get( -id: number, -): Promise { + id: number, + ): Promise { const result = await __request({ method: 'GET', path: `/api/admin/user/role/${id}`, @@ -70,9 +70,9 @@ id: number, * @throws ApiError */ public static async put( -id: number, -requestBody?: UserRoleDto, -): Promise { + id: number, + requestBody?: UserRoleDto, + ): Promise { const result = await __request({ method: 'PUT', path: `/api/admin/user/role/${id}`, @@ -88,8 +88,8 @@ requestBody?: UserRoleDto, * @throws ApiError */ public static async delete( -id: number, -): Promise { + id: number, + ): Promise { const result = await __request({ method: 'DELETE', path: `/api/admin/user/role/${id}`, diff --git a/src/services/api/services/AdminUserService.ts b/src/services/api/services/AdminUserService.ts index ec213c0..7f4e2bb 100644 --- a/src/services/api/services/AdminUserService.ts +++ b/src/services/api/services/AdminUserService.ts @@ -15,9 +15,9 @@ export class AdminUserService { * @throws ApiError */ public static async getPage( -skip: number, -take: number = 32, -): Promise { + skip: number, + take: number = 32, + ): Promise { const result = await __request({ method: 'GET', path: `/api/admin/user`, @@ -36,8 +36,8 @@ take: number = 32, * @throws ApiError */ public static async insert( -requestBody?: UserDto, -): Promise { + requestBody?: UserDto, + ): Promise { const result = await __request({ method: 'POST', path: `/api/admin/user`, @@ -53,8 +53,8 @@ requestBody?: UserDto, * @throws ApiError */ public static async get( -id: number, -): Promise { + id: number, + ): Promise { const result = await __request({ method: 'GET', path: `/api/admin/user/${id}`, @@ -70,9 +70,9 @@ id: number, * @throws ApiError */ public static async put( -id: number, -requestBody?: UserDto, -): Promise { + id: number, + requestBody?: UserDto, + ): Promise { const result = await __request({ method: 'PUT', path: `/api/admin/user/${id}`, @@ -88,8 +88,8 @@ requestBody?: UserDto, * @throws ApiError */ public static async delete( -id: number, -): Promise { + id: number, + ): Promise { const result = await __request({ method: 'DELETE', path: `/api/admin/user/${id}`, diff --git a/src/services/api/services/AdminWellService.ts b/src/services/api/services/AdminWellService.ts index 361cbaf..6c4a54d 100644 --- a/src/services/api/services/AdminWellService.ts +++ b/src/services/api/services/AdminWellService.ts @@ -15,9 +15,9 @@ export class AdminWellService { * @throws ApiError */ public static async getPage( -skip: number, -take: number = 32, -): Promise { + skip: number, + take: number = 32, + ): Promise { const result = await __request({ method: 'GET', path: `/api/admin/well`, @@ -36,8 +36,8 @@ take: number = 32, * @throws ApiError */ public static async insert( -requestBody?: WellDto, -): Promise { + requestBody?: WellDto, + ): Promise { const result = await __request({ method: 'POST', path: `/api/admin/well`, @@ -53,8 +53,8 @@ requestBody?: WellDto, * @throws ApiError */ public static async get( -id: number, -): Promise { + id: number, + ): Promise { const result = await __request({ method: 'GET', path: `/api/admin/well/${id}`, @@ -70,9 +70,9 @@ id: number, * @throws ApiError */ public static async put( -id: number, -requestBody?: WellDto, -): Promise { + id: number, + requestBody?: WellDto, + ): Promise { const result = await __request({ method: 'PUT', path: `/api/admin/well/${id}`, @@ -88,8 +88,8 @@ requestBody?: WellDto, * @throws ApiError */ public static async delete( -id: number, -): Promise { + id: number, + ): Promise { const result = await __request({ method: 'DELETE', path: `/api/admin/well/${id}`, diff --git a/src/services/api/services/AuthService.ts b/src/services/api/services/AuthService.ts index b42a63b..8a58e6a 100644 --- a/src/services/api/services/AuthService.ts +++ b/src/services/api/services/AuthService.ts @@ -10,13 +10,13 @@ export class AuthService { /** * Аутентификация пользователя - * @param requestBody + * @param requestBody * @returns UserTokenDto новый токен * @throws ApiError */ public static async login( -requestBody?: AuthDto, -): Promise { + requestBody?: AuthDto, + ): Promise { const result = await __request({ method: 'POST', path: `/auth/login`, @@ -48,8 +48,8 @@ requestBody?: AuthDto, * @throws ApiError */ public static async register( -requestBody?: UserDto, -): Promise { + requestBody?: UserDto, + ): Promise { const result = await __request({ method: 'POST', path: `/auth`, @@ -60,15 +60,15 @@ requestBody?: UserDto, /** * Смена пароля пользователя. Доступна пользователю и администратору - * @param idUser - * @param requestBody + * @param idUser + * @param requestBody * @returns any Success * @throws ApiError */ public static async changePassword( -idUser: number, -requestBody?: string, -): Promise { + idUser: number, + requestBody?: string, + ): Promise { const result = await __request({ method: 'PUT', path: `/auth/${idUser}/ChangePassword`, diff --git a/src/services/api/services/ClusterService.ts b/src/services/api/services/ClusterService.ts index 5c6dada..6a2ea4b 100644 --- a/src/services/api/services/ClusterService.ts +++ b/src/services/api/services/ClusterService.ts @@ -22,13 +22,13 @@ export class ClusterService { /** * Получение доступных пользователю скважин - * @param idCluster + * @param idCluster * @returns WellDto Success * @throws ApiError */ public static async getWells( -idCluster: number, -): Promise> { + idCluster: number, + ): Promise> { const result = await __request({ method: 'GET', path: `/api/cluster/${idCluster}`, diff --git a/src/services/api/services/DepositService.ts b/src/services/api/services/DepositService.ts index 906f947..2bfdce1 100644 --- a/src/services/api/services/DepositService.ts +++ b/src/services/api/services/DepositService.ts @@ -35,13 +35,13 @@ export class DepositService { /** * Получает список доступных пользователю кустов месторождения - * @param depositId + * @param depositId * @returns ClusterDto Success * @throws ApiError */ public static async getClusters( -depositId: number, -): Promise> { + depositId: number, + ): Promise> { const result = await __request({ method: 'GET', path: `/api/deposit/${depositId}`, diff --git a/src/services/api/services/DrillFlowChartService.ts b/src/services/api/services/DrillFlowChartService.ts index eb37d76..13da462 100644 --- a/src/services/api/services/DrillFlowChartService.ts +++ b/src/services/api/services/DrillFlowChartService.ts @@ -14,9 +14,9 @@ export class DrillFlowChartService { * @throws ApiError */ public static async get( -idWell: number, -updateFrom?: string, -): Promise> { + idWell: number, + updateFrom?: string, + ): Promise> { const result = await __request({ method: 'GET', path: `/api/well/${idWell}/drillFlowChart`, @@ -35,9 +35,9 @@ updateFrom?: string, * @throws ApiError */ public static async insert( -idWell: number, -requestBody?: DrillFlowChartDto, -): Promise { + idWell: number, + requestBody?: DrillFlowChartDto, + ): Promise { const result = await __request({ method: 'POST', path: `/api/well/${idWell}/drillFlowChart`, @@ -54,9 +54,9 @@ requestBody?: DrillFlowChartDto, * @throws ApiError */ public static async edit( -idWell: number, -requestBody?: DrillFlowChartDto, -): Promise { + idWell: number, + requestBody?: DrillFlowChartDto, + ): Promise { const result = await __request({ method: 'PUT', path: `/api/well/${idWell}/drillFlowChart`, @@ -73,9 +73,9 @@ requestBody?: DrillFlowChartDto, * @throws ApiError */ public static async delete( -idWell: number, -drillFlowChartParamsId?: number, -): Promise { + idWell: number, + drillFlowChartParamsId?: number, + ): Promise { const result = await __request({ method: 'DELETE', path: `/api/well/${idWell}/drillFlowChart`, @@ -94,9 +94,9 @@ drillFlowChartParamsId?: number, * @throws ApiError */ public static async getByTelemetry( -uid: string, -updateFrom?: string, -): Promise> { + uid: string, + updateFrom?: string, + ): Promise> { const result = await __request({ method: 'GET', path: `/api/telemetry/${uid}/drillFlowChart`, @@ -115,9 +115,9 @@ updateFrom?: string, * @throws ApiError */ public static async insertRange( -idWell: number, -requestBody?: Array, -): Promise { + idWell: number, + requestBody?: Array, + ): Promise { const result = await __request({ method: 'POST', path: `/api/well/${idWell}/drillFlowChart/range`, diff --git a/src/services/api/services/DrillParamsService.ts b/src/services/api/services/DrillParamsService.ts index e789268..483dfd3 100644 --- a/src/services/api/services/DrillParamsService.ts +++ b/src/services/api/services/DrillParamsService.ts @@ -15,10 +15,10 @@ export class DrillParamsService { * @throws ApiError */ public static async getDefault( -idWell: number, -startDepth?: number, -endDepth?: number, -): Promise { + idWell: number, + startDepth?: number, + endDepth?: number, + ): Promise { const result = await __request({ method: 'GET', path: `/api/well/${idWell}/drillParams/autoParams`, @@ -37,8 +37,8 @@ endDepth?: number, * @throws ApiError */ public static async getAll( -idWell: number, -): Promise> { + idWell: number, + ): Promise> { const result = await __request({ method: 'GET', path: `/api/well/${idWell}/drillParams`, @@ -54,9 +54,9 @@ idWell: number, * @throws ApiError */ public static async insert( -idWell: number, -requestBody?: DrillParamsDto, -): Promise { + idWell: number, + requestBody?: DrillParamsDto, + ): Promise { const result = await __request({ method: 'POST', path: `/api/well/${idWell}/drillParams`, @@ -74,10 +74,10 @@ requestBody?: DrillParamsDto, * @throws ApiError */ public static async update( -idWell: number, -dtoId?: number, -requestBody?: DrillParamsDto, -): Promise { + idWell: number, + dtoId?: number, + requestBody?: DrillParamsDto, + ): Promise { const result = await __request({ method: 'PUT', path: `/api/well/${idWell}/drillParams`, @@ -97,9 +97,9 @@ requestBody?: DrillParamsDto, * @throws ApiError */ public static async delete( -idWell: number, -drillParamsId?: number, -): Promise { + idWell: number, + drillParamsId?: number, + ): Promise { const result = await __request({ method: 'DELETE', path: `/api/well/${idWell}/drillParams`, @@ -118,9 +118,9 @@ drillParamsId?: number, * @throws ApiError */ public static async insertRange( -idWell: number, -requestBody?: Array, -): Promise { + idWell: number, + requestBody?: Array, + ): Promise { const result = await __request({ method: 'POST', path: `/api/well/${idWell}/drillParams/range`, @@ -137,9 +137,9 @@ requestBody?: Array, * @throws ApiError */ public static async save( -idWell: number, -requestBody?: Array, -): Promise { + idWell: number, + requestBody?: Array, + ): Promise { const result = await __request({ method: 'POST', path: `/api/well/${idWell}/drillParams/save`, @@ -155,8 +155,8 @@ requestBody?: Array, * @throws ApiError */ public static async getCompositeAll( -idWell: number, -): Promise> { + idWell: number, + ): Promise> { const result = await __request({ method: 'GET', path: `/api/well/${idWell}/drillParams/composite`, diff --git a/src/services/api/services/DrillingProgramService.ts b/src/services/api/services/DrillingProgramService.ts index d42abb3..ae7110b 100644 --- a/src/services/api/services/DrillingProgramService.ts +++ b/src/services/api/services/DrillingProgramService.ts @@ -13,8 +13,8 @@ export class DrillingProgramService { * @throws ApiError */ public static async get( -idWell: number, -): Promise { + idWell: number, + ): Promise { const result = await __request({ method: 'GET', path: `/api/well/${idWell}/drillingProgram`, @@ -29,8 +29,8 @@ idWell: number, * @throws ApiError */ public static async getOrCreateSharedUrl( -idWell: number, -): Promise { + idWell: number, + ): Promise { const result = await __request({ method: 'GET', path: `/api/well/${idWell}/drillingProgram/webUrl`, @@ -46,9 +46,9 @@ idWell: number, * @throws ApiError */ public static async createFileMark( -idWell: number, -requestBody?: FileMarkDto, -): Promise { + idWell: number, + requestBody?: FileMarkDto, + ): Promise { const result = await __request({ method: 'POST', path: `/api/well/${idWell}/drillingProgram/fileMark`, @@ -65,9 +65,9 @@ requestBody?: FileMarkDto, * @throws ApiError */ public static async deleteFileMark( -idWell: number, -idMark?: number, -): Promise { + idWell: number, + idMark?: number, + ): Promise { const result = await __request({ method: 'DELETE', path: `/api/well/${idWell}/drillingProgram/fileMark`, diff --git a/src/services/api/services/FileService.ts b/src/services/api/services/FileService.ts index 95fb68b..ddd7981 100644 --- a/src/services/api/services/FileService.ts +++ b/src/services/api/services/FileService.ts @@ -11,15 +11,15 @@ export class FileService { * Сохраняет переданные файлы и информацию о них * @param idWell id скважины * @param idCategory id категории файла - * @param requestBody + * @param requestBody * @returns number Success * @throws ApiError */ public static async saveFiles( -idWell: number, -idCategory?: number, -requestBody?: any, -): Promise { + idWell: number, + idCategory?: number, + requestBody?: any, + ): Promise { const result = await __request({ method: 'POST', path: `/api/well/${idWell}/files`, @@ -45,15 +45,15 @@ requestBody?: any, * @throws ApiError */ public static async getFilesInfo( -idWell: number, -idCategory: number, -companyName?: string, -fileName?: string, -begin?: string, -end?: string, -skip: number = 0, -take: number = 32, -): Promise { + idWell: number, + idCategory: number, + companyName?: string, + fileName?: string, + begin?: string, + end?: string, + skip: number = 0, + take: number = 32, + ): Promise { const result = await __request({ method: 'GET', path: `/api/well/${idWell}/files`, @@ -78,9 +78,9 @@ take: number = 32, * @throws ApiError */ public static async getFile( -idWell: number, -fileId: number, -): Promise { + idWell: number, + fileId: number, + ): Promise { const result = await __request({ method: 'GET', path: `/api/well/${idWell}/files/${fileId}`, @@ -96,9 +96,9 @@ fileId: number, * @throws ApiError */ public static async delete( -idWell: number, -idFile: number, -): Promise { + idWell: number, + idFile: number, + ): Promise { const result = await __request({ method: 'DELETE', path: `/api/well/${idWell}/files/${idFile}`, @@ -114,9 +114,9 @@ idFile: number, * @throws ApiError */ public static async createFileMark( -idWell: number, -requestBody?: FileMarkDto, -): Promise { + idWell: number, + requestBody?: FileMarkDto, + ): Promise { const result = await __request({ method: 'POST', path: `/api/well/${idWell}/files/fileMark`, @@ -133,9 +133,9 @@ requestBody?: FileMarkDto, * @throws ApiError */ public static async deleteFileMark( -idWell: number, -idMark?: number, -): Promise { + idWell: number, + idMark?: number, + ): Promise { const result = await __request({ method: 'DELETE', path: `/api/well/${idWell}/files/fileMark`, diff --git a/src/services/api/services/MeasureService.ts b/src/services/api/services/MeasureService.ts index b1d012f..6f59d4a 100644 --- a/src/services/api/services/MeasureService.ts +++ b/src/services/api/services/MeasureService.ts @@ -7,13 +7,13 @@ import { request as __request } from '../core/request'; export class MeasureService { /** - * @param idWell + * @param idWell * @returns any Success * @throws ApiError */ public static async getCategories( -idWell: number, -): Promise { + idWell: number, + ): Promise { const result = await __request({ method: 'GET', path: `/api/well/${idWell}/measure/categories`, @@ -22,15 +22,15 @@ idWell: number, } /** - * @param idWell - * @param idCategory + * @param idWell + * @param idCategory * @returns any Success * @throws ApiError */ public static async getLast( -idWell: number, -idCategory: number, -): Promise { + idWell: number, + idCategory: number, + ): Promise { const result = await __request({ method: 'GET', path: `/api/well/${idWell}/measure/last/${idCategory}`, @@ -39,15 +39,15 @@ idCategory: number, } /** - * @param idWell - * @param idCategory + * @param idWell + * @param idCategory * @returns any Success * @throws ApiError */ public static async getHisory( -idWell: number, -idCategory: number, -): Promise { + idWell: number, + idCategory: number, + ): Promise { const result = await __request({ method: 'GET', path: `/api/well/${idWell}/measure/history`, @@ -56,15 +56,15 @@ idCategory: number, } /** - * @param idWell - * @param requestBody + * @param idWell + * @param requestBody * @returns any Success * @throws ApiError */ public static async insert( -idWell: number, -requestBody?: MeasureDto, -): Promise { + idWell: number, + requestBody?: MeasureDto, + ): Promise { const result = await __request({ method: 'POST', path: `/api/well/${idWell}/measure`, @@ -74,15 +74,15 @@ requestBody?: MeasureDto, } /** - * @param idWell - * @param requestBody + * @param idWell + * @param requestBody * @returns any Success * @throws ApiError */ public static async update( -idWell: number, -requestBody?: MeasureDto, -): Promise { + idWell: number, + requestBody?: MeasureDto, + ): Promise { const result = await __request({ method: 'PUT', path: `/api/well/${idWell}/measure`, @@ -92,15 +92,15 @@ requestBody?: MeasureDto, } /** - * @param idWell - * @param idData + * @param idWell + * @param idData * @returns any Success * @throws ApiError */ public static async markAsDelete( -idWell: number, -idData: number, -): Promise { + idWell: number, + idData: number, + ): Promise { const result = await __request({ method: 'DELETE', path: `/api/well/${idWell}/measure/history/${idData}`, diff --git a/src/services/api/services/MessageService.ts b/src/services/api/services/MessageService.ts index 8adaa2f..09b71d5 100644 --- a/src/services/api/services/MessageService.ts +++ b/src/services/api/services/MessageService.ts @@ -20,14 +20,14 @@ export class MessageService { * @throws ApiError */ public static async getMessages( -idWell: number, -skip: number, -take: number = 32, -categoryids?: Array, -begin?: string, -end?: string, -searchString?: string, -): Promise { + idWell: number, + skip: number, + take: number = 32, + categoryids?: Array, + begin?: string, + end?: string, + searchString?: string, + ): Promise { const result = await __request({ method: 'GET', path: `/api/well/${idWell}/message`, @@ -50,8 +50,8 @@ searchString?: string, * @throws ApiError */ public static async getMessagesDateRange( -idWell: number, -): Promise { + idWell: number, + ): Promise { const result = await __request({ method: 'GET', path: `/api/well/${idWell}/message/datesRange`, diff --git a/src/services/api/services/ReportService.ts b/src/services/api/services/ReportService.ts index e540c4c..cc99805 100644 --- a/src/services/api/services/ReportService.ts +++ b/src/services/api/services/ReportService.ts @@ -17,12 +17,12 @@ export class ReportService { * @throws ApiError */ public static async createReport( -idWell: number, -stepSeconds?: number, -format?: number, -begin?: string, -end?: string, -): Promise { + idWell: number, + stepSeconds?: number, + format?: number, + begin?: string, + end?: string, + ): Promise { const result = await __request({ method: 'POST', path: `/api/well/${idWell}/report`, @@ -43,8 +43,8 @@ end?: string, * @throws ApiError */ public static async getAllReportsNamesByWell( -idWell: number, -): Promise> { + idWell: number, + ): Promise> { const result = await __request({ method: 'GET', path: `/api/well/${idWell}/report`, @@ -55,7 +55,7 @@ idWell: number, /** * @deprecated * Возвращает имена отчетов, хранящихся на диске, - * которые подходят под указанные параметры + * которые подходят под указанные параметры * @param idWell id скважины * @param stepSeconds шаг интервала * @param format формат отчета (0-PDF, 1-LAS) @@ -65,12 +65,12 @@ idWell: number, * @throws ApiError */ public static async getSuitableReportsNames( -idWell: number, -stepSeconds?: number, -format?: number, -begin?: string, -end?: string, -): Promise> { + idWell: number, + stepSeconds?: number, + format?: number, + begin?: string, + end?: string, + ): Promise> { const result = await __request({ method: 'GET', path: `/api/well/${idWell}/report/suitableReports`, @@ -95,12 +95,12 @@ end?: string, * @throws ApiError */ public static async getReportSize( -idWell: number, -stepSeconds?: number, -format?: number, -begin?: string, -end?: string, -): Promise { + idWell: number, + stepSeconds?: number, + format?: number, + begin?: string, + end?: string, + ): Promise { const result = await __request({ method: 'GET', path: `/api/well/${idWell}/report/reportSize`, @@ -121,8 +121,8 @@ end?: string, * @throws ApiError */ public static async getReportsDateRange( -idWell: number, -): Promise { + idWell: number, + ): Promise { const result = await __request({ method: 'GET', path: `/api/well/${idWell}/report/datesRange`, diff --git a/src/services/api/services/RequerstTrackerService.ts b/src/services/api/services/RequerstTrackerService.ts new file mode 100644 index 0000000..6ddead7 --- /dev/null +++ b/src/services/api/services/RequerstTrackerService.ts @@ -0,0 +1,98 @@ +/* istanbul ignore file */ +/* tslint:disable */ +/* eslint-disable */ +import { request as __request } from '../core/request'; + +export class RequerstTrackerService { + + /** + * @param take + * @returns any Success + * @throws ApiError + */ + public static async getAll( + take: number = 512, + ): Promise { + const result = await __request({ + method: 'GET', + path: `/api/RequerstTracker`, + query: { + 'take': take, + }, + }); + return result.body; + } + + /** + * @param take + * @returns any Success + * @throws ApiError + */ + public static async getFast( + take: number = 512, + ): Promise { + const result = await __request({ + method: 'GET', + path: `/api/RequerstTracker/fast`, + query: { + 'take': take, + }, + }); + return result.body; + } + + /** + * @param take + * @returns any Success + * @throws ApiError + */ + public static async getSlow( + take: number = 512, + ): Promise { + const result = await __request({ + method: 'GET', + path: `/api/RequerstTracker/slow`, + query: { + 'take': take, + }, + }); + return result.body; + } + + /** + * @param take + * @returns any Success + * @throws ApiError + */ + public static async getError( + take: number = 512, + ): Promise { + const result = await __request({ + method: 'GET', + path: `/api/RequerstTracker/error`, + query: { + 'take': take, + }, + }); + return result.body; + } + + /** + * @param take + * @returns any Success + * @throws ApiError + */ + public static async getUsersStat( + take: number = 512, + ): Promise { + const result = await __request({ + method: 'GET', + path: `/api/RequerstTracker/users`, + query: { + 'take': take, + }, + }); + return result.body; + } + +} \ No newline at end of file diff --git a/src/services/api/services/TelemetryAnalyticsService.ts b/src/services/api/services/TelemetryAnalyticsService.ts index b4f828c..d1d2d9f 100644 --- a/src/services/api/services/TelemetryAnalyticsService.ts +++ b/src/services/api/services/TelemetryAnalyticsService.ts @@ -22,13 +22,13 @@ export class TelemetryAnalyticsService { * @throws ApiError */ public static async getOperationsByWell( -idWell: number, -skip: number, -take: number = 32, -categoryIds?: Array, -begin?: string, -end?: string, -): Promise { + idWell: number, + skip: number, + take: number = 32, + categoryIds?: Array, + begin?: string, + end?: string, + ): Promise { const result = await __request({ method: 'GET', path: `/api/well/${idWell}/telemetryAnalytics/operationsByWell`, @@ -50,8 +50,8 @@ end?: string, * @throws ApiError */ public static async getWellDepthToDay( -idWell: number, -): Promise> { + idWell: number, + ): Promise> { const result = await __request({ method: 'GET', path: `/api/well/${idWell}/telemetryAnalytics/wellDepthToDay`, @@ -68,10 +68,10 @@ idWell: number, * @throws ApiError */ public static async getWellDepthToInterval( -idWell: number, -intervalSeconds?: number, -workBeginSeconds?: number, -): Promise> { + idWell: number, + intervalSeconds?: number, + workBeginSeconds?: number, + ): Promise> { const result = await __request({ method: 'GET', path: `/api/well/${idWell}/telemetryAnalytics/wellDepthToInterval`, @@ -92,10 +92,10 @@ workBeginSeconds?: number, * @throws ApiError */ public static async getOperationsSummary( -idWell: number, -begin?: string, -end?: string, -): Promise> { + idWell: number, + begin?: string, + end?: string, + ): Promise> { const result = await __request({ method: 'GET', path: `/api/well/${idWell}/telemetryAnalytics/operationsSummary`, @@ -116,10 +116,10 @@ end?: string, * @throws ApiError */ public static async getOperationsToInterval( -idWell: number, -intervalSeconds?: number, -workBeginSeconds?: number, -): Promise> { + idWell: number, + intervalSeconds?: number, + workBeginSeconds?: number, + ): Promise> { const result = await __request({ method: 'GET', path: `/api/well/${idWell}/telemetryAnalytics/operationsToInterval`, @@ -138,8 +138,8 @@ workBeginSeconds?: number, * @throws ApiError */ public static async getOperationsDateRange( -idWell: number, -): Promise { + idWell: number, + ): Promise { const result = await __request({ method: 'GET', path: `/api/well/${idWell}/telemetryAnalytics/datesRange`, diff --git a/src/services/api/services/TelemetryDataSaubService.ts b/src/services/api/services/TelemetryDataSaubService.ts index 2aea521..0503708 100644 --- a/src/services/api/services/TelemetryDataSaubService.ts +++ b/src/services/api/services/TelemetryDataSaubService.ts @@ -15,9 +15,9 @@ export class TelemetryDataSaubService { * @throws ApiError */ public static async postData( -uid: string, -requestBody?: Array, -): Promise { + uid: string, + requestBody?: Array, + ): Promise { const result = await __request({ method: 'POST', path: `/api/TelemetryDataSaub/${uid}`, @@ -28,7 +28,7 @@ requestBody?: Array, /** * Возвращает данные САУБ по скважине. - * По умолчанию за последние 10 минут. + * По умолчанию за последние 10 минут. * @param idWell id скважины * @param begin дата начала выборки. По умолчанию: текущее время - intervalSec * @param intervalSec интервал времени даты начала выборки, секунды @@ -37,11 +37,11 @@ requestBody?: Array, * @throws ApiError */ public static async getData( -idWell: number, -begin?: string, -intervalSec: number = 600, -approxPointsCount: number = 1024, -): Promise { + idWell: number, + begin?: string, + intervalSec: number = 600, + approxPointsCount: number = 1024, + ): Promise { const result = await __request({ method: 'GET', path: `/api/TelemetryDataSaub/${idWell}`, @@ -61,8 +61,8 @@ approxPointsCount: number = 1024, * @throws ApiError */ public static async getDataDatesRange( -idWell: number, -): Promise { + idWell: number, + ): Promise { const result = await __request({ method: 'GET', path: `/api/TelemetryDataSaub/${idWell}/datesRange`, diff --git a/src/services/api/services/TelemetryDataSpinService.ts b/src/services/api/services/TelemetryDataSpinService.ts index f3fd261..b01606d 100644 --- a/src/services/api/services/TelemetryDataSpinService.ts +++ b/src/services/api/services/TelemetryDataSpinService.ts @@ -15,9 +15,9 @@ export class TelemetryDataSpinService { * @throws ApiError */ public static async postData( -uid: string, -requestBody?: Array, -): Promise { + uid: string, + requestBody?: Array, + ): Promise { const result = await __request({ method: 'POST', path: `/api/TelemetryDataSpin/${uid}`, @@ -28,7 +28,7 @@ requestBody?: Array, /** * Возвращает данные САУБ по скважине. - * По умолчанию за последние 10 минут. + * По умолчанию за последние 10 минут. * @param idWell id скважины * @param begin дата начала выборки. По умолчанию: текущее время - intervalSec * @param intervalSec интервал времени даты начала выборки, секунды @@ -37,11 +37,11 @@ requestBody?: Array, * @throws ApiError */ public static async getData( -idWell: number, -begin?: string, -intervalSec: number = 600, -approxPointsCount: number = 1024, -): Promise { + idWell: number, + begin?: string, + intervalSec: number = 600, + approxPointsCount: number = 1024, + ): Promise { const result = await __request({ method: 'GET', path: `/api/TelemetryDataSpin/${idWell}`, @@ -61,8 +61,8 @@ approxPointsCount: number = 1024, * @throws ApiError */ public static async getDataDatesRange( -idWell: number, -): Promise { + idWell: number, + ): Promise { const result = await __request({ method: 'GET', path: `/api/TelemetryDataSpin/${idWell}/datesRange`, diff --git a/src/services/api/services/TelemetryService.ts b/src/services/api/services/TelemetryService.ts index 24e426c..c00b1c8 100644 --- a/src/services/api/services/TelemetryService.ts +++ b/src/services/api/services/TelemetryService.ts @@ -17,9 +17,9 @@ export class TelemetryService { * @throws ApiError */ public static async postInfo( -uid: string, -requestBody?: TelemetryInfoDto, -): Promise { + uid: string, + requestBody?: TelemetryInfoDto, + ): Promise { const result = await __request({ method: 'POST', path: `/api/telemetry/${uid}/info`, @@ -36,9 +36,9 @@ requestBody?: TelemetryInfoDto, * @throws ApiError */ public static async postMessages( -uid: string, -requestBody?: Array, -): Promise { + uid: string, + requestBody?: Array, + ): Promise { const result = await __request({ method: 'POST', path: `/api/telemetry/${uid}/message`, @@ -55,9 +55,9 @@ requestBody?: Array, * @throws ApiError */ public static async postEvents( -uid: string, -requestBody?: Array, -): Promise { + uid: string, + requestBody?: Array, + ): Promise { const result = await __request({ method: 'POST', path: `/api/telemetry/${uid}/event`, @@ -74,9 +74,9 @@ requestBody?: Array, * @throws ApiError */ public static async postUsers( -uid: string, -requestBody?: Array, -): Promise { + uid: string, + requestBody?: Array, + ): Promise { const result = await __request({ method: 'POST', path: `/api/telemetry/${uid}/user`, diff --git a/src/services/api/services/WellCompositeService.ts b/src/services/api/services/WellCompositeService.ts index cd54063..05eb0ae 100644 --- a/src/services/api/services/WellCompositeService.ts +++ b/src/services/api/services/WellCompositeService.ts @@ -13,8 +13,8 @@ export class WellCompositeService { * @throws ApiError */ public static async get( -idWell: number, -): Promise> { + idWell: number, + ): Promise> { const result = await __request({ method: 'GET', path: `/api/well/${idWell}/composite`, @@ -30,9 +30,9 @@ idWell: number, * @throws ApiError */ public static async save( -idWell: number, -requestBody?: Array, -): Promise { + idWell: number, + requestBody?: Array, + ): Promise { const result = await __request({ method: 'POST', path: `/api/well/${idWell}/composite`, diff --git a/src/services/api/services/WellOperationService.ts b/src/services/api/services/WellOperationService.ts index 036cc7a..d30efa7 100644 --- a/src/services/api/services/WellOperationService.ts +++ b/src/services/api/services/WellOperationService.ts @@ -10,13 +10,13 @@ export class WellOperationService { /** * Возвращает список имен типов операций на скважине - * @param idWell + * @param idWell * @returns WellOperationCategoryDto Success * @throws ApiError */ public static async getCategories( -idWell: string, -): Promise> { + idWell: string, + ): Promise> { const result = await __request({ method: 'GET', path: `/api/well/${idWell}/wellOperations/categories`, @@ -34,23 +34,23 @@ idWell: string, * @param end фильтр по окончанию операции * @param minDepth фильтр по минимальной глубине скважины * @param maxDepth фильтр по максимальной глубине скважины - * @param skip - * @param take + * @param skip + * @param take * @returns WellOperationDtoPaginationContainer Success * @throws ApiError */ public static async getOperations( -idWell: number, -opertaionType?: number, -sectionTypeIds?: Array, -operationCategoryIds?: Array, -begin?: string, -end?: string, -minDepth: number = -1.7976931348623157e+308, -maxDepth: number = 1.7976931348623157e+308, -skip: number = 0, -take: number = 32, -): Promise { + idWell: number, + opertaionType?: number, + sectionTypeIds?: Array, + operationCategoryIds?: Array, + begin?: string, + end?: string, + minDepth: number = -1.7976931348623157e+308, + maxDepth: number = 1.7976931348623157e+308, + skip: number = 0, + take: number = 32, + ): Promise { const result = await __request({ method: 'GET', path: `/api/well/${idWell}/wellOperations`, @@ -77,9 +77,9 @@ take: number = 32, * @throws ApiError */ public static async insertRange( -idWell: number, -requestBody?: Array, -): Promise> { + idWell: number, + requestBody?: Array, + ): Promise> { const result = await __request({ method: 'POST', path: `/api/well/${idWell}/wellOperations`, @@ -96,9 +96,9 @@ requestBody?: Array, * @throws ApiError */ public static async get( -idWell: number, -idOperation: number, -): Promise { + idWell: number, + idOperation: number, + ): Promise { const result = await __request({ method: 'GET', path: `/api/well/${idWell}/wellOperations/${idOperation}`, @@ -115,10 +115,10 @@ idOperation: number, * @throws ApiError */ public static async update( -idWell: number, -idOperation: number, -requestBody?: WellOperationDto, -): Promise { + idWell: number, + idOperation: number, + requestBody?: WellOperationDto, + ): Promise { const result = await __request({ method: 'PUT', path: `/api/well/${idWell}/wellOperations/${idOperation}`, @@ -135,9 +135,9 @@ requestBody?: WellOperationDto, * @throws ApiError */ public static async delete( -idWell: number, -idOperation: number, -): Promise { + idWell: number, + idOperation: number, + ): Promise { const result = await __request({ method: 'DELETE', path: `/api/well/${idWell}/wellOperations/${idOperation}`, @@ -149,15 +149,15 @@ idOperation: number, * Импортирует операции из excel (xlsx) файла * @param idWell id скважины * @param options Удалить операции перед импортом = 1, если фал валидный - * @param requestBody + * @param requestBody * @returns any Success * @throws ApiError */ public static async import( -idWell: number, -options: number, -requestBody?: any, -): Promise { + idWell: number, + options: number, + requestBody?: any, + ): Promise { const result = await __request({ method: 'POST', path: `/api/well/${idWell}/wellOperations/import/${options}`, @@ -173,8 +173,8 @@ requestBody?: any, * @throws ApiError */ public static async export( -idWell: number, -): Promise { + idWell: number, + ): Promise { const result = await __request({ method: 'GET', path: `/api/well/${idWell}/wellOperations/export`, @@ -184,13 +184,13 @@ idWell: number, /** * Возвращает шаблон файла импорта - * @param idWell + * @param idWell * @returns string Success * @throws ApiError */ public static async getTamplate( -idWell: string, -): Promise { + idWell: string, + ): Promise { const result = await __request({ method: 'GET', path: `/api/well/${idWell}/wellOperations/tamplate`, diff --git a/src/services/api/services/WellOperationStatService.ts b/src/services/api/services/WellOperationStatService.ts index c419643..6019a8d 100644 --- a/src/services/api/services/WellOperationStatService.ts +++ b/src/services/api/services/WellOperationStatService.ts @@ -15,8 +15,8 @@ export class WellOperationStatService { * @throws ApiError */ public static async getStatCluster( -idCluster: number, -): Promise { + idCluster: number, + ): Promise { const result = await __request({ method: 'GET', path: `/api/cluster/${idCluster}/stat`, @@ -31,8 +31,8 @@ idCluster: number, * @throws ApiError */ public static async getWellsStat( -idWells?: Array, -): Promise> { + idWells?: Array, + ): Promise> { const result = await __request({ method: 'GET', path: `/api/wellsStats`, @@ -50,8 +50,8 @@ idWells?: Array, * @throws ApiError */ public static async getStatWell( -idWell: number, -): Promise { + idWell: number, + ): Promise { const result = await __request({ method: 'GET', path: `/api/well/${idWell}/stat`, @@ -61,13 +61,13 @@ idWell: number, /** * Получает данные для графика глубина-днь - * @param idWell + * @param idWell * @returns WellOperationDtoPlanFactPredictBase Success * @throws ApiError */ public static async getTvd( -idWell: number, -): Promise> { + idWell: number, + ): Promise> { const result = await __request({ method: 'GET', path: `/api/well/${idWell}/tvd`, diff --git a/src/services/api/services/WellService.ts b/src/services/api/services/WellService.ts index c46ed7c..d71b14c 100644 --- a/src/services/api/services/WellService.ts +++ b/src/services/api/services/WellService.ts @@ -24,15 +24,15 @@ export class WellService { * Редактирует указанные поля скважины * @param idWell Id скважины * @param requestBody Объект параметров скважины. - * IdWellType: 1 - Наклонно-направленная, 2 - Горизонтальная. - * State: 0 - Неизвестно, 1 - В работе, 2 - Завершена. + * IdWellType: 1 - Наклонно-направленная, 2 - Горизонтальная. + * State: 0 - Неизвестно, 1 - В работе, 2 - Завершена. * @returns number Success * @throws ApiError */ public static async updateWell( -idWell?: number, -requestBody?: WellParamsDto, -): Promise { + idWell?: number, + requestBody?: WellParamsDto, + ): Promise { const result = await __request({ method: 'PUT', path: `/api/well`, @@ -51,8 +51,8 @@ requestBody?: WellParamsDto, * @throws ApiError */ public static async get( -idWell?: number, -): Promise { + idWell?: number, + ): Promise { const result = await __request({ method: 'GET', path: `/api/well/getWell`, From 8632b73c646754bb4b2fd2ed55d5c9b904ddbff1 Mon Sep 17 00:00:00 2001 From: KharchenkoVladimir Date: Mon, 15 Nov 2021 15:18:07 +0500 Subject: [PATCH 6/6] Fixed Chart creation error in ChartTimeBase.tsx --- src/components/charts/ChartTimeBase.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/charts/ChartTimeBase.tsx b/src/components/charts/ChartTimeBase.tsx index 7bd701e..783aa77 100644 --- a/src/components/charts/ChartTimeBase.tsx +++ b/src/components/charts/ChartTimeBase.tsx @@ -201,7 +201,7 @@ export const ChartTimeBase: React.FC = ({options, dataParams let thisOptions = {} Object.assign(thisOptions, defaultOptions, options) - let newChart = new Chart(chartRef.current, { + let newChart = new Chart(chartRef.current ?? "", { type: 'line', plugins: [ChartDataLabels], options: thisOptions,