From 92f95b5fe268bb8daffabb17f276ae64ab066797 Mon Sep 17 00:00:00 2001 From: goodmice Date: Tue, 12 Oct 2021 15:01:07 +0500 Subject: [PATCH] =?UTF-8?q?=D0=A1=D0=B5=D1=80=D0=B2=D0=B8=D1=81=D1=8B=20?= =?UTF-8?q?=D0=BE=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5=D0=BD=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/services/api/models/DrillParamsDto.ts | 6 ++--- .../api/services/AdminTelemetryService.ts | 4 ++-- .../api/services/DrillParamsService.ts | 14 ++++++------ src/services/api/services/FileService.ts | 2 +- .../api/services/WellOperationService.ts | 22 +++++++++---------- 5 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/services/api/models/DrillParamsDto.ts b/src/services/api/models/DrillParamsDto.ts index 8f5289b..24d5751 100644 --- a/src/services/api/models/DrillParamsDto.ts +++ b/src/services/api/models/DrillParamsDto.ts @@ -20,7 +20,7 @@ export type DrillParamsDto = { topDriveSpeedMin?: number; topDriveSpeedAvg?: number; topDriveSpeedMax?: number; - consumptionMin?: number; - consumptionAvg?: number; - consumptionMax?: number; + flowMin?: number; + flowAvg?: number; + flowMax?: number; } diff --git a/src/services/api/services/AdminTelemetryService.ts b/src/services/api/services/AdminTelemetryService.ts index 17a7e23..ce158b8 100644 --- a/src/services/api/services/AdminTelemetryService.ts +++ b/src/services/api/services/AdminTelemetryService.ts @@ -25,8 +25,8 @@ export class AdminTelemetryService { * @throws ApiError */ public static async mergeTelemetries( -requestBody?: Array, -): Promise { + requestBody?: Array, + ): Promise { const result = await __request({ method: 'POST', path: `/merge`, diff --git a/src/services/api/services/DrillParamsService.ts b/src/services/api/services/DrillParamsService.ts index 70247da..4c5266d 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 getDefaultDrillParams( -idWell?: number, -startDepth?: number, -endDepth?: number, -): Promise { + idWell?: number, + startDepth?: number, + endDepth?: number, + ): Promise { const result = await __request({ method: 'GET', path: `/drillParams/idWell/autoParams`, @@ -39,9 +39,9 @@ endDepth?: number, * @throws ApiError */ public static async saveDrillParams( -idWell?: number, -requestBody?: DrillParamsDto, -): Promise { + idWell?: number, + requestBody?: DrillParamsDto, + ): Promise { const result = await __request({ method: 'POST', path: `/drillParams/idWell`, diff --git a/src/services/api/services/FileService.ts b/src/services/api/services/FileService.ts index 8424cf7..125112f 100644 --- a/src/services/api/services/FileService.ts +++ b/src/services/api/services/FileService.ts @@ -51,7 +51,7 @@ export class FileService { fileName?: string, begin?: string, end?: string, - skip: number, + skip: number = 0, take: number = 32, ): Promise { const result = await __request({ diff --git a/src/services/api/services/WellOperationService.ts b/src/services/api/services/WellOperationService.ts index 1f8261b..d30efa7 100644 --- a/src/services/api/services/WellOperationService.ts +++ b/src/services/api/services/WellOperationService.ts @@ -48,7 +48,7 @@ export class WellOperationService { end?: string, minDepth: number = -1.7976931348623157e+308, maxDepth: number = 1.7976931348623157e+308, - skip: number, + skip: number = 0, take: number = 32, ): Promise { const result = await __request({ @@ -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 @@ 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`,