diff --git a/backend/prisma/schema.prisma b/backend/prisma/schema.prisma new file mode 100644 index 0000000..ca40487 --- /dev/null +++ b/backend/prisma/schema.prisma @@ -0,0 +1,51 @@ +datasource db { + provider = "postgresql" + url = env("DATABASE_URL") +} + +generator client { + provider = "prisma-client-js" +} + +enum EquipmentStatus { + Active + Repair + Reserve + WriteOff +} + +model Equipment { + id String @id @default(uuid()) + name String + serialNumber String + dateOfInspection DateTime? + commissionedAt DateTime? + status EquipmentStatus + createdAt DateTime @default(now()) + updatedAt DateTime @updatedAt + + // Relations + statusChanges ChangeEquipmentStatus[] + + @@unique([serialNumber]) + @@index([status]) + @@index([dateOfInspection]) + @@index([commissionedAt]) +} + +model ChangeEquipmentStatus { + equipmentId String + newStatus EquipmentStatus + number String? + date DateTime + responsible String? + createdAt DateTime @default(now()) + updatedAt DateTime @updatedAt + + // Relations + equipment Equipment @relation(fields: [equipmentId], references: [id], onDelete: Cascade) + + @@id([equipmentId, newStatus]) + @@index([date]) + @@index([responsible]) +} diff --git a/backend/src/app.module.ts b/backend/src/app.module.ts new file mode 100644 index 0000000..ecbaa0b --- /dev/null +++ b/backend/src/app.module.ts @@ -0,0 +1,15 @@ +import { Module } from '@nestjs/common'; +import { AuthModule } from './auth/auth.module'; +import { PrismaService } from './prisma/prisma.service'; +import { EquipmentModule } from './equipment/equipment.module'; +import { ChangeEquipmentStatusModule } from './change-equipment-status/change-equipment-status.module'; + +@Module({ + imports: [ + AuthModule, + EquipmentModule, + ChangeEquipmentStatusModule, + ], + providers: [PrismaService], +}) +export class AppModule {} \ No newline at end of file diff --git a/backend/src/change-equipment-status/change-equipment-status.controller.ts b/backend/src/change-equipment-status/change-equipment-status.controller.ts new file mode 100644 index 0000000..ef56cd4 --- /dev/null +++ b/backend/src/change-equipment-status/change-equipment-status.controller.ts @@ -0,0 +1,96 @@ +import { Controller, Get, Post, Body, Patch, Param, Delete, Query, UseGuards } from '@nestjs/common'; +import { ApiBearerAuth, ApiTags, ApiOperation, ApiResponse, ApiParam } from '@nestjs/swagger'; +import { ChangeEquipmentStatusService } from './change-equipment-status.service'; +import { CreateChangeEquipmentStatusDto } from './dto/create-change-equipment-status.dto'; +import { UpdateChangeEquipmentStatusDto } from './dto/update-change-equipment-status.dto'; +import { JwtAuthGuard } from '../auth/jwt-auth.guard'; +import { ChangeEquipmentStatusListRequestDto } from './dto/change-equipment-status-list-request.dto'; +import { ChangeEquipmentStatusListResponseDto } from './dto/change-equipment-status-list-response.dto'; +import { EquipmentStatus } from '@prisma/client'; + +@ApiTags('change-equipment-status') +@ApiBearerAuth() +@UseGuards(JwtAuthGuard) +@Controller('change-equipment-status') +export class ChangeEquipmentStatusController { + constructor(private readonly changeEquipmentStatusService: ChangeEquipmentStatusService) {} + + @Post('page') + @ApiOperation({ summary: 'Постраничный список документов изменения статуса с фильтрацией' }) + @ApiResponse({ status: 200, type: ChangeEquipmentStatusListResponseDto }) + async listChangeEquipmentStatus(@Body() dto: ChangeEquipmentStatusListRequestDto) { + const { content, total } = await this.changeEquipmentStatusService.findManyWithPagination({ + skip: dto.page?.skip, + take: dto.page?.take, + where: dto.filter?.where, + orderBy: dto.filter?.orderBy, + }); + + return { + content, + pageInfo: { + skip: dto.page?.skip || 0, + take: dto.page?.take || 25, + total, + }, + }; + } + + @Get(':equipmentId/:newStatus') + @ApiOperation({ summary: 'Получить документ изменения статуса по ключу' }) + @ApiParam({ name: 'equipmentId', description: 'Оборудование' }) + @ApiParam({ + name: 'newStatus', + enum: EquipmentStatus, + enumName: 'EquipmentStatus', + description: 'Новый статус' + }) + async findOne( + @Param('equipmentId') equipmentId: string, + @Param('newStatus') newStatus: EquipmentStatus, + ) { + return this.changeEquipmentStatusService.findOne({ equipmentId_newStatus: { equipmentId, newStatus } }); + } + + @Post() + @ApiOperation({ summary: 'Создать документ изменения статуса' }) + async create(@Body() dto: CreateChangeEquipmentStatusDto) { + return this.changeEquipmentStatusService.create(dto); + } + + @Patch(':equipmentId/:newStatus') + @ApiOperation({ summary: 'Обновить документ изменения статуса' }) + @ApiParam({ name: 'equipmentId', description: 'Оборудование' }) + @ApiParam({ + name: 'newStatus', + enum: EquipmentStatus, + enumName: 'EquipmentStatus', + description: 'Новый статус' + }) + async update( + @Param('equipmentId') equipmentId: string, + @Param('newStatus') newStatus: EquipmentStatus, + @Body() dto: UpdateChangeEquipmentStatusDto, + ) { + return this.changeEquipmentStatusService.update({ + where: { equipmentId_newStatus: { equipmentId, newStatus } }, + data: dto, + }); + } + + @Delete(':equipmentId/:newStatus') + @ApiOperation({ summary: 'Удалить документ изменения статуса' }) + @ApiParam({ name: 'equipmentId', description: 'Оборудование' }) + @ApiParam({ + name: 'newStatus', + enum: EquipmentStatus, + enumName: 'EquipmentStatus', + description: 'Новый статус' + }) + async remove( + @Param('equipmentId') equipmentId: string, + @Param('newStatus') newStatus: EquipmentStatus, + ) { + return this.changeEquipmentStatusService.remove({ equipmentId_newStatus: { equipmentId, newStatus } }); + } +} \ No newline at end of file diff --git a/backend/src/change-equipment-status/change-equipment-status.module.ts b/backend/src/change-equipment-status/change-equipment-status.module.ts new file mode 100644 index 0000000..27bf136 --- /dev/null +++ b/backend/src/change-equipment-status/change-equipment-status.module.ts @@ -0,0 +1,10 @@ +import { Module } from '@nestjs/common'; +import { ChangeEquipmentStatusService } from './change-equipment-status.service'; +import { ChangeEquipmentStatusController } from './change-equipment-status.controller'; +import { PrismaService } from '../prisma/prisma.service'; + +@Module({ + controllers: [ChangeEquipmentStatusController], + providers: [ChangeEquipmentStatusService, PrismaService], +}) +export class ChangeEquipmentStatusModule {} \ No newline at end of file diff --git a/backend/src/change-equipment-status/change-equipment-status.service.ts b/backend/src/change-equipment-status/change-equipment-status.service.ts new file mode 100644 index 0000000..237d24c --- /dev/null +++ b/backend/src/change-equipment-status/change-equipment-status.service.ts @@ -0,0 +1,51 @@ +import { Injectable } from '@nestjs/common'; +import { PrismaService } from '../prisma/prisma.service'; +import { ChangeEquipmentStatus, Prisma } from '@prisma/client'; + +@Injectable() +export class ChangeEquipmentStatusService { + constructor(private prisma: PrismaService) {} + + async findAll(params: { + skip?: number; + take?: number; + where?: Prisma.ChangeEquipmentStatusWhereInput; + orderBy?: Prisma.ChangeEquipmentStatusOrderByWithRelationInput; + }): Promise { + const { skip, take, where, orderBy } = params; + return this.prisma.changeEquipmentStatus.findMany({ skip, take, where, orderBy }); + } + + async findOne(where: Prisma.ChangeEquipmentStatusWhereUniqueInput): Promise { + return this.prisma.changeEquipmentStatus.findUnique({ where }); + } + + async create(data: Prisma.ChangeEquipmentStatusCreateInput): Promise { + return this.prisma.changeEquipmentStatus.create({ data }); + } + + async update(params: { + where: Prisma.ChangeEquipmentStatusWhereUniqueInput; + data: Prisma.ChangeEquipmentStatusUpdateInput; + }): Promise { + return this.prisma.changeEquipmentStatus.update(params); + } + + async remove(where: Prisma.ChangeEquipmentStatusWhereUniqueInput): Promise { + return this.prisma.changeEquipmentStatus.delete({ where }); + } + + async findManyWithPagination(params: { + skip?: number; + take?: number; + where?: Prisma.ChangeEquipmentStatusWhereInput; + orderBy?: Prisma.ChangeEquipmentStatusOrderByWithRelationInput; + }): Promise<{ content: ChangeEquipmentStatus[]; total: number }> { + const { skip, take, where, orderBy } = params; + const [content, total] = await Promise.all([ + this.prisma.changeEquipmentStatus.findMany({ skip, take, where, orderBy }), + this.prisma.changeEquipmentStatus.count({ where }), + ]); + return { content, total }; + } +} \ No newline at end of file diff --git a/backend/src/change-equipment-status/dto/change-equipment-status-list-request.dto.ts b/backend/src/change-equipment-status/dto/change-equipment-status-list-request.dto.ts new file mode 100644 index 0000000..04646c9 --- /dev/null +++ b/backend/src/change-equipment-status/dto/change-equipment-status-list-request.dto.ts @@ -0,0 +1,18 @@ +import { ApiProperty } from '@nestjs/swagger'; +import { IsOptional, ValidateNested } from 'class-validator'; +import { Type } from 'class-transformer'; +import { FilterDto } from './filter.dto'; +import { PageRequestDto } from './page-request.dto'; + +export class ChangeEquipmentStatusListRequestDto { + @IsOptional() + @ValidateNested() + @Type(() => FilterDto) + @ApiProperty({ description: 'Фильтр', required: false }) + filter?: FilterDto; + + @ValidateNested() + @Type(() => PageRequestDto) + @ApiProperty({ description: 'Параметры пагинации' }) + page: PageRequestDto; +} \ No newline at end of file diff --git a/backend/src/change-equipment-status/dto/change-equipment-status-list-response.dto.ts b/backend/src/change-equipment-status/dto/change-equipment-status-list-response.dto.ts new file mode 100644 index 0000000..e5dd096 --- /dev/null +++ b/backend/src/change-equipment-status/dto/change-equipment-status-list-response.dto.ts @@ -0,0 +1,11 @@ +import { ApiProperty } from '@nestjs/swagger'; +import { ChangeEquipmentStatusDto } from './change-equipment-status.dto'; +import { PageInfoDto } from './page-info.dto'; + +export class ChangeEquipmentStatusListResponseDto { + @ApiProperty({ description: 'Список документов изменения статуса', type: [ChangeEquipmentStatusDto] }) + content: ChangeEquipmentStatusDto[]; + + @ApiProperty({ description: 'Метаданные пагинации' }) + pageInfo: PageInfoDto; +} \ No newline at end of file diff --git a/backend/src/change-equipment-status/dto/change-equipment-status.dto.ts b/backend/src/change-equipment-status/dto/change-equipment-status.dto.ts new file mode 100644 index 0000000..2d4108c --- /dev/null +++ b/backend/src/change-equipment-status/dto/change-equipment-status.dto.ts @@ -0,0 +1,23 @@ +import { ApiProperty } from '@nestjs/swagger'; +import { EquipmentStatus } from '@prisma/client'; + +export class ChangeEquipmentStatusDto { + @ApiProperty({ description: 'Оборудование' }) + equipmentId: string; + + @ApiProperty({ + enum: EquipmentStatus, + enumName: 'EquipmentStatus', + description: 'Новый статус' + }) + newStatus: EquipmentStatus; + + @ApiProperty({ description: 'Номер', required: false }) + number?: string; + + @ApiProperty({ description: 'Дата изменения статуса' }) + date: Date; + + @ApiProperty({ description: 'Ответственный', required: false }) + responsible?: string; +} \ No newline at end of file diff --git a/backend/src/change-equipment-status/dto/create-change-equipment-status.dto.ts b/backend/src/change-equipment-status/dto/create-change-equipment-status.dto.ts new file mode 100644 index 0000000..eff6ad0 --- /dev/null +++ b/backend/src/change-equipment-status/dto/create-change-equipment-status.dto.ts @@ -0,0 +1,30 @@ +import { IsString, IsOptional, IsDateString } from 'class-validator'; +import { ApiProperty } from '@nestjs/swagger'; +import { EquipmentStatus } from '@prisma/client'; + +export class CreateChangeEquipmentStatusDto { + @IsString() + @ApiProperty({ description: 'Оборудование' }) + equipmentId: string; + + @ApiProperty({ + enum: EquipmentStatus, + enumName: 'EquipmentStatus', + description: 'Новый статус' + }) + newStatus: EquipmentStatus; + + @IsOptional() + @IsString() + @ApiProperty({ description: 'Номер', required: false }) + number?: string; + + @IsDateString() + @ApiProperty({ description: 'Дата изменения статуса' }) + date: Date; + + @IsOptional() + @IsString() + @ApiProperty({ description: 'Ответственный', required: false }) + responsible?: string; +} \ No newline at end of file diff --git a/backend/src/change-equipment-status/dto/filter.dto.ts b/backend/src/change-equipment-status/dto/filter.dto.ts new file mode 100644 index 0000000..13bc17a --- /dev/null +++ b/backend/src/change-equipment-status/dto/filter.dto.ts @@ -0,0 +1,9 @@ +import { ApiProperty } from '@nestjs/swagger'; + +export class FilterDto { + @ApiProperty({ description: 'Условия фильтрации', required: false }) + where?: any; + + @ApiProperty({ description: 'Порядок сортировки', required: false }) + orderBy?: any; +} \ No newline at end of file diff --git a/backend/src/change-equipment-status/dto/page-info.dto.ts b/backend/src/change-equipment-status/dto/page-info.dto.ts new file mode 100644 index 0000000..2e2add3 --- /dev/null +++ b/backend/src/change-equipment-status/dto/page-info.dto.ts @@ -0,0 +1,12 @@ +import { ApiProperty } from '@nestjs/swagger'; + +export class PageInfoDto { + @ApiProperty({ description: 'Количество пропускаемых записей' }) + skip: number; + + @ApiProperty({ description: 'Количество записей на странице' }) + take: number; + + @ApiProperty({ description: 'Общее количество записей' }) + total: number; +} \ No newline at end of file diff --git a/backend/src/change-equipment-status/dto/page-request.dto.ts b/backend/src/change-equipment-status/dto/page-request.dto.ts new file mode 100644 index 0000000..27fd792 --- /dev/null +++ b/backend/src/change-equipment-status/dto/page-request.dto.ts @@ -0,0 +1,16 @@ +import { ApiProperty } from '@nestjs/swagger'; +import { IsOptional, IsNumber, Min } from 'class-validator'; + +export class PageRequestDto { + @IsOptional() + @IsNumber() + @Min(0) + @ApiProperty({ description: 'Количество пропускаемых записей', required: false, default: 0 }) + skip?: number = 0; + + @IsOptional() + @IsNumber() + @Min(1) + @ApiProperty({ description: 'Количество записей на странице', required: false, default: 25 }) + take?: number = 25; +} \ No newline at end of file diff --git a/backend/src/change-equipment-status/dto/update-change-equipment-status.dto.ts b/backend/src/change-equipment-status/dto/update-change-equipment-status.dto.ts new file mode 100644 index 0000000..aad257c --- /dev/null +++ b/backend/src/change-equipment-status/dto/update-change-equipment-status.dto.ts @@ -0,0 +1,34 @@ +import { IsString, IsOptional, IsDateString } from 'class-validator'; +import { ApiProperty } from '@nestjs/swagger'; +import { EquipmentStatus } from '@prisma/client'; + +export class UpdateChangeEquipmentStatusDto { + @IsOptional() + @IsString() + @ApiProperty({ description: 'Оборудование', required: false }) + equipmentId?: string; + + @IsOptional() + @ApiProperty({ + enum: EquipmentStatus, + enumName: 'EquipmentStatus', + description: 'Новый статус', + required: false + }) + newStatus?: EquipmentStatus; + + @IsOptional() + @IsString() + @ApiProperty({ description: 'Номер', required: false }) + number?: string; + + @IsOptional() + @IsDateString() + @ApiProperty({ description: 'Дата изменения статуса', required: false }) + date?: Date; + + @IsOptional() + @IsString() + @ApiProperty({ description: 'Ответственный', required: false }) + responsible?: string; +} \ No newline at end of file diff --git a/backend/src/equipment/dto/create-equipment.dto.ts b/backend/src/equipment/dto/create-equipment.dto.ts new file mode 100644 index 0000000..974dc61 --- /dev/null +++ b/backend/src/equipment/dto/create-equipment.dto.ts @@ -0,0 +1,32 @@ +import { IsString, IsOptional, IsDateString } from 'class-validator'; +import { ApiProperty } from '@nestjs/swagger'; +import { EquipmentStatus } from '@prisma/client'; + +export class CreateEquipmentDto { + @IsString() + @ApiProperty({ description: 'Название оборудования' }) + name: string; + + @IsString() + @ApiProperty({ description: 'Заводской (серийный) номер' }) + serialNumber: string; + + @IsOptional() + @IsDateString() + @ApiProperty({ description: 'Дата поверки', required: false }) + dateOfInspection?: Date; + + @IsOptional() + @IsDateString() + @ApiProperty({ description: 'Дата изготовления', required: false }) + commissionedAt?: Date; + + @IsOptional() + @ApiProperty({ + enum: EquipmentStatus, + enumName: 'EquipmentStatus', + description: 'Текущий статус', + required: false + }) + status?: EquipmentStatus; +} \ No newline at end of file diff --git a/backend/src/equipment/dto/equipment-list-request.dto.ts b/backend/src/equipment/dto/equipment-list-request.dto.ts new file mode 100644 index 0000000..b2e9cd9 --- /dev/null +++ b/backend/src/equipment/dto/equipment-list-request.dto.ts @@ -0,0 +1,18 @@ +import { ApiProperty } from '@nestjs/swagger'; +import { IsOptional, ValidateNested } from 'class-validator'; +import { Type } from 'class-transformer'; +import { FilterDto } from './filter.dto'; +import { PageRequestDto } from './page-request.dto'; + +export class EquipmentListRequestDto { + @IsOptional() + @ValidateNested() + @Type(() => FilterDto) + @ApiProperty({ description: 'Фильтр', required: false }) + filter?: FilterDto; + + @ValidateNested() + @Type(() => PageRequestDto) + @ApiProperty({ description: 'Параметры пагинации' }) + page: PageRequestDto; +} \ No newline at end of file diff --git a/backend/src/equipment/dto/equipment-list-response.dto.ts b/backend/src/equipment/dto/equipment-list-response.dto.ts new file mode 100644 index 0000000..f0cec5f --- /dev/null +++ b/backend/src/equipment/dto/equipment-list-response.dto.ts @@ -0,0 +1,11 @@ +import { ApiProperty } from '@nestjs/swagger'; +import { EquipmentDto } from './equipment.dto'; +import { PageInfoDto } from './page-info.dto'; + +export class EquipmentListResponseDto { + @ApiProperty({ description: 'Список оборудования', type: [EquipmentDto] }) + content: EquipmentDto[]; + + @ApiProperty({ description: 'Метаданные пагинации' }) + pageInfo: PageInfoDto; +} \ No newline at end of file diff --git a/backend/src/equipment/dto/equipment.dto.ts b/backend/src/equipment/dto/equipment.dto.ts new file mode 100644 index 0000000..f6bda90 --- /dev/null +++ b/backend/src/equipment/dto/equipment.dto.ts @@ -0,0 +1,26 @@ +import { ApiProperty } from '@nestjs/swagger'; +import { EquipmentStatus } from '@prisma/client'; + +export class EquipmentDto { + @ApiProperty({ description: 'Идентификатор оборудования' }) + id: string; + + @ApiProperty({ description: 'Название оборудования' }) + name: string; + + @ApiProperty({ description: 'Заводской (серийный) номер' }) + serialNumber: string; + + @ApiProperty({ description: 'Дата поверки', required: false }) + dateOfInspection?: Date; + + @ApiProperty({ description: 'Дата изготовления', required: false }) + commissionedAt?: Date; + + @ApiProperty({ + enum: EquipmentStatus, + enumName: 'EquipmentStatus', + description: 'Текущий статус' + }) + status: EquipmentStatus; +} \ No newline at end of file diff --git a/backend/src/equipment/dto/filter.dto.ts b/backend/src/equipment/dto/filter.dto.ts new file mode 100644 index 0000000..ca95733 --- /dev/null +++ b/backend/src/equipment/dto/filter.dto.ts @@ -0,0 +1,10 @@ +import { ApiProperty } from '@nestjs/swagger'; +import { Prisma } from '@prisma/client'; + +export class FilterDto { + @ApiProperty({ description: 'Условия фильтрации', required: false }) + where?: any; + + @ApiProperty({ description: 'Порядок сортировки', required: false }) + orderBy?: any; +} \ No newline at end of file diff --git a/backend/src/equipment/dto/page-info.dto.ts b/backend/src/equipment/dto/page-info.dto.ts new file mode 100644 index 0000000..2e2add3 --- /dev/null +++ b/backend/src/equipment/dto/page-info.dto.ts @@ -0,0 +1,12 @@ +import { ApiProperty } from '@nestjs/swagger'; + +export class PageInfoDto { + @ApiProperty({ description: 'Количество пропускаемых записей' }) + skip: number; + + @ApiProperty({ description: 'Количество записей на странице' }) + take: number; + + @ApiProperty({ description: 'Общее количество записей' }) + total: number; +} \ No newline at end of file diff --git a/backend/src/equipment/dto/page-request.dto.ts b/backend/src/equipment/dto/page-request.dto.ts new file mode 100644 index 0000000..27fd792 --- /dev/null +++ b/backend/src/equipment/dto/page-request.dto.ts @@ -0,0 +1,16 @@ +import { ApiProperty } from '@nestjs/swagger'; +import { IsOptional, IsNumber, Min } from 'class-validator'; + +export class PageRequestDto { + @IsOptional() + @IsNumber() + @Min(0) + @ApiProperty({ description: 'Количество пропускаемых записей', required: false, default: 0 }) + skip?: number = 0; + + @IsOptional() + @IsNumber() + @Min(1) + @ApiProperty({ description: 'Количество записей на странице', required: false, default: 25 }) + take?: number = 25; +} \ No newline at end of file diff --git a/backend/src/equipment/dto/update-equipment.dto.ts b/backend/src/equipment/dto/update-equipment.dto.ts new file mode 100644 index 0000000..59a629c --- /dev/null +++ b/backend/src/equipment/dto/update-equipment.dto.ts @@ -0,0 +1,34 @@ +import { IsString, IsOptional, IsDateString } from 'class-validator'; +import { ApiProperty } from '@nestjs/swagger'; +import { EquipmentStatus } from '@prisma/client'; + +export class UpdateEquipmentDto { + @IsOptional() + @IsString() + @ApiProperty({ description: 'Название оборудования', required: false }) + name?: string; + + @IsOptional() + @IsString() + @ApiProperty({ description: 'Заводской (серийный) номер', required: false }) + serialNumber?: string; + + @IsOptional() + @IsDateString() + @ApiProperty({ description: 'Дата поверки', required: false }) + dateOfInspection?: Date; + + @IsOptional() + @IsDateString() + @ApiProperty({ description: 'Дата изготовления', required: false }) + commissionedAt?: Date; + + @IsOptional() + @ApiProperty({ + enum: EquipmentStatus, + enumName: 'EquipmentStatus', + description: 'Текущий статус', + required: false + }) + status?: EquipmentStatus; +} \ No newline at end of file diff --git a/backend/src/equipment/equipment.controller.ts b/backend/src/equipment/equipment.controller.ts new file mode 100644 index 0000000..b0761dd --- /dev/null +++ b/backend/src/equipment/equipment.controller.ts @@ -0,0 +1,61 @@ +import { Controller, Get, Post, Body, Patch, Param, Delete, Query, UseGuards } from '@nestjs/common'; +import { ApiBearerAuth, ApiTags, ApiOperation, ApiResponse } from '@nestjs/swagger'; +import { EquipmentService } from './equipment.service'; +import { CreateEquipmentDto } from './dto/create-equipment.dto'; +import { UpdateEquipmentDto } from './dto/update-equipment.dto'; +import { JwtAuthGuard } from '../auth/jwt-auth.guard'; +import { EquipmentListRequestDto } from './dto/equipment-list-request.dto'; +import { EquipmentListResponseDto } from './dto/equipment-list-response.dto'; + +@ApiTags('equipment') +@ApiBearerAuth() +@UseGuards(JwtAuthGuard) +@Controller('equipment') +export class EquipmentController { + constructor(private readonly equipmentService: EquipmentService) {} + + @Post('page') + @ApiOperation({ summary: 'Постраничный список оборудования с фильтрацией' }) + @ApiResponse({ status: 200, type: EquipmentListResponseDto }) + async listEquipment(@Body() dto: EquipmentListRequestDto) { + const { content, total } = await this.equipmentService.findManyWithPagination({ + skip: dto.page?.skip, + take: dto.page?.take, + where: dto.filter?.where, + orderBy: dto.filter?.orderBy, + }); + + return { + content, + pageInfo: { + skip: dto.page?.skip || 0, + take: dto.page?.take || 25, + total, + }, + }; + } + + @Get(':id') + @ApiOperation({ summary: 'Получить оборудование по идентификатору' }) + async findOne(@Param('id') id: string) { + return this.equipmentService.findOne({ id }); + } + + @Post() + @ApiOperation({ summary: 'Создать оборудование' }) + async create(@Body() dto: CreateEquipmentDto) { + return this.equipmentService.create(dto); + } + + @Patch(':id') + @ApiOperation({ summary: 'Обновить оборудование' }) + async update(@Param('id') id: string, @Body() dto: UpdateEquipmentDto) { + return this.equipmentService.update({ where: { id }, data: dto }); + } + + @Delete(':id') + @ApiOperation({ summary: 'Удалить оборудование' }) + async remove(@Param('id') id: string) { + return this.equipmentService.remove({ id }); + } +} \ No newline at end of file diff --git a/backend/src/equipment/equipment.module.ts b/backend/src/equipment/equipment.module.ts new file mode 100644 index 0000000..4b324f7 --- /dev/null +++ b/backend/src/equipment/equipment.module.ts @@ -0,0 +1,10 @@ +import { Module } from '@nestjs/common'; +import { EquipmentService } from './equipment.service'; +import { EquipmentController } from './equipment.controller'; +import { PrismaService } from '../prisma/prisma.service'; + +@Module({ + controllers: [EquipmentController], + providers: [EquipmentService, PrismaService], +}) +export class EquipmentModule {} \ No newline at end of file diff --git a/backend/src/equipment/equipment.service.ts b/backend/src/equipment/equipment.service.ts new file mode 100644 index 0000000..018130d --- /dev/null +++ b/backend/src/equipment/equipment.service.ts @@ -0,0 +1,51 @@ +import { Injectable } from '@nestjs/common'; +import { PrismaService } from '../prisma/prisma.service'; +import { Equipment, Prisma } from '@prisma/client'; + +@Injectable() +export class EquipmentService { + constructor(private prisma: PrismaService) {} + + async findAll(params: { + skip?: number; + take?: number; + where?: Prisma.EquipmentWhereInput; + orderBy?: Prisma.EquipmentOrderByWithRelationInput; + }): Promise { + const { skip, take, where, orderBy } = params; + return this.prisma.equipment.findMany({ skip, take, where, orderBy }); + } + + async findOne(where: Prisma.EquipmentWhereUniqueInput): Promise { + return this.prisma.equipment.findUnique({ where }); + } + + async create(data: Prisma.EquipmentCreateInput): Promise { + return this.prisma.equipment.create({ data }); + } + + async update(params: { + where: Prisma.EquipmentWhereUniqueInput; + data: Prisma.EquipmentUpdateInput; + }): Promise { + return this.prisma.equipment.update(params); + } + + async remove(where: Prisma.EquipmentWhereUniqueInput): Promise { + return this.prisma.equipment.delete({ where }); + } + + async findManyWithPagination(params: { + skip?: number; + take?: number; + where?: Prisma.EquipmentWhereInput; + orderBy?: Prisma.EquipmentOrderByWithRelationInput; + }): Promise<{ content: Equipment[]; total: number }> { + const { skip, take, where, orderBy } = params; + const [content, total] = await Promise.all([ + this.prisma.equipment.findMany({ skip, take, where, orderBy }), + this.prisma.equipment.count({ where }), + ]); + return { content, total }; + } +} \ No newline at end of file diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx new file mode 100644 index 0000000..1d08f6b --- /dev/null +++ b/frontend/src/App.tsx @@ -0,0 +1,27 @@ +import { Admin, Resource } from 'react-admin'; +import { dataProvider } from './dataProvider'; +import { authProvider } from './authProvider'; + +import { EquipmentList, EquipmentCreate, EquipmentEdit, EquipmentShow } from './resources/equipment'; +import { ChangeEquipmentStatusList, ChangeEquipmentStatusCreate, ChangeEquipmentStatusEdit, ChangeEquipmentStatusShow } from './resources/change-equipment-status'; + +const App = () => ( + + + + +); + +export default App; \ No newline at end of file diff --git a/frontend/src/main.tsx b/frontend/src/main.tsx new file mode 100644 index 0000000..4787246 --- /dev/null +++ b/frontend/src/main.tsx @@ -0,0 +1,13 @@ +import React from 'react'; +import ReactDOM from 'react-dom/client'; +import { initKeycloak } from './authProvider'; +import App from './App'; + +// Initialize Keycloak before rendering the app +initKeycloak().then(() => { + ReactDOM.createRoot(document.getElementById('root')!).render( + + + + ); +}); \ No newline at end of file diff --git a/frontend/src/resources/change-equipment-status/ChangeEquipmentStatusCreate.tsx b/frontend/src/resources/change-equipment-status/ChangeEquipmentStatusCreate.tsx new file mode 100644 index 0000000..fb0169d --- /dev/null +++ b/frontend/src/resources/change-equipment-status/ChangeEquipmentStatusCreate.tsx @@ -0,0 +1,25 @@ +import { Create, SimpleForm, TextInput, DateInput, SelectInput, ReferenceInput } from 'react-admin'; + +const statusChoices = [ + { id: 'Active', name: 'В эксплуатации' }, + { id: 'Repair', name: 'В ремонте' }, + { id: 'Reserve', name: 'В резерве' }, + { id: 'WriteOff', name: 'Списано' }, +]; + +export const ChangeEquipmentStatusCreate = () => ( + + + + + + + + + +); \ No newline at end of file diff --git a/frontend/src/resources/change-equipment-status/ChangeEquipmentStatusEdit.tsx b/frontend/src/resources/change-equipment-status/ChangeEquipmentStatusEdit.tsx new file mode 100644 index 0000000..922b050 --- /dev/null +++ b/frontend/src/resources/change-equipment-status/ChangeEquipmentStatusEdit.tsx @@ -0,0 +1,24 @@ +import { Edit, SimpleForm, TextInput, DateInput, SelectInput, ReferenceInput } from 'react-admin'; + +const statusChoices = [ + { id: 'Active', name: 'В эксплуатации' }, + { id: 'Repair', name: 'В ремонте' }, + { id: 'Reserve', name: 'В резерве' }, + { id: 'WriteOff', name: 'Списано' }, +]; + +export const ChangeEquipmentStatusEdit = () => ( + + + + + + + + + +); \ No newline at end of file diff --git a/frontend/src/resources/change-equipment-status/ChangeEquipmentStatusList.tsx b/frontend/src/resources/change-equipment-status/ChangeEquipmentStatusList.tsx new file mode 100644 index 0000000..299e965 --- /dev/null +++ b/frontend/src/resources/change-equipment-status/ChangeEquipmentStatusList.tsx @@ -0,0 +1,35 @@ +import { List, DataTable, TextField, DateField, EditButton, ShowButton, ReferenceField } from 'react-admin'; + +const statusChoices = [ + { id: 'Active', name: 'В эксплуатации' }, + { id: 'Repair', name: 'В ремонте' }, + { id: 'Reserve', name: 'В резерве' }, + { id: 'WriteOff', name: 'Списано' }, +]; + +const StatusField = ({ source, record }: { source: string; record?: any }) => { + const status = record?.[source]; + const statusLabel = statusChoices.find(choice => choice.id === status)?.name || status; + return {statusLabel}; +}; + +export const ChangeEquipmentStatusList = () => ( + + + + + + + + + + + + + + + + + + +); \ No newline at end of file diff --git a/frontend/src/resources/change-equipment-status/ChangeEquipmentStatusShow.tsx b/frontend/src/resources/change-equipment-status/ChangeEquipmentStatusShow.tsx new file mode 100644 index 0000000..254e005 --- /dev/null +++ b/frontend/src/resources/change-equipment-status/ChangeEquipmentStatusShow.tsx @@ -0,0 +1,28 @@ +import { Show, SimpleShowLayout, TextField, DateField, ReferenceField } from 'react-admin'; + +const statusChoices = [ + { id: 'Active', name: 'В эксплуатации' }, + { id: 'Repair', name: 'В ремонте' }, + { id: 'Reserve', name: 'В резерве' }, + { id: 'WriteOff', name: 'Списано' }, +]; + +const StatusField = ({ source, record }: { source: string; record?: any }) => { + const status = record?.[source]; + const statusLabel = statusChoices.find(choice => choice.id === status)?.name || status; + return {statusLabel}; +}; + +export const ChangeEquipmentStatusShow = () => ( + + + + + + + + + + + +); \ No newline at end of file diff --git a/frontend/src/resources/change-equipment-status/index.ts b/frontend/src/resources/change-equipment-status/index.ts new file mode 100644 index 0000000..1960ad0 --- /dev/null +++ b/frontend/src/resources/change-equipment-status/index.ts @@ -0,0 +1,4 @@ +export { ChangeEquipmentStatusList } from './ChangeEquipmentStatusList'; +export { ChangeEquipmentStatusCreate } from './ChangeEquipmentStatusCreate'; +export { ChangeEquipmentStatusEdit } from './ChangeEquipmentStatusEdit'; +export { ChangeEquipmentStatusShow } from './ChangeEquipmentStatusShow'; \ No newline at end of file diff --git a/frontend/src/resources/change-equipment-status/types.ts b/frontend/src/resources/change-equipment-status/types.ts new file mode 100644 index 0000000..eb5b900 --- /dev/null +++ b/frontend/src/resources/change-equipment-status/types.ts @@ -0,0 +1 @@ +export type EquipmentStatus = 'Active' | 'Repair' | 'Reserve' | 'WriteOff'; \ No newline at end of file diff --git a/frontend/src/resources/equipment/EquipmentCreate.tsx b/frontend/src/resources/equipment/EquipmentCreate.tsx new file mode 100644 index 0000000..91ee5ef --- /dev/null +++ b/frontend/src/resources/equipment/EquipmentCreate.tsx @@ -0,0 +1,24 @@ +import { Create, SimpleForm, TextInput, DateInput, SelectInput } from 'react-admin'; + +const statusChoices = [ + { id: 'Active', name: 'В эксплуатации' }, + { id: 'Repair', name: 'В ремонте' }, + { id: 'Reserve', name: 'В резерве' }, + { id: 'WriteOff', name: 'Списано' }, +]; + +export const EquipmentCreate = () => ( + + + + + + + + + +); \ No newline at end of file diff --git a/frontend/src/resources/equipment/EquipmentEdit.tsx b/frontend/src/resources/equipment/EquipmentEdit.tsx new file mode 100644 index 0000000..01ada7d --- /dev/null +++ b/frontend/src/resources/equipment/EquipmentEdit.tsx @@ -0,0 +1,25 @@ +import { Edit, SimpleForm, TextInput, DateInput, SelectInput } from 'react-admin'; + +const statusChoices = [ + { id: 'Active', name: 'В эксплуатации' }, + { id: 'Repair', name: 'В ремонте' }, + { id: 'Reserve', name: 'В резерве' }, + { id: 'WriteOff', name: 'Списано' }, +]; + +export const EquipmentEdit = () => ( + + + + + + + + + + +); \ No newline at end of file diff --git a/frontend/src/resources/equipment/EquipmentList.tsx b/frontend/src/resources/equipment/EquipmentList.tsx new file mode 100644 index 0000000..d5b10da --- /dev/null +++ b/frontend/src/resources/equipment/EquipmentList.tsx @@ -0,0 +1,35 @@ +import { List, DataTable, TextField, DateField, EditButton, ShowButton } from 'react-admin'; +import { EquipmentStatus } from './types'; + +const statusChoices = [ + { id: 'Active', name: 'В эксплуатации' }, + { id: 'Repair', name: 'В ремонте' }, + { id: 'Reserve', name: 'В резерве' }, + { id: 'WriteOff', name: 'Списано' }, +]; + +const StatusField = ({ source, record }: { source: string; record?: any }) => { + const status = record?.[source]; + const statusLabel = statusChoices.find(choice => choice.id === status)?.name || status; + return {statusLabel}; +}; + +export const EquipmentList = () => ( + + + + + + + + + + + + + + + + + +); \ No newline at end of file diff --git a/frontend/src/resources/equipment/EquipmentShow.tsx b/frontend/src/resources/equipment/EquipmentShow.tsx new file mode 100644 index 0000000..21dfeec --- /dev/null +++ b/frontend/src/resources/equipment/EquipmentShow.tsx @@ -0,0 +1,29 @@ +import { Show, SimpleShowLayout, TextField, DateField } from 'react-admin'; + +const statusChoices = [ + { id: 'Active', name: 'В эксплуатации' }, + { id: 'Repair', name: 'В ремонте' }, + { id: 'Reserve', name: 'В резерве' }, + { id: 'WriteOff', name: 'Списано' }, +]; + +const StatusField = ({ source, record }: { source: string; record?: any }) => { + const status = record?.[source]; + const statusLabel = statusChoices.find(choice => choice.id === status)?.name || status; + return {statusLabel}; +}; + +export const EquipmentShow = () => ( + + + + + + + + + + + + +); \ No newline at end of file diff --git a/frontend/src/resources/equipment/index.ts b/frontend/src/resources/equipment/index.ts new file mode 100644 index 0000000..a98271f --- /dev/null +++ b/frontend/src/resources/equipment/index.ts @@ -0,0 +1,4 @@ +export { EquipmentList } from './EquipmentList'; +export { EquipmentCreate } from './EquipmentCreate'; +export { EquipmentEdit } from './EquipmentEdit'; +export { EquipmentShow } from './EquipmentShow'; \ No newline at end of file diff --git a/frontend/src/resources/equipment/types.ts b/frontend/src/resources/equipment/types.ts new file mode 100644 index 0000000..eb5b900 --- /dev/null +++ b/frontend/src/resources/equipment/types.ts @@ -0,0 +1 @@ +export type EquipmentStatus = 'Active' | 'Repair' | 'Reserve' | 'WriteOff'; \ No newline at end of file