From 4355930277d1bc6f094fdc353531c24c2c70c6ae Mon Sep 17 00:00:00 2001 From: KharchenkoVV Date: Mon, 26 Jul 2021 11:13:17 +0500 Subject: [PATCH] =?UTF-8?q?=D0=9D=D0=BE=D0=B2=D1=8B=D0=B5=20Dto=20=D0=B4?= =?UTF-8?q?=D0=BB=D1=8F=20=D0=BD=D0=BE=D0=B2=D0=BE=D0=B3=D0=BE=20=D1=84?= =?UTF-8?q?=D1=83=D0=BD=D0=BA=D1=86=D0=B8=D0=BE=D0=BD=D0=B0=D0=BB=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/services/api/models/ClusterDto.ts | 3 +++ src/services/api/models/ClusterStatDto.ts | 2 ++ src/services/api/models/DepositDto.ts | 5 ++++- src/services/api/models/FilePropertiesDto.ts | 11 +++++++++++ .../models/FilePropertiesDtoPaginationContainer.ts | 12 ++++++++++++ src/services/api/models/WellDto.ts | 1 - src/services/api/models/WellStatDto.ts | 1 - src/services/api/services/AnalyticsService.ts | 10 +++++----- 8 files changed, 37 insertions(+), 8 deletions(-) create mode 100644 src/services/api/models/FilePropertiesDto.ts create mode 100644 src/services/api/models/FilePropertiesDtoPaginationContainer.ts diff --git a/src/services/api/models/ClusterDto.ts b/src/services/api/models/ClusterDto.ts index 82b801d..ec20834 100644 --- a/src/services/api/models/ClusterDto.ts +++ b/src/services/api/models/ClusterDto.ts @@ -2,10 +2,13 @@ /* tslint:disable */ /* eslint-disable */ +import type { WellDto } from './WellDto'; + export type ClusterDto = { id?: number; caption?: string | null; description?: string | null; latitude?: number | null; longitude?: number | null; + wells?: Array | null; } \ No newline at end of file diff --git a/src/services/api/models/ClusterStatDto.ts b/src/services/api/models/ClusterStatDto.ts index dc711bb..911a264 100644 --- a/src/services/api/models/ClusterStatDto.ts +++ b/src/services/api/models/ClusterStatDto.ts @@ -2,6 +2,7 @@ /* tslint:disable */ /* eslint-disable */ +import type { WellDto } from './WellDto'; import type { WellStatDto } from './WellStatDto'; export type ClusterStatDto = { @@ -10,5 +11,6 @@ export type ClusterStatDto = { description?: string | null; latitude?: number | null; longitude?: number | null; + wells?: Array | null; wellsStat?: Array | null; } \ No newline at end of file diff --git a/src/services/api/models/DepositDto.ts b/src/services/api/models/DepositDto.ts index 0cbaeec..c142448 100644 --- a/src/services/api/models/DepositDto.ts +++ b/src/services/api/models/DepositDto.ts @@ -2,10 +2,13 @@ /* tslint:disable */ /* eslint-disable */ +import type { ClusterDto } from './ClusterDto'; + export type DepositDto = { id?: number; - name?: string | null; + caption?: string | null; description?: string | null; latitude?: number | null; longitude?: number | null; + clusters?: Array | null; } \ No newline at end of file diff --git a/src/services/api/models/FilePropertiesDto.ts b/src/services/api/models/FilePropertiesDto.ts new file mode 100644 index 0000000..59ed185 --- /dev/null +++ b/src/services/api/models/FilePropertiesDto.ts @@ -0,0 +1,11 @@ +/* istanbul ignore file */ +/* tslint:disable */ +/* eslint-disable */ + +export type FilePropertiesDto = { + id?: number; + name?: string | null; + idCategory?: number; + uploadDate?: string; + userName?: string | null; +} \ No newline at end of file diff --git a/src/services/api/models/FilePropertiesDtoPaginationContainer.ts b/src/services/api/models/FilePropertiesDtoPaginationContainer.ts new file mode 100644 index 0000000..b2226ef --- /dev/null +++ b/src/services/api/models/FilePropertiesDtoPaginationContainer.ts @@ -0,0 +1,12 @@ +/* istanbul ignore file */ +/* tslint:disable */ +/* eslint-disable */ + +import type { FilePropertiesDto } from './FilePropertiesDto'; + +export type FilePropertiesDtoPaginationContainer = { + skip?: number; + take?: number; + count?: number; + items?: Array | null; +} \ No newline at end of file diff --git a/src/services/api/models/WellDto.ts b/src/services/api/models/WellDto.ts index e33d86b..d681ec5 100644 --- a/src/services/api/models/WellDto.ts +++ b/src/services/api/models/WellDto.ts @@ -7,7 +7,6 @@ export type WellDto = { cluster?: string | null; deposit?: string | null; id?: number; - lastData?: any; latitude?: number | null; longitude?: number | null; wellType?: string | null; diff --git a/src/services/api/models/WellStatDto.ts b/src/services/api/models/WellStatDto.ts index 18176e6..7293b43 100644 --- a/src/services/api/models/WellStatDto.ts +++ b/src/services/api/models/WellStatDto.ts @@ -10,7 +10,6 @@ export type WellStatDto = { cluster?: string | null; deposit?: string | null; id?: number; - lastData?: any; latitude?: number | null; longitude?: number | null; wellType?: string | null; diff --git a/src/services/api/services/AnalyticsService.ts b/src/services/api/services/AnalyticsService.ts index a3913d0..8c52822 100644 --- a/src/services/api/services/AnalyticsService.ts +++ b/src/services/api/services/AnalyticsService.ts @@ -14,9 +14,9 @@ export class AnalyticsService { * @param wellId id скважины * @param skip для пагинации кол-во записей пропустить * @param take для пагинации кол-во записей - * @param categoryids - * @param begin - * @param end + * @param categoryIds список категорий + * @param begin дата начала + * @param end окончание * @returns OperationDtoPaginationContainer Success * @throws ApiError */ @@ -24,7 +24,7 @@ export class AnalyticsService { wellId: number, skip: number, take: number = 32, -categoryids?: Array, +categoryIds?: Array, begin?: string, end?: string, ): Promise { @@ -34,7 +34,7 @@ end?: string, query: { 'skip': skip, 'take': take, - 'categoryids': categoryids, + 'categoryIds': categoryIds, 'begin': begin, 'end': end, },