API updated

src/services/api/index.ts

@@ -9,6 +9,7 @@ export type { ClusterDto } from './models/ClusterDto';
 export type { CompanyDto } from './models/CompanyDto';
 export type { DatesRangeDto } from './models/DatesRangeDto';
 export type { DepositDto } from './models/DepositDto';
+export type { DrillParamsDto } from './models/DrillParamsDto';
 export type { EventDto } from './models/EventDto';
 export type { FileInfoDto } from './models/FileInfoDto';
 export type { FileInfoDtoPaginationContainer } from './models/FileInfoDtoPaginationContainer';
@@ -49,9 +50,9 @@ export { AdminUserService } from './services/AdminUserService';
 export { AdminWellService } from './services/AdminWellService';
 export { AuthService } from './services/AuthService';
 export { ClusterService } from './services/ClusterService';
-export { DataService } from './services/DataService';
 export { DepositService } from './services/DepositService';
 export { DrillingProgramService } from './services/DrillingProgramService';
+export { DrillParamsService } from './services/DrillParamsService';
 export { FileService } from './services/FileService';
 export { MeasureService } from './services/MeasureService';
 export { MessageService } from './services/MessageService';

src/services/api/models/DrillParamsDto.ts

@@ -0,0 +1,26 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+export type DrillParamsDto = {
+    id?: number;
+    idWell?: number;
+    wellSectionTypeName?: string | null;
+    depthStart?: number;
+    depthEnd?: number;
+    axialLoadMin?: number;
+    axialLoadAvg?: number;
+    axialLoadMax?: number;
+    pressureMin?: number;
+    pressureAvg?: number;
+    pressureMax?: number;
+    topDriveTorqueMin?: number;
+    topDriveTorqueAvg?: number;
+    topDriveTorqueMax?: number;
+    topDriveSpeedMin?: number;
+    topDriveSpeedAvg?: number;
+    topDriveSpeedMax?: number;
+    flowMin?: number;
+    flowAvg?: number;
+    flowMax?: number;
+}

src/services/api/models/MessageDto.ts

@@ -6,6 +6,7 @@ export type MessageDto = {
     id?: number;
     date?: string;
     categoryId?: number;
+    wellDepth?: number;
     user?: string | null;
     message?: string | null;
 }

src/services/api/models/WellOperationDto.ts

@@ -11,8 +11,9 @@ export type WellOperationDto = {
     categoryName?: string | null;
     categoryInfo?: string | null;
     idType?: number;
-    wellDepth?: number;
+    depthStart?: number;
-    startDate?: string;
+    depthEnd?: number;
+    dateStart?: string;
     durationHours?: number;
     comment?: string | null;
 }

src/services/api/services/AdminClusterService.ts

@@ -14,9 +14,9 @@ export class AdminClusterService {
      * @throws ApiError
      */
     public static async getPage(
-skip: number,
+        skip: number,
-take: number = 32,
+        take: number = 32,
-): Promise<any> {
+    ): Promise<any> {
         const result = await __request({
             method: 'GET',
             path: `/api/admin/cluster`,
@@ -35,8 +35,8 @@ take: number = 32,
      * @throws ApiError
      */
     public static async insert(
-requestBody?: ClusterDto,
+        requestBody?: ClusterDto,
-): Promise<any> {
+    ): Promise<any> {
         const result = await __request({
             method: 'POST',
             path: `/api/admin/cluster`,
@@ -52,8 +52,8 @@ requestBody?: ClusterDto,
      * @throws ApiError
      */
     public static async get(
-id: number,
+        id: number,
-): Promise<any> {
+    ): Promise<any> {
         const result = await __request({
             method: 'GET',
             path: `/api/admin/cluster/${id}`,
@@ -69,9 +69,9 @@ id: number,
      * @throws ApiError
      */
     public static async put(
-id: number,
+        id: number,
-requestBody?: ClusterDto,
+        requestBody?: ClusterDto,
-): Promise<any> {
+    ): Promise<any> {
         const result = await __request({
             method: 'PUT',
             path: `/api/admin/cluster/${id}`,
@@ -87,8 +87,8 @@ requestBody?: ClusterDto,
      * @throws ApiError
      */
     public static async delete(
-id: number,
+        id: number,
-): Promise<any> {
+    ): Promise<any> {
         const result = await __request({
             method: 'DELETE',
             path: `/api/admin/cluster/${id}`,

src/services/api/services/AdminCompanyService.ts

@@ -14,9 +14,9 @@ export class AdminCompanyService {
      * @throws ApiError
      */
     public static async getPage(
-skip: number,
+        skip: number,
-take: number = 32,
+        take: number = 32,
-): Promise<any> {
+    ): Promise<any> {
         const result = await __request({
             method: 'GET',
             path: `/api/admin/company`,
@@ -35,8 +35,8 @@ take: number = 32,
      * @throws ApiError
      */
     public static async insert(
-requestBody?: CompanyDto,
+        requestBody?: CompanyDto,
-): Promise<any> {
+    ): Promise<any> {
         const result = await __request({
             method: 'POST',
             path: `/api/admin/company`,
@@ -52,8 +52,8 @@ requestBody?: CompanyDto,
      * @throws ApiError
      */
     public static async get(
-id: number,
+        id: number,
-): Promise<any> {
+    ): Promise<any> {
         const result = await __request({
             method: 'GET',
             path: `/api/admin/company/${id}`,
@@ -69,9 +69,9 @@ id: number,
      * @throws ApiError
      */
     public static async put(
-id: number,
+        id: number,
-requestBody?: CompanyDto,
+        requestBody?: CompanyDto,
-): Promise<any> {
+    ): Promise<any> {
         const result = await __request({
             method: 'PUT',
             path: `/api/admin/company/${id}`,
@@ -87,8 +87,8 @@ requestBody?: CompanyDto,
      * @throws ApiError
      */
     public static async delete(
-id: number,
+        id: number,
-): Promise<any> {
+    ): Promise<any> {
         const result = await __request({
             method: 'DELETE',
             path: `/api/admin/company/${id}`,

src/services/api/services/AdminDepositService.ts

@@ -14,9 +14,9 @@ export class AdminDepositService {
      * @throws ApiError
      */
     public static async getPage(
-skip: number,
+        skip: number,
-take: number = 32,
+        take: number = 32,
-): Promise<any> {
+    ): Promise<any> {
         const result = await __request({
             method: 'GET',
             path: `/api/admin/deposit`,
@@ -35,8 +35,8 @@ take: number = 32,
      * @throws ApiError
      */
     public static async insert(
-requestBody?: DepositDto,
+        requestBody?: DepositDto,
-): Promise<any> {
+    ): Promise<any> {
         const result = await __request({
             method: 'POST',
             path: `/api/admin/deposit`,
@@ -52,8 +52,8 @@ requestBody?: DepositDto,
      * @throws ApiError
      */
     public static async get(
-id: number,
+        id: number,
-): Promise<any> {
+    ): Promise<any> {
         const result = await __request({
             method: 'GET',
             path: `/api/admin/deposit/${id}`,
@@ -69,9 +69,9 @@ id: number,
      * @throws ApiError
      */
     public static async put(
-id: number,
+        id: number,
-requestBody?: DepositDto,
+        requestBody?: DepositDto,
-): Promise<any> {
+    ): Promise<any> {
         const result = await __request({
             method: 'PUT',
             path: `/api/admin/deposit/${id}`,
@@ -87,8 +87,8 @@ requestBody?: DepositDto,
      * @throws ApiError
      */
     public static async delete(
-id: number,
+        id: number,
-): Promise<any> {
+    ): Promise<any> {
         const result = await __request({
             method: 'DELETE',
             path: `/api/admin/deposit/${id}`,

src/services/api/services/AdminTelemetryService.ts

@@ -6,6 +6,35 @@ import { request as __request } from '../core/request';
 
 export class AdminTelemetryService {
 
+    /**
+     * @returns any Success
+     * @throws ApiError
+     */
+    public static async getRedundentRemoteUids(): Promise<any> {
+        const result = await __request({
+            method: 'GET',
+            path: `/reduntentUids`,
+        });
+        return result.body;
+    }
+
+    /**
+     * merge telemetries
+     * @param requestBody array of ids
+     * @returns any Success
+     * @throws ApiError
+     */
+    public static async mergeTelemetries(
+        requestBody?: Array<number>,
+    ): Promise<any> {
+        const result = await __request({
+            method: 'POST',
+            path: `/merge`,
+            body: requestBody,
+        });
+        return result.body;
+    }
+
     /**
      * Получить страницу с записями в PaginationContainer
      * @param skip пропустить skip записей
@@ -14,9 +43,9 @@ export class AdminTelemetryService {
      * @throws ApiError
      */
     public static async getPage(
-skip: number,
+        skip: number,
-take: number = 32,
+        take: number = 32,
-): Promise<any> {
+    ): Promise<any> {
         const result = await __request({
             method: 'GET',
             path: `/api/admin/telemetry`,
@@ -35,8 +64,8 @@ take: number = 32,
      * @throws ApiError
      */
     public static async insert(
-requestBody?: TelemetryDto,
+        requestBody?: TelemetryDto,
-): Promise<any> {
+    ): Promise<any> {
         const result = await __request({
             method: 'POST',
             path: `/api/admin/telemetry`,
@@ -52,8 +81,8 @@ requestBody?: TelemetryDto,
      * @throws ApiError
      */
     public static async get(
-id: number,
+        id: number,
-): Promise<any> {
+    ): Promise<any> {
         const result = await __request({
             method: 'GET',
             path: `/api/admin/telemetry/${id}`,
@@ -69,9 +98,9 @@ id: number,
      * @throws ApiError
      */
     public static async put(
-id: number,
+        id: number,
-requestBody?: TelemetryDto,
+        requestBody?: TelemetryDto,
-): Promise<any> {
+    ): Promise<any> {
         const result = await __request({
             method: 'PUT',
             path: `/api/admin/telemetry/${id}`,
@@ -87,8 +116,8 @@ requestBody?: TelemetryDto,
      * @throws ApiError
      */
     public static async delete(
-id: number,
+        id: number,
-): Promise<any> {
+    ): Promise<any> {
         const result = await __request({
             method: 'DELETE',
             path: `/api/admin/telemetry/${id}`,

src/services/api/services/AdminUserRoleService.ts

@@ -14,9 +14,9 @@ export class AdminUserRoleService {
      * @throws ApiError
      */
     public static async getPage(
-skip: number,
+        skip: number,
-take: number = 32,
+        take: number = 32,
-): Promise<any> {
+    ): Promise<any> {
         const result = await __request({
             method: 'GET',
             path: `/api/admin/user/role`,
@@ -35,8 +35,8 @@ take: number = 32,
      * @throws ApiError
      */
     public static async insert(
-requestBody?: UserRoleDto,
+        requestBody?: UserRoleDto,
-): Promise<any> {
+    ): Promise<any> {
         const result = await __request({
             method: 'POST',
             path: `/api/admin/user/role`,
@@ -52,8 +52,8 @@ requestBody?: UserRoleDto,
      * @throws ApiError
      */
     public static async get(
-id: number,
+        id: number,
-): Promise<any> {
+    ): Promise<any> {
         const result = await __request({
             method: 'GET',
             path: `/api/admin/user/role/${id}`,
@@ -69,9 +69,9 @@ id: number,
      * @throws ApiError
      */
     public static async put(
-id: number,
+        id: number,
-requestBody?: UserRoleDto,
+        requestBody?: UserRoleDto,
-): Promise<any> {
+    ): Promise<any> {
         const result = await __request({
             method: 'PUT',
             path: `/api/admin/user/role/${id}`,
@@ -87,8 +87,8 @@ requestBody?: UserRoleDto,
      * @throws ApiError
      */
     public static async delete(
-id: number,
+        id: number,
-): Promise<any> {
+    ): Promise<any> {
         const result = await __request({
             method: 'DELETE',
             path: `/api/admin/user/role/${id}`,

src/services/api/services/AdminUserService.ts

@@ -14,9 +14,9 @@ export class AdminUserService {
      * @throws ApiError
      */
     public static async getPage(
-skip: number,
+        skip: number,
-take: number = 32,
+        take: number = 32,
-): Promise<any> {
+    ): Promise<any> {
         const result = await __request({
             method: 'GET',
             path: `/api/admin/user`,
@@ -35,8 +35,8 @@ take: number = 32,
      * @throws ApiError
      */
     public static async insert(
-requestBody?: UserDto,
+        requestBody?: UserDto,
-): Promise<any> {
+    ): Promise<any> {
         const result = await __request({
             method: 'POST',
             path: `/api/admin/user`,
@@ -52,8 +52,8 @@ requestBody?: UserDto,
      * @throws ApiError
      */
     public static async get(
-id: number,
+        id: number,
-): Promise<any> {
+    ): Promise<any> {
         const result = await __request({
             method: 'GET',
             path: `/api/admin/user/${id}`,
@@ -69,9 +69,9 @@ id: number,
      * @throws ApiError
      */
     public static async put(
-id: number,
+        id: number,
-requestBody?: UserDto,
+        requestBody?: UserDto,
-): Promise<any> {
+    ): Promise<any> {
         const result = await __request({
             method: 'PUT',
             path: `/api/admin/user/${id}`,
@@ -87,8 +87,8 @@ requestBody?: UserDto,
      * @throws ApiError
      */
     public static async delete(
-id: number,
+        id: number,
-): Promise<any> {
+    ): Promise<any> {
         const result = await __request({
             method: 'DELETE',
             path: `/api/admin/user/${id}`,

src/services/api/services/AdminWellService.ts

@@ -14,9 +14,9 @@ export class AdminWellService {
      * @throws ApiError
      */
     public static async getPage(
-skip: number,
+        skip: number,
-take: number = 32,
+        take: number = 32,
-): Promise<any> {
+    ): Promise<any> {
         const result = await __request({
             method: 'GET',
             path: `/api/admin/well`,
@@ -35,8 +35,8 @@ take: number = 32,
      * @throws ApiError
      */
     public static async insert(
-requestBody?: WellDto,
+        requestBody?: WellDto,
-): Promise<any> {
+    ): Promise<any> {
         const result = await __request({
             method: 'POST',
             path: `/api/admin/well`,
@@ -52,8 +52,8 @@ requestBody?: WellDto,
      * @throws ApiError
      */
     public static async get(
-id: number,
+        id: number,
-): Promise<any> {
+    ): Promise<any> {
         const result = await __request({
             method: 'GET',
             path: `/api/admin/well/${id}`,
@@ -69,9 +69,9 @@ id: number,
      * @throws ApiError
      */
     public static async put(
-id: number,
+        id: number,
-requestBody?: WellDto,
+        requestBody?: WellDto,
-): Promise<any> {
+    ): Promise<any> {
         const result = await __request({
             method: 'PUT',
             path: `/api/admin/well/${id}`,
@@ -87,8 +87,8 @@ requestBody?: WellDto,
      * @throws ApiError
      */
     public static async delete(
-id: number,
+        id: number,
-): Promise<any> {
+    ): Promise<any> {
         const result = await __request({
             method: 'DELETE',
             path: `/api/admin/well/${id}`,

src/services/api/services/AuthService.ts

@@ -15,8 +15,8 @@ export class AuthService {
      * @throws ApiError
      */
     public static async login(
-requestBody?: AuthDto,
+        requestBody?: AuthDto,
-): Promise<UserTokenDto> {
+    ): Promise<UserTokenDto> {
         const result = await __request({
             method: 'POST',
             path: `/auth/login`,
@@ -48,8 +48,8 @@ requestBody?: AuthDto,
      * @throws ApiError
      */
     public static async register(
-requestBody?: UserDto,
+        requestBody?: UserDto,
-): Promise<any> {
+    ): Promise<any> {
         const result = await __request({
             method: 'POST',
             path: `/auth`,
@@ -66,9 +66,9 @@ requestBody?: UserDto,
      * @throws ApiError
      */
     public static async changePassword(
-idUser: number,
+        idUser: number,
-requestBody?: string,
+        requestBody?: string,
-): Promise<any> {
+    ): Promise<any> {
         const result = await __request({
             method: 'PUT',
             path: `/auth/${idUser}/ChangePassword`,

src/services/api/services/ClusterService.ts

@@ -27,8 +27,8 @@ export class ClusterService {
      * @throws ApiError
      */
     public static async getWells(
-idCluster: number,
+        idCluster: number,
-): Promise<Array<WellDto>> {
+    ): Promise<Array<WellDto>> {
         const result = await __request({
             method: 'GET',
             path: `/api/cluster/${idCluster}`,

src/services/api/services/DataService.ts

@@ -1,54 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-import type { DatesRangeDto } from '../models/DatesRangeDto';
-import type { TelemetryDataSaubDto } from '../models/TelemetryDataSaubDto';
-import { request as __request } from '../core/request';
-
-export class DataService {
-
-    /**
-     * Возвращает данные САУБ по скважине.
- * По умолчанию за последние 10 минут.
-     * @param idWell id скважины
-     * @param begin дата начала выборки. По умолчанию: текущее время - intervalSec
-     * @param intervalSec интервал времени даты начала выборки, секунды
-     * @param approxPointsCount желаемое количество точек. Если в выборке точек будет больше, то выборка будет прорежена.
-     * @returns TelemetryDataSaubDto Success
-     * @throws ApiError
-     */
-    public static async getData(
-idWell: number,
-begin?: string,
-intervalSec: number = 600,
-approxPointsCount: number = 1024,
-): Promise<Array<TelemetryDataSaubDto>> {
-        const result = await __request({
-            method: 'GET',
-            path: `/api/well/${idWell}/data`,
-            query: {
-                'begin': begin,
-                'intervalSec': intervalSec,
-                'approxPointsCount': approxPointsCount,
-            },
-        });
-        return result.body;
-    }
-
-    /**
-     * Возвращает диапазон дат сохраненных данных.
-     * @param idWell id скважины
-     * @returns DatesRangeDto Success
-     * @throws ApiError
-     */
-    public static async getDataDatesRange(
-idWell: number,
-): Promise<DatesRangeDto> {
-        const result = await __request({
-            method: 'GET',
-            path: `/api/well/${idWell}/data/datesRange`,
-        });
-        return result.body;
-    }
-
-}

src/services/api/services/DepositService.ts

@@ -27,8 +27,8 @@ export class DepositService {
      * @throws ApiError
      */
     public static async getClusters(
-depositId: number,
+        depositId: number,
-): Promise<Array<ClusterDto>> {
+    ): Promise<Array<ClusterDto>> {
         const result = await __request({
             method: 'GET',
             path: `/api/deposit/${depositId}`,

src/services/api/services/DrillParamsService.ts

@@ -0,0 +1,56 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+import type { DrillParamsDto } from '../models/DrillParamsDto';
+import { request as __request } from '../core/request';
+
+export class DrillParamsService {
+
+    /**
+     * Возвращает автоматически расчитанные значения для режимов бурения
+     * @param idWell id скважины
+     * @param startDepth Стартовая глубина
+     * @param endDepth Конечная глубина
+     * @returns DrillParamsDto Success
+     * @throws ApiError
+     */
+    public static async getDefaultDrillParams(
+        idWell?: number,
+        startDepth?: number,
+        endDepth?: number,
+    ): Promise<DrillParamsDto> {
+        const result = await __request({
+            method: 'GET',
+            path: `/drillParams/idWell/autoParams`,
+            query: {
+                'idWell': idWell,
+                'startDepth': startDepth,
+                'endDepth': endDepth,
+            },
+        });
+        return result.body;
+    }
+
+    /**
+     * Сохраняет значения для режимов бурения
+     * @param idWell id скважины
+     * @param requestBody Параметры режимов бурений для секции
+     * @returns number Success
+     * @throws ApiError
+     */
+    public static async saveDrillParams(
+        idWell?: number,
+        requestBody?: DrillParamsDto,
+    ): Promise<number> {
+        const result = await __request({
+            method: 'POST',
+            path: `/drillParams/idWell`,
+            query: {
+                'idWell': idWell,
+            },
+            body: requestBody,
+        });
+        return result.body;
+    }
+
+}

src/services/api/services/DrillingProgramService.ts

@@ -11,8 +11,8 @@ export class DrillingProgramService {
      * @throws ApiError
      */
     public static async get(
-idWell: number,
+        idWell: number,
-): Promise<string> {
+    ): Promise<string> {
         const result = await __request({
             method: 'GET',
             path: `/api/well/${idWell}/drillingProgram`,

src/services/api/services/FileService.ts

@@ -16,10 +16,10 @@ export class FileService {
      * @throws ApiError
      */
     public static async saveFiles(
-idWell: number,
+        idWell: number,
-idCategory?: number,
+        idCategory?: number,
-requestBody?: any,
+        requestBody?: any,
-): Promise<number> {
+    ): Promise<number> {
         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,
+        idWell: number,
-idCategory: number,
+        idCategory: number,
-companyName?: string,
+        companyName?: string,
-fileName?: string,
+        fileName?: string,
-begin?: string,
+        begin?: string,
-end?: string,
+        end?: string,
-skip: number = 0,
+        skip: number,
-take: number = 32,
+        take: number = 32,
-): Promise<FileInfoDtoPaginationContainer> {
+    ): Promise<FileInfoDtoPaginationContainer> {
         const result = await __request({
             method: 'GET',
             path: `/api/well/${idWell}/files`,
@@ -78,9 +78,9 @@ take: number = 32,
      * @throws ApiError
      */
     public static async getInfosByCategory(
-idWell: number,
+        idWell: number,
-idCategory: number,
+        idCategory: number,
-): Promise<Array<FileInfoDto>> {
+    ): Promise<Array<FileInfoDto>> {
         const result = await __request({
             method: 'GET',
             path: `/api/well/${idWell}/files/category/${idCategory}`,
@@ -96,9 +96,9 @@ idCategory: number,
      * @throws ApiError
      */
     public static async getFile(
-idWell: number,
+        idWell: number,
-fileId: number,
+        fileId: number,
-): Promise<string> {
+    ): Promise<string> {
         const result = await __request({
             method: 'GET',
             path: `/api/well/${idWell}/files/${fileId}`,
@@ -114,9 +114,9 @@ fileId: number,
      * @throws ApiError
      */
     public static async delete(
-idWell: number,
+        idWell: number,
-idFile: number,
+        idFile: number,
-): Promise<number> {
+    ): Promise<number> {
         const result = await __request({
             method: 'DELETE',
             path: `/api/well/${idWell}/files/${idFile}`,

src/services/api/services/MeasureService.ts

@@ -12,8 +12,8 @@ export class MeasureService {
      * @throws ApiError
      */
     public static async getCategories(
-idWell: number,
+        idWell: number,
-): Promise<any> {
+    ): Promise<any> {
         const result = await __request({
             method: 'GET',
             path: `/api/well/${idWell}/measure/categories`,
@@ -27,8 +27,8 @@ idWell: number,
      * @throws ApiError
      */
     public static async getAllLast(
-idWell: number,
+        idWell: number,
-): Promise<any> {
+    ): Promise<any> {
         const result = await __request({
             method: 'GET',
             path: `/api/well/${idWell}/measure/lastAll`,
@@ -43,9 +43,9 @@ idWell: number,
      * @throws ApiError
      */
     public static async getLast(
-idWell: number,
+        idWell: number,
-idCategory: number,
+        idCategory: number,
-): Promise<any> {
+    ): Promise<any> {
         const result = await __request({
             method: 'GET',
             path: `/api/well/${idWell}/measure/last/${idCategory}`,
@@ -60,12 +60,12 @@ idCategory: number,
      * @throws ApiError
      */
     public static async getHisory(
-idWell: number,
+        idWell: number,
-idCategory: number,
+        idCategory: number,
-): Promise<any> {
+    ): Promise<any> {
         const result = await __request({
             method: 'GET',
-            path: `/api/well/${idWell}/measure/history/${idCategory}`,
+            path: `/api/well/${idWell}/measure/history`,
         });
         return result.body;
     }
@@ -77,9 +77,9 @@ idCategory: number,
      * @throws ApiError
      */
     public static async insert(
-idWell: number,
+        idWell: number,
-requestBody?: MeasureDto,
+        requestBody?: MeasureDto,
-): Promise<any> {
+    ): Promise<any> {
         const result = await __request({
             method: 'POST',
             path: `/api/well/${idWell}/measure`,
@@ -95,9 +95,9 @@ requestBody?: MeasureDto,
      * @throws ApiError
      */
     public static async update(
-idWell: number,
+        idWell: number,
-requestBody?: MeasureDto,
+        requestBody?: MeasureDto,
-): Promise<any> {
+    ): Promise<any> {
         const result = await __request({
             method: 'PUT',
             path: `/api/well/${idWell}/measure`,
@@ -113,9 +113,9 @@ requestBody?: MeasureDto,
      * @throws ApiError
      */
     public static async markAsDelete(
-idWell: number,
+        idWell: number,
-idData: number,
+        idData: number,
-): Promise<any> {
+    ): Promise<any> {
         const result = await __request({
             method: 'DELETE',
             path: `/api/well/${idWell}/measure/history/${idData}`,

src/services/api/services/MessageService.ts

@@ -20,14 +20,14 @@ export class MessageService {
      * @throws ApiError
      */
     public static async getMessages(
-idWell: number,
+        idWell: number,
-skip: number,
+        skip: number,
-take: number = 32,
+        take: number = 32,
-categoryids?: Array<number>,
+        categoryids?: Array<number>,
-begin?: string,
+        begin?: string,
-end?: string,
+        end?: string,
-searchString?: string,
+        searchString?: string,
-): Promise<MessageDtoPaginationContainer> {
+    ): Promise<MessageDtoPaginationContainer> {
         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,
+        idWell: number,
-): Promise<DatesRangeDto> {
+    ): Promise<DatesRangeDto> {
         const result = await __request({
             method: 'GET',
             path: `/api/well/${idWell}/message/datesRange`,

src/services/api/services/ReportService.ts

@@ -17,12 +17,12 @@ export class ReportService {
      * @throws ApiError
      */
     public static async createReport(
-idWell: number,
+        idWell: number,
-stepSeconds?: number,
+        stepSeconds?: number,
-format?: number,
+        format?: number,
-begin?: string,
+        begin?: string,
-end?: string,
+        end?: string,
-): Promise<number> {
+    ): Promise<number> {
         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,
+        idWell: number,
-): Promise<Array<string>> {
+    ): Promise<Array<string>> {
         const result = await __request({
             method: 'GET',
             path: `/api/well/${idWell}/report`,
@@ -65,12 +65,12 @@ idWell: number,
      * @throws ApiError
      */
     public static async getSuitableReportsNames(
-idWell: number,
+        idWell: number,
-stepSeconds?: number,
+        stepSeconds?: number,
-format?: number,
+        format?: number,
-begin?: string,
+        begin?: string,
-end?: string,
+        end?: string,
-): Promise<Array<string>> {
+    ): Promise<Array<string>> {
         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,
+        idWell: number,
-stepSeconds?: number,
+        stepSeconds?: number,
-format?: number,
+        format?: number,
-begin?: string,
+        begin?: string,
-end?: string,
+        end?: string,
-): Promise<string> {
+    ): Promise<string> {
         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,
+        idWell: number,
-): Promise<DatesRangeDto> {
+    ): Promise<DatesRangeDto> {
         const result = await __request({
             method: 'GET',
             path: `/api/well/${idWell}/report/datesRange`,

src/services/api/services/TelemetryAnalyticsService.ts

@@ -22,13 +22,13 @@ export class TelemetryAnalyticsService {
      * @throws ApiError
      */
     public static async getOperationsByWell(
-idWell: number,
+        idWell: number,
-skip: number,
+        skip: number,
-take: number = 32,
+        take: number = 32,
-categoryIds?: Array<number>,
+        categoryIds?: Array<number>,
-begin?: string,
+        begin?: string,
-end?: string,
+        end?: string,
-): Promise<TelemetryOperationDtoPaginationContainer> {
+    ): Promise<TelemetryOperationDtoPaginationContainer> {
         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,
+        idWell: number,
-): Promise<Array<WellDepthToDayDto>> {
+    ): Promise<Array<WellDepthToDayDto>> {
         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,
+        idWell: number,
-intervalSeconds?: number,
+        intervalSeconds?: number,
-workBeginSeconds?: number,
+        workBeginSeconds?: number,
-): Promise<Array<WellDepthToIntervalDto>> {
+    ): Promise<Array<WellDepthToIntervalDto>> {
         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,
+        idWell: number,
-begin?: string,
+        begin?: string,
-end?: string,
+        end?: string,
-): Promise<Array<TelemetryOperationDurationDto>> {
+    ): Promise<Array<TelemetryOperationDurationDto>> {
         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,
+        idWell: number,
-intervalSeconds?: number,
+        intervalSeconds?: number,
-workBeginSeconds?: number,
+        workBeginSeconds?: number,
-): Promise<Array<TelemetryOperationDurationDto>> {
+    ): Promise<Array<TelemetryOperationDurationDto>> {
         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,
+        idWell: number,
-): Promise<DatesRangeDto> {
+    ): Promise<DatesRangeDto> {
         const result = await __request({
             method: 'GET',
             path: `/api/well/${idWell}/telemetryAnalytics/datesRange`,

src/services/api/services/TelemetryDataSaubService.ts

@@ -15,9 +15,9 @@ export class TelemetryDataSaubService {
      * @throws ApiError
      */
     public static async postData(
-uid: string,
+        uid: string,
-requestBody?: Array<TelemetryDataSaubDto>,
+        requestBody?: Array<TelemetryDataSaubDto>,
-): Promise<any> {
+    ): Promise<any> {
         const result = await __request({
             method: 'POST',
             path: `/api/TelemetryDataSaub/${uid}`,
@@ -37,11 +37,11 @@ requestBody?: Array<TelemetryDataSaubDto>,
      * @throws ApiError
      */
     public static async getData(
-idWell: number,
+        idWell: number,
-begin?: string,
+        begin?: string,
-intervalSec: number = 600,
+        intervalSec: number = 600,
-approxPointsCount: number = 1024,
+        approxPointsCount: number = 1024,
-): Promise<any> {
+    ): Promise<any> {
         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,
+        idWell: number,
-): Promise<DatesRangeDto> {
+    ): Promise<DatesRangeDto> {
         const result = await __request({
             method: 'GET',
             path: `/api/TelemetryDataSaub/${idWell}/datesRange`,

src/services/api/services/TelemetryDataSpinService.ts

@@ -15,9 +15,9 @@ export class TelemetryDataSpinService {
      * @throws ApiError
      */
     public static async postData(
-uid: string,
+        uid: string,
-requestBody?: Array<TelemetryDataSpinDto>,
+        requestBody?: Array<TelemetryDataSpinDto>,
-): Promise<any> {
+    ): Promise<any> {
         const result = await __request({
             method: 'POST',
             path: `/api/TelemetryDataSpin/${uid}`,
@@ -37,11 +37,11 @@ requestBody?: Array<TelemetryDataSpinDto>,
      * @throws ApiError
      */
     public static async getData(
-idWell: number,
+        idWell: number,
-begin?: string,
+        begin?: string,
-intervalSec: number = 600,
+        intervalSec: number = 600,
-approxPointsCount: number = 1024,
+        approxPointsCount: number = 1024,
-): Promise<any> {
+    ): Promise<any> {
         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,
+        idWell: number,
-): Promise<DatesRangeDto> {
+    ): Promise<DatesRangeDto> {
         const result = await __request({
             method: 'GET',
             path: `/api/TelemetryDataSpin/${idWell}/datesRange`,

src/services/api/services/TelemetryService.ts

@@ -18,9 +18,9 @@ export class TelemetryService {
      * @throws ApiError
      */
     public static async postInfo(
-uid: string,
+        uid: string,
-requestBody?: TelemetryInfoDto,
+        requestBody?: TelemetryInfoDto,
-): Promise<any> {
+    ): Promise<any> {
         const result = await __request({
             method: 'POST',
             path: `/api/telemetry/${uid}/info`,
@@ -30,6 +30,7 @@ requestBody?: TelemetryInfoDto,
     }
 
     /**
+     * @deprecated
      * Принимает данные от разных систем по скважине
      * @param uid Уникальный идентификатор отправителя
      * @param requestBody Данные
@@ -37,9 +38,9 @@ requestBody?: TelemetryInfoDto,
      * @throws ApiError
      */
     public static async postData(
-uid: string,
+        uid: string,
-requestBody?: Array<TelemetryDataSaubDto>,
+        requestBody?: Array<TelemetryDataSaubDto>,
-): Promise<any> {
+    ): Promise<any> {
         const result = await __request({
             method: 'POST',
             path: `/api/telemetry/${uid}/data`,
@@ -56,9 +57,9 @@ requestBody?: Array<TelemetryDataSaubDto>,
      * @throws ApiError
      */
     public static async postMessages(
-uid: string,
+        uid: string,
-requestBody?: Array<TelemetryMessageDto>,
+        requestBody?: Array<TelemetryMessageDto>,
-): Promise<any> {
+    ): Promise<any> {
         const result = await __request({
             method: 'POST',
             path: `/api/telemetry/${uid}/message`,
@@ -75,9 +76,9 @@ requestBody?: Array<TelemetryMessageDto>,
      * @throws ApiError
      */
     public static async postEvents(
-uid: string,
+        uid: string,
-requestBody?: Array<EventDto>,
+        requestBody?: Array<EventDto>,
-): Promise<any> {
+    ): Promise<any> {
         const result = await __request({
             method: 'POST',
             path: `/api/telemetry/${uid}/event`,
@@ -94,9 +95,9 @@ requestBody?: Array<EventDto>,
      * @throws ApiError
      */
     public static async postUsers(
-uid: string,
+        uid: string,
-requestBody?: Array<TelemetryUserDto>,
+        requestBody?: Array<TelemetryUserDto>,
-): Promise<any> {
+    ): Promise<any> {
         const result = await __request({
             method: 'POST',
             path: `/api/telemetry/${uid}/user`,

src/services/api/services/WellOperationService.ts

@@ -15,8 +15,8 @@ export class WellOperationService {
      * @throws ApiError
      */
     public static async getCategories(
-idWell: string,
+        idWell: string,
-): Promise<Array<WellOperationCategoryDto>> {
+    ): Promise<Array<WellOperationCategoryDto>> {
         const result = await __request({
             method: 'GET',
             path: `/api/well/${idWell}/wellOperations/categories`,
@@ -40,17 +40,17 @@ idWell: string,
      * @throws ApiError
      */
     public static async getOperations(
-idWell: number,
+        idWell: number,
-opertaionType?: number,
+        opertaionType?: number,
-sectionTypeIds?: Array<number>,
+        sectionTypeIds?: Array<number>,
-operationCategoryIds?: Array<number>,
+        operationCategoryIds?: Array<number>,
-begin?: string,
+        begin?: string,
-end?: string,
+        end?: string,
-minDepth: number = -1.7976931348623157e+308,
+        minDepth: number = -1.7976931348623157e+308,
-maxDepth: number = 1.7976931348623157e+308,
+        maxDepth: number = 1.7976931348623157e+308,
-skip: number = 0,
+        skip: number,
-take: number = 32,
+        take: number = 32,
-): Promise<WellOperationDtoPaginationContainer> {
+    ): Promise<WellOperationDtoPaginationContainer> {
         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,
+        idWell: number,
-requestBody?: Array<WellOperationDto>,
+        requestBody?: Array<WellOperationDto>,
-): Promise<Array<WellOperationDto>> {
+    ): Promise<Array<WellOperationDto>> {
         const result = await __request({
             method: 'POST',
             path: `/api/well/${idWell}/wellOperations`,
@@ -96,9 +96,9 @@ requestBody?: Array<WellOperationDto>,
      * @throws ApiError
      */
     public static async get(
-idWell: number,
+        idWell: number,
-idOperation: number,
+        idOperation: number,
-): Promise<WellOperationDto> {
+    ): Promise<WellOperationDto> {
         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,
+        idWell: number,
-idOperation: number,
+        idOperation: number,
-requestBody?: WellOperationDto,
+        requestBody?: WellOperationDto,
-): Promise<WellOperationDto> {
+    ): Promise<WellOperationDto> {
         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,
+        idWell: number,
-idOperation: number,
+        idOperation: number,
-): Promise<number> {
+    ): Promise<number> {
         const result = await __request({
             method: 'DELETE',
             path: `/api/well/${idWell}/wellOperations/${idOperation}`,
@@ -145,4 +145,57 @@ idOperation: number,
         return result.body;
     }
 
+    /**
+     * Импортирует операции из excel (xlsx) файла
+     * @param idWell id скважины
+     * @param options Удалить операции перед импортом = 1, если фал валидный
+     * @param requestBody
+     * @returns any Success
+     * @throws ApiError
+     */
+    public static async import(
+        idWell: number,
+        options: number,
+        requestBody?: any,
+    ): Promise<any> {
+        const result = await __request({
+            method: 'POST',
+            path: `/api/well/${idWell}/wellOperations/import/${options}`,
+            body: requestBody,
+        });
+        return result.body;
+    }
+
+    /**
+     * Создает excel файл с операциями по скважине
+     * @param idWell id скважины
+     * @returns string Success
+     * @throws ApiError
+     */
+    public static async export(
+        idWell: number,
+    ): Promise<string> {
+        const result = await __request({
+            method: 'GET',
+            path: `/api/well/${idWell}/wellOperations/export`,
+        });
+        return result.body;
+    }
+
+    /**
+     * Возвращает шаблон файла импорта
+     * @param idWell
+     * @returns string Success
+     * @throws ApiError
+     */
+    public static async getTamplate(
+        idWell: string,
+    ): Promise<string> {
+        const result = await __request({
+            method: 'GET',
+            path: `/api/well/${idWell}/wellOperations/tamplate`,
+        });
+        return result.body;
+    }
+
 }

src/services/api/services/WellOperationStatService.ts

@@ -14,8 +14,8 @@ export class WellOperationStatService {
      * @throws ApiError
      */
     public static async getStatCluster(
-idCluster: number,
+        idCluster: number,
-): Promise<StatClusterDto> {
+    ): Promise<StatClusterDto> {
         const result = await __request({
             method: 'GET',
             path: `/api/cluster/${idCluster}/stat`,
@@ -29,8 +29,8 @@ idCluster: number,
      * @throws ApiError
      */
     public static async getStatWell(
-idWell: number,
+        idWell: number,
-): Promise<StatWellDto> {
+    ): Promise<StatWellDto> {
         const result = await __request({
             method: 'GET',
             path: `/api/well/${idWell}/stat`,
@@ -44,8 +44,8 @@ idWell: number,
      * @throws ApiError
      */
     public static async getTvd(
-idWell: number,
+        idWell: number,
-): Promise<Array<WellOperationDtoPlanFactPredictBase>> {
+    ): Promise<Array<WellOperationDtoPlanFactPredictBase>> {
         const result = await __request({
             method: 'GET',
             path: `/api/well/${idWell}/tvd`,

src/services/api/services/WellService.ts

@@ -2,7 +2,6 @@
 /* tslint:disable */
 /* eslint-disable */
 import type { WellDto } from '../models/WellDto';
-import type { WellOperationDto } from '../models/WellOperationDto';
 import { request as __request } from '../core/request';
 
 export class WellService {
@@ -19,21 +18,6 @@ export class WellService {
         return result.body;
     }
 
-    /**
-     * @param idWell 
-     * @returns WellOperationDto Success
-     * @throws ApiError
-     */
-    public static async getOperations(
-idWell: number,
-): Promise<Array<WellOperationDto>> {
-        const result = await __request({
-            method: 'GET',
-            path: `/api/well/${idWell}/operations`,
-        });
-        return result.body;
-    }
-
     /**
      * @returns WellDto Success
      * @throws ApiError