From 13224c96eb2b545639e79b7076ec4915c0e90cce Mon Sep 17 00:00:00 2001 From: aid-orchestrator Date: Wed, 22 Apr 2026 07:24:09 +0000 Subject: [PATCH] feat: add generated code --- backend/prisma/schema.prisma | 51 ++++++++++ backend/src/app.module.ts | 15 +++ .../change-equipment-status.controller.ts | 68 +++++++++++++ .../change-equipment-status.module.ts | 10 ++ .../change-equipment-status.service.ts | 65 ++++++++++++ .../dto/create-change-equipment-status.dto.ts | 30 ++++++ .../dto/update-change-equipment-status.dto.ts | 34 +++++++ backend/src/common/dto/filter.dto.ts | 23 +++++ backend/src/common/dto/page-info.dto.ts | 26 +++++ backend/src/common/dto/page-request.dto.ts | 16 +++ .../src/equipment/dto/create-equipment.dto.ts | 32 ++++++ .../dto/equipment-list-request.dto.ts | 18 ++++ .../dto/equipment-list-response.dto.ts | 15 +++ .../src/equipment/dto/update-equipment.dto.ts | 34 +++++++ backend/src/equipment/equipment.controller.ts | 99 +++++++++++++++++++ backend/src/equipment/equipment.module.ts | 10 ++ backend/src/equipment/equipment.service.ts | 72 ++++++++++++++ frontend/src/App.tsx | 34 +++++++ frontend/src/main.tsx | 15 +++ .../ChangeEquipmentStatusCreate.tsx | 30 ++++++ .../ChangeEquipmentStatusEdit.tsx | 28 ++++++ .../ChangeEquipmentStatusList.tsx | 35 +++++++ .../ChangeEquipmentStatusShow.tsx | 30 ++++++ .../change-equipment-status/index.ts | 4 + .../resources/equipment/EquipmentCreate.tsx | 24 +++++ .../src/resources/equipment/EquipmentEdit.tsx | 25 +++++ .../src/resources/equipment/EquipmentList.tsx | 43 ++++++++ .../src/resources/equipment/EquipmentShow.tsx | 27 +++++ frontend/src/resources/equipment/index.ts | 4 + 29 files changed, 917 insertions(+) create mode 100644 backend/prisma/schema.prisma create mode 100644 backend/src/app.module.ts create mode 100644 backend/src/change-equipment-status/change-equipment-status.controller.ts create mode 100644 backend/src/change-equipment-status/change-equipment-status.module.ts create mode 100644 backend/src/change-equipment-status/change-equipment-status.service.ts create mode 100644 backend/src/change-equipment-status/dto/create-change-equipment-status.dto.ts create mode 100644 backend/src/change-equipment-status/dto/update-change-equipment-status.dto.ts create mode 100644 backend/src/common/dto/filter.dto.ts create mode 100644 backend/src/common/dto/page-info.dto.ts create mode 100644 backend/src/common/dto/page-request.dto.ts create mode 100644 backend/src/equipment/dto/create-equipment.dto.ts create mode 100644 backend/src/equipment/dto/equipment-list-request.dto.ts create mode 100644 backend/src/equipment/dto/equipment-list-response.dto.ts create mode 100644 backend/src/equipment/dto/update-equipment.dto.ts create mode 100644 backend/src/equipment/equipment.controller.ts create mode 100644 backend/src/equipment/equipment.module.ts create mode 100644 backend/src/equipment/equipment.service.ts create mode 100644 frontend/src/App.tsx create mode 100644 frontend/src/main.tsx create mode 100644 frontend/src/resources/change-equipment-status/ChangeEquipmentStatusCreate.tsx create mode 100644 frontend/src/resources/change-equipment-status/ChangeEquipmentStatusEdit.tsx create mode 100644 frontend/src/resources/change-equipment-status/ChangeEquipmentStatusList.tsx create mode 100644 frontend/src/resources/change-equipment-status/ChangeEquipmentStatusShow.tsx create mode 100644 frontend/src/resources/change-equipment-status/index.ts create mode 100644 frontend/src/resources/equipment/EquipmentCreate.tsx create mode 100644 frontend/src/resources/equipment/EquipmentEdit.tsx create mode 100644 frontend/src/resources/equipment/EquipmentList.tsx create mode 100644 frontend/src/resources/equipment/EquipmentShow.tsx create mode 100644 frontend/src/resources/equipment/index.ts 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..c3b97ab --- /dev/null +++ b/backend/src/app.module.ts @@ -0,0 +1,15 @@ +import { Module } from '@nestjs/common'; +import { EquipmentModule } from './equipment/equipment.module'; +import { ChangeEquipmentStatusModule } from './change-equipment-status/change-equipment-status.module'; +import { AuthModule } from './auth/auth.module'; +import { PrismaService } from './prisma/prisma.service'; + +@Module({ + imports: [ + EquipmentModule, + ChangeEquipmentStatusModule, + AuthModule, + ], + 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..b4c793d --- /dev/null +++ b/backend/src/change-equipment-status/change-equipment-status.controller.ts @@ -0,0 +1,68 @@ +import { Controller, Get, Post, Body, Patch, Param, Delete, Query, UseGuards } from '@nestjs/common'; +import { ApiBearerAuth, ApiTags, ApiQuery, 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 { EquipmentStatus } from '@prisma/client'; + +@ApiTags('change-equipment-status') +@ApiBearerAuth() +@UseGuards(JwtAuthGuard) +@Controller('change-equipment-status') +export class ChangeEquipmentStatusController { + constructor(private readonly changeEquipmentStatusService: ChangeEquipmentStatusService) {} + + @Get() + @ApiQuery({ name: 'skip', required: false, type: Number }) + @ApiQuery({ name: 'take', required: false, type: Number }) + findAll(@Query('skip') skip?: number, @Query('take') take?: number) { + return this.changeEquipmentStatusService.findAll({ + skip: skip ? +skip : 0, + take: take ? +take : 25 + }); + } + + @Get(':equipmentId/:newStatus') + @ApiParam({ name: 'equipmentId', type: String }) + @ApiParam({ name: 'newStatus', enum: EquipmentStatus, enumName: 'EquipmentStatus' }) + findOne( + @Param('equipmentId') equipmentId: string, + @Param('newStatus') newStatus: EquipmentStatus, + ) { + return this.changeEquipmentStatusService.findOne({ + equipmentId_newStatus: { equipmentId, newStatus } + }); + } + + @Post() + create(@Body() dto: CreateChangeEquipmentStatusDto) { + return this.changeEquipmentStatusService.create(dto); + } + + @Patch(':equipmentId/:newStatus') + @ApiParam({ name: 'equipmentId', type: String }) + @ApiParam({ name: 'newStatus', enum: EquipmentStatus, enumName: 'EquipmentStatus' }) + 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') + @ApiParam({ name: 'equipmentId', type: String }) + @ApiParam({ name: 'newStatus', enum: EquipmentStatus, enumName: 'EquipmentStatus' }) + 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..32497ac --- /dev/null +++ b/backend/src/change-equipment-status/change-equipment-status.service.ts @@ -0,0 +1,65 @@ +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, + include: { + equipment: true, + }, + }); + } + + async findOne(where: Prisma.ChangeEquipmentStatusWhereUniqueInput): Promise { + return this.prisma.changeEquipmentStatus.findUnique({ + where, + include: { + equipment: true, + }, + }); + } + + async create(data: Prisma.ChangeEquipmentStatusCreateInput): Promise { + return this.prisma.changeEquipmentStatus.create({ + data, + include: { + equipment: true, + }, + }); + } + + async update(params: { + where: Prisma.ChangeEquipmentStatusWhereUniqueInput; + data: Prisma.ChangeEquipmentStatusUpdateInput; + }): Promise { + return this.prisma.changeEquipmentStatus.update({ + ...params, + include: { + equipment: true, + }, + }); + } + + async remove(where: Prisma.ChangeEquipmentStatusWhereUniqueInput): Promise { + return this.prisma.changeEquipmentStatus.delete({ + where, + include: { + equipment: true, + }, + }); + } +} \ 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..a270d21 --- /dev/null +++ b/backend/src/change-equipment-status/dto/create-change-equipment-status.dto.ts @@ -0,0 +1,30 @@ +import { ApiProperty } from '@nestjs/swagger'; +import { IsString, IsOptional, IsDateString } from 'class-validator'; +import { EquipmentStatus } from '@prisma/client'; + +export class CreateChangeEquipmentStatusDto { + @ApiProperty({ description: 'Оборудование' }) + @IsString() + equipmentId: string; + + @ApiProperty({ + enum: EquipmentStatus, + enumName: 'EquipmentStatus', + description: 'Новый статус' + }) + newStatus: EquipmentStatus; + + @ApiProperty({ description: 'Номер', required: false }) + @IsOptional() + @IsString() + number?: string; + + @ApiProperty({ description: 'Дата изменения статуса' }) + @IsDateString() + date: string; + + @ApiProperty({ description: 'Ответственный', required: false }) + @IsOptional() + @IsString() + responsible?: string; +} \ 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..1dff3ee --- /dev/null +++ b/backend/src/change-equipment-status/dto/update-change-equipment-status.dto.ts @@ -0,0 +1,34 @@ +import { ApiProperty } from '@nestjs/swagger'; +import { IsString, IsOptional, IsDateString } from 'class-validator'; +import { EquipmentStatus } from '@prisma/client'; + +export class UpdateChangeEquipmentStatusDto { + @ApiProperty({ description: 'Оборудование', required: false }) + @IsOptional() + @IsString() + equipmentId?: string; + + @ApiProperty({ + enum: EquipmentStatus, + enumName: 'EquipmentStatus', + description: 'Новый статус', + required: false + }) + @IsOptional() + newStatus?: EquipmentStatus; + + @ApiProperty({ description: 'Номер', required: false }) + @IsOptional() + @IsString() + number?: string; + + @ApiProperty({ description: 'Дата изменения статуса', required: false }) + @IsOptional() + @IsDateString() + date?: string; + + @ApiProperty({ description: 'Ответственный', required: false }) + @IsOptional() + @IsString() + responsible?: string; +} \ No newline at end of file diff --git a/backend/src/common/dto/filter.dto.ts b/backend/src/common/dto/filter.dto.ts new file mode 100644 index 0000000..dd6bf00 --- /dev/null +++ b/backend/src/common/dto/filter.dto.ts @@ -0,0 +1,23 @@ +import { ApiProperty } from '@nestjs/swagger'; +import { IsOptional, IsString, IsArray } from 'class-validator'; + +export class FilterDto { + @ApiProperty({ description: 'Search query', required: false }) + @IsOptional() + @IsString() + search?: string; + + @ApiProperty({ description: 'Filter by field values', required: false, type: Object }) + @IsOptional() + fieldFilters?: Record; + + @ApiProperty({ description: 'Sort order', required: false }) + @IsOptional() + @IsString() + sortBy?: string; + + @ApiProperty({ description: 'Sort direction (asc/desc)', required: false }) + @IsOptional() + @IsString() + sortDirection?: 'asc' | 'desc'; +} \ No newline at end of file diff --git a/backend/src/common/dto/page-info.dto.ts b/backend/src/common/dto/page-info.dto.ts new file mode 100644 index 0000000..ac70696 --- /dev/null +++ b/backend/src/common/dto/page-info.dto.ts @@ -0,0 +1,26 @@ +import { ApiProperty } from '@nestjs/swagger'; +import { IsNumber } from 'class-validator'; + +export class PageInfoDto { + @ApiProperty({ description: 'Total number of items' }) + @IsNumber() + totalItems: number; + + @ApiProperty({ description: 'Total number of pages' }) + @IsNumber() + totalPages: number; + + @ApiProperty({ description: 'Current page number (0-based)' }) + @IsNumber() + currentPage: number; + + @ApiProperty({ description: 'Page size' }) + @IsNumber() + pageSize: number; + + @ApiProperty({ description: 'Has next page' }) + hasNext: boolean; + + @ApiProperty({ description: 'Has previous page' }) + hasPrevious: boolean; +} \ No newline at end of file diff --git a/backend/src/common/dto/page-request.dto.ts b/backend/src/common/dto/page-request.dto.ts new file mode 100644 index 0000000..0b15759 --- /dev/null +++ b/backend/src/common/dto/page-request.dto.ts @@ -0,0 +1,16 @@ +import { ApiProperty } from '@nestjs/swagger'; +import { IsNumber, IsOptional, Min } from 'class-validator'; + +export class PageRequestDto { + @ApiProperty({ description: 'Page number (0-based)', default: 0 }) + @IsOptional() + @IsNumber() + @Min(0) + page?: number = 0; + + @ApiProperty({ description: 'Page size', default: 25 }) + @IsOptional() + @IsNumber() + @Min(1) + size?: number = 25; +} \ 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..aec56d0 --- /dev/null +++ b/backend/src/equipment/dto/create-equipment.dto.ts @@ -0,0 +1,32 @@ +import { ApiProperty } from '@nestjs/swagger'; +import { IsString, IsOptional, IsDateString } from 'class-validator'; +import { EquipmentStatus } from '@prisma/client'; + +export class CreateEquipmentDto { + @ApiProperty({ description: 'Название оборудования' }) + @IsString() + name: string; + + @ApiProperty({ description: 'Заводской (серийный) номер' }) + @IsString() + serialNumber: string; + + @ApiProperty({ description: 'Дата поверки', required: false }) + @IsOptional() + @IsDateString() + dateOfInspection?: string; + + @ApiProperty({ description: 'Дата изготовления', required: false }) + @IsOptional() + @IsDateString() + commissionedAt?: string; + + @ApiProperty({ + enum: EquipmentStatus, + enumName: 'EquipmentStatus', + description: 'Текущий статус', + required: false + }) + @IsOptional() + 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..1da52de --- /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 '../../common/dto/filter.dto'; +import { PageRequestDto } from '../../common/dto/page-request.dto'; + +export class EquipmentListRequestDto { + @ApiProperty({ description: 'Фильтр', required: false }) + @IsOptional() + @ValidateNested() + @Type(() => FilterDto) + filter?: FilterDto; + + @ApiProperty({ description: 'Параметры пагинации' }) + @ValidateNested() + @Type(() => PageRequestDto) + 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..8fcefa6 --- /dev/null +++ b/backend/src/equipment/dto/equipment-list-response.dto.ts @@ -0,0 +1,15 @@ +import { ApiProperty } from '@nestjs/swagger'; +import { ValidateNested } from 'class-validator'; +import { Type } from 'class-transformer'; +import { Equipment } from '@prisma/client'; +import { PageInfoDto } from '../../common/dto/page-info.dto'; + +export class EquipmentListResponseDto { + @ApiProperty({ description: 'Список оборудования', type: [Object] }) + content: Equipment[]; + + @ApiProperty({ description: 'Метаданные пагинации' }) + @ValidateNested() + @Type(() => PageInfoDto) + pageInfo: PageInfoDto; +} \ 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..74d4beb --- /dev/null +++ b/backend/src/equipment/dto/update-equipment.dto.ts @@ -0,0 +1,34 @@ +import { ApiProperty } from '@nestjs/swagger'; +import { IsString, IsOptional, IsDateString } from 'class-validator'; +import { EquipmentStatus } from '@prisma/client'; + +export class UpdateEquipmentDto { + @ApiProperty({ description: 'Название оборудования', required: false }) + @IsOptional() + @IsString() + name?: string; + + @ApiProperty({ description: 'Заводской (серийный) номер', required: false }) + @IsOptional() + @IsString() + serialNumber?: string; + + @ApiProperty({ description: 'Дата поверки', required: false }) + @IsOptional() + @IsDateString() + dateOfInspection?: string; + + @ApiProperty({ description: 'Дата изготовления', required: false }) + @IsOptional() + @IsDateString() + commissionedAt?: string; + + @ApiProperty({ + enum: EquipmentStatus, + enumName: 'EquipmentStatus', + description: 'Текущий статус', + required: false + }) + @IsOptional() + 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..45e07f4 --- /dev/null +++ b/backend/src/equipment/equipment.controller.ts @@ -0,0 +1,99 @@ +import { Controller, Get, Post, Body, Patch, Param, Delete, Query, UseGuards } from '@nestjs/common'; +import { ApiBearerAuth, ApiTags, ApiQuery } 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') + async listEquipment(@Body() request: EquipmentListRequestDto): Promise { + const { page, filter } = request; + const skip = page?.page ? page.page * (page.size || 25) : 0; + const take = page?.size || 25; + + // Build where clause from filter + let where = {}; + if (filter?.search) { + where = { + OR: [ + { name: { contains: filter.search, mode: 'insensitive' } }, + { serialNumber: { contains: filter.search, mode: 'insensitive' } }, + ], + }; + } + + if (filter?.fieldFilters) { + where = { ...where, ...filter.fieldFilters }; + } + + // Build orderBy from filter + let orderBy = {}; + if (filter?.sortBy) { + orderBy = { + [filter.sortBy]: filter.sortDirection || 'asc', + }; + } + + const [equipment, total] = await Promise.all([ + this.equipmentService.findAll({ skip, take, where, orderBy }), + this.equipmentService.count({ where }), + ]); + + const totalPages = Math.ceil(total / take); + const currentPage = page?.page || 0; + + return { + content: equipment, + pageInfo: { + totalItems: total, + totalPages, + currentPage, + pageSize: take, + hasNext: currentPage < totalPages - 1, + hasPrevious: currentPage > 0, + }, + }; + } + + @Get() + @ApiQuery({ name: 'skip', required: false, type: Number }) + @ApiQuery({ name: 'take', required: false, type: Number }) + findAll(@Query('skip') skip?: number, @Query('take') take?: number) { + return this.equipmentService.findAll({ + skip: skip ? +skip : 0, + take: take ? +take : 25 + }); + } + + @Get(':id') + findOne(@Param('id') id: string) { + return this.equipmentService.findOne({ id }); + } + + @Post() + create(@Body() dto: CreateEquipmentDto) { + return this.equipmentService.create(dto); + } + + @Patch(':id') + update(@Param('id') id: string, @Body() dto: UpdateEquipmentDto) { + return this.equipmentService.update({ + where: { id }, + data: dto + }); + } + + @Delete(':id') + 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..f012846 --- /dev/null +++ b/backend/src/equipment/equipment.service.ts @@ -0,0 +1,72 @@ +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, + include: { + statusChanges: true, + }, + }); + } + + async count(params: { + where?: Prisma.EquipmentWhereInput; + }): Promise { + const { where } = params; + return this.prisma.equipment.count({ where }); + } + + async findOne(where: Prisma.EquipmentWhereUniqueInput): Promise { + return this.prisma.equipment.findUnique({ + where, + include: { + statusChanges: true, + }, + }); + } + + async create(data: Prisma.EquipmentCreateInput): Promise { + return this.prisma.equipment.create({ + data, + include: { + statusChanges: true, + }, + }); + } + + async update(params: { + where: Prisma.EquipmentWhereUniqueInput; + data: Prisma.EquipmentUpdateInput; + }): Promise { + return this.prisma.equipment.update({ + ...params, + include: { + statusChanges: true, + }, + }); + } + + async remove(where: Prisma.EquipmentWhereUniqueInput): Promise { + return this.prisma.equipment.delete({ + where, + include: { + statusChanges: true, + }, + }); + } +} \ No newline at end of file diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx new file mode 100644 index 0000000..105855f --- /dev/null +++ b/frontend/src/App.tsx @@ -0,0 +1,34 @@ +import { Admin, Resource } from 'react-admin'; +import { dataProvider } from './dataProvider'; +import { authProvider } from './authProvider'; + +// Equipment resources +import { EquipmentList } from './resources/equipment/EquipmentList'; +import { EquipmentEdit } from './resources/equipment/EquipmentEdit'; +import { EquipmentCreate } from './resources/equipment/EquipmentCreate'; +import { EquipmentShow } from './resources/equipment/EquipmentShow'; + +// ChangeEquipmentStatus resources +import { ChangeEquipmentStatusList } from './resources/change-equipment-status/ChangeEquipmentStatusList'; +import { ChangeEquipmentStatusEdit } from './resources/change-equipment-status/ChangeEquipmentStatusEdit'; +import { ChangeEquipmentStatusCreate } from './resources/change-equipment-status/ChangeEquipmentStatusCreate'; +import { ChangeEquipmentStatusShow } from './resources/change-equipment-status/ChangeEquipmentStatusShow'; + +export const 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..5b759e1 --- /dev/null +++ b/frontend/src/main.tsx @@ -0,0 +1,15 @@ +import React from 'react'; +import ReactDOM from 'react-dom/client'; +import { App } from './App'; +import { initKeycloak } from './authProvider'; + +// Initialize Keycloak before rendering the app +initKeycloak().then(() => { + ReactDOM.createRoot(document.getElementById('root')!).render( + + + + ); +}).catch((error) => { + console.error('Failed to initialize Keycloak:', error); +}); \ 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..c376873 --- /dev/null +++ b/frontend/src/resources/change-equipment-status/ChangeEquipmentStatusCreate.tsx @@ -0,0 +1,30 @@ +import { Create, SimpleForm, TextInput, DateInput, SelectInput, ReferenceInput } from 'react-admin'; + +const equipmentStatusChoices = [ + { 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..b08120c --- /dev/null +++ b/frontend/src/resources/change-equipment-status/ChangeEquipmentStatusEdit.tsx @@ -0,0 +1,28 @@ +import { Edit, SimpleForm, TextInput, DateInput, SelectInput, ReferenceInput } from 'react-admin'; + +const equipmentStatusChoices = [ + { 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..af8def7 --- /dev/null +++ b/frontend/src/resources/change-equipment-status/ChangeEquipmentStatusList.tsx @@ -0,0 +1,35 @@ +import { List, DataTable, TextField, DateField, SelectField, ReferenceField, EditButton, ShowButton } from 'react-admin'; + +const equipmentStatusChoices = [ + { id: 'Active', name: 'В эксплуатации' }, + { id: 'Repair', name: 'В ремонте' }, + { id: 'Reserve', name: 'В резерве' }, + { id: 'WriteOff', name: 'Списано' }, +]; + +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..34e023b --- /dev/null +++ b/frontend/src/resources/change-equipment-status/ChangeEquipmentStatusShow.tsx @@ -0,0 +1,30 @@ +import { Show, SimpleShowLayout, TextField, DateField, SelectField, ReferenceField } from 'react-admin'; + +const equipmentStatusChoices = [ + { id: 'Active', name: 'В эксплуатации' }, + { id: 'Repair', name: 'В ремонте' }, + { id: 'Reserve', name: 'В резерве' }, + { id: 'WriteOff', name: 'Списано' }, +]; + +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..06e12bd --- /dev/null +++ b/frontend/src/resources/change-equipment-status/index.ts @@ -0,0 +1,4 @@ +export { ChangeEquipmentStatusList } from './ChangeEquipmentStatusList'; +export { ChangeEquipmentStatusEdit } from './ChangeEquipmentStatusEdit'; +export { ChangeEquipmentStatusCreate } from './ChangeEquipmentStatusCreate'; +export { ChangeEquipmentStatusShow } from './ChangeEquipmentStatusShow'; \ 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..ccc0eee --- /dev/null +++ b/frontend/src/resources/equipment/EquipmentCreate.tsx @@ -0,0 +1,24 @@ +import { Create, SimpleForm, TextInput, DateInput, SelectInput } from 'react-admin'; + +const equipmentStatusChoices = [ + { 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..bb96b36 --- /dev/null +++ b/frontend/src/resources/equipment/EquipmentEdit.tsx @@ -0,0 +1,25 @@ +import { Edit, SimpleForm, TextInput, DateInput, SelectInput } from 'react-admin'; + +const equipmentStatusChoices = [ + { 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..3fb0ae0 --- /dev/null +++ b/frontend/src/resources/equipment/EquipmentList.tsx @@ -0,0 +1,43 @@ +import { List, DataTable, TextField, DateField, SelectField, EditButton, ShowButton } from 'react-admin'; + +const equipmentStatusChoices = [ + { id: 'Active', name: 'В эксплуатации' }, + { id: 'Repair', name: 'В ремонте' }, + { id: 'Reserve', name: 'В резерве' }, + { id: 'WriteOff', name: 'Списано' }, +]; + +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..5e30cf6 --- /dev/null +++ b/frontend/src/resources/equipment/EquipmentShow.tsx @@ -0,0 +1,27 @@ +import { Show, SimpleShowLayout, TextField, DateField, SelectField } from 'react-admin'; + +const equipmentStatusChoices = [ + { id: 'Active', name: 'В эксплуатации' }, + { id: 'Repair', name: 'В ремонте' }, + { id: 'Reserve', name: 'В резерве' }, + { id: 'WriteOff', name: 'Списано' }, +]; + +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..8b4fd08 --- /dev/null +++ b/frontend/src/resources/equipment/index.ts @@ -0,0 +1,4 @@ +export { EquipmentList } from './EquipmentList'; +export { EquipmentEdit } from './EquipmentEdit'; +export { EquipmentCreate } from './EquipmentCreate'; +export { EquipmentShow } from './EquipmentShow'; \ No newline at end of file