feat: add generated code
This commit is contained in:
51
backend/prisma/schema.prisma
Normal file
51
backend/prisma/schema.prisma
Normal file
@@ -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])
|
||||||
|
}
|
||||||
15
backend/src/app.module.ts
Normal file
15
backend/src/app.module.ts
Normal file
@@ -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 {}
|
||||||
@@ -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 }
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -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 {}
|
||||||
@@ -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<ChangeEquipmentStatus[]> {
|
||||||
|
const { skip, take, where, orderBy } = params;
|
||||||
|
return this.prisma.changeEquipmentStatus.findMany({
|
||||||
|
skip,
|
||||||
|
take,
|
||||||
|
where,
|
||||||
|
orderBy,
|
||||||
|
include: {
|
||||||
|
equipment: true,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
async findOne(where: Prisma.ChangeEquipmentStatusWhereUniqueInput): Promise<ChangeEquipmentStatus | null> {
|
||||||
|
return this.prisma.changeEquipmentStatus.findUnique({
|
||||||
|
where,
|
||||||
|
include: {
|
||||||
|
equipment: true,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
async create(data: Prisma.ChangeEquipmentStatusCreateInput): Promise<ChangeEquipmentStatus> {
|
||||||
|
return this.prisma.changeEquipmentStatus.create({
|
||||||
|
data,
|
||||||
|
include: {
|
||||||
|
equipment: true,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
async update(params: {
|
||||||
|
where: Prisma.ChangeEquipmentStatusWhereUniqueInput;
|
||||||
|
data: Prisma.ChangeEquipmentStatusUpdateInput;
|
||||||
|
}): Promise<ChangeEquipmentStatus> {
|
||||||
|
return this.prisma.changeEquipmentStatus.update({
|
||||||
|
...params,
|
||||||
|
include: {
|
||||||
|
equipment: true,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
async remove(where: Prisma.ChangeEquipmentStatusWhereUniqueInput): Promise<ChangeEquipmentStatus> {
|
||||||
|
return this.prisma.changeEquipmentStatus.delete({
|
||||||
|
where,
|
||||||
|
include: {
|
||||||
|
equipment: true,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -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;
|
||||||
|
}
|
||||||
@@ -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;
|
||||||
|
}
|
||||||
23
backend/src/common/dto/filter.dto.ts
Normal file
23
backend/src/common/dto/filter.dto.ts
Normal file
@@ -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<string, any>;
|
||||||
|
|
||||||
|
@ApiProperty({ description: 'Sort order', required: false })
|
||||||
|
@IsOptional()
|
||||||
|
@IsString()
|
||||||
|
sortBy?: string;
|
||||||
|
|
||||||
|
@ApiProperty({ description: 'Sort direction (asc/desc)', required: false })
|
||||||
|
@IsOptional()
|
||||||
|
@IsString()
|
||||||
|
sortDirection?: 'asc' | 'desc';
|
||||||
|
}
|
||||||
26
backend/src/common/dto/page-info.dto.ts
Normal file
26
backend/src/common/dto/page-info.dto.ts
Normal file
@@ -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;
|
||||||
|
}
|
||||||
16
backend/src/common/dto/page-request.dto.ts
Normal file
16
backend/src/common/dto/page-request.dto.ts
Normal file
@@ -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;
|
||||||
|
}
|
||||||
32
backend/src/equipment/dto/create-equipment.dto.ts
Normal file
32
backend/src/equipment/dto/create-equipment.dto.ts
Normal file
@@ -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;
|
||||||
|
}
|
||||||
18
backend/src/equipment/dto/equipment-list-request.dto.ts
Normal file
18
backend/src/equipment/dto/equipment-list-request.dto.ts
Normal file
@@ -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;
|
||||||
|
}
|
||||||
15
backend/src/equipment/dto/equipment-list-response.dto.ts
Normal file
15
backend/src/equipment/dto/equipment-list-response.dto.ts
Normal file
@@ -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;
|
||||||
|
}
|
||||||
34
backend/src/equipment/dto/update-equipment.dto.ts
Normal file
34
backend/src/equipment/dto/update-equipment.dto.ts
Normal file
@@ -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;
|
||||||
|
}
|
||||||
99
backend/src/equipment/equipment.controller.ts
Normal file
99
backend/src/equipment/equipment.controller.ts
Normal file
@@ -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<EquipmentListResponseDto> {
|
||||||
|
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 });
|
||||||
|
}
|
||||||
|
}
|
||||||
10
backend/src/equipment/equipment.module.ts
Normal file
10
backend/src/equipment/equipment.module.ts
Normal file
@@ -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 {}
|
||||||
72
backend/src/equipment/equipment.service.ts
Normal file
72
backend/src/equipment/equipment.service.ts
Normal file
@@ -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<Equipment[]> {
|
||||||
|
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<number> {
|
||||||
|
const { where } = params;
|
||||||
|
return this.prisma.equipment.count({ where });
|
||||||
|
}
|
||||||
|
|
||||||
|
async findOne(where: Prisma.EquipmentWhereUniqueInput): Promise<Equipment | null> {
|
||||||
|
return this.prisma.equipment.findUnique({
|
||||||
|
where,
|
||||||
|
include: {
|
||||||
|
statusChanges: true,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
async create(data: Prisma.EquipmentCreateInput): Promise<Equipment> {
|
||||||
|
return this.prisma.equipment.create({
|
||||||
|
data,
|
||||||
|
include: {
|
||||||
|
statusChanges: true,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
async update(params: {
|
||||||
|
where: Prisma.EquipmentWhereUniqueInput;
|
||||||
|
data: Prisma.EquipmentUpdateInput;
|
||||||
|
}): Promise<Equipment> {
|
||||||
|
return this.prisma.equipment.update({
|
||||||
|
...params,
|
||||||
|
include: {
|
||||||
|
statusChanges: true,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
async remove(where: Prisma.EquipmentWhereUniqueInput): Promise<Equipment> {
|
||||||
|
return this.prisma.equipment.delete({
|
||||||
|
where,
|
||||||
|
include: {
|
||||||
|
statusChanges: true,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
34
frontend/src/App.tsx
Normal file
34
frontend/src/App.tsx
Normal file
@@ -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 = () => (
|
||||||
|
<Admin dataProvider={dataProvider} authProvider={authProvider}>
|
||||||
|
<Resource
|
||||||
|
name="equipment"
|
||||||
|
list={EquipmentList}
|
||||||
|
edit={EquipmentEdit}
|
||||||
|
create={EquipmentCreate}
|
||||||
|
show={EquipmentShow}
|
||||||
|
/>
|
||||||
|
<Resource
|
||||||
|
name="change-equipment-status"
|
||||||
|
list={ChangeEquipmentStatusList}
|
||||||
|
edit={ChangeEquipmentStatusEdit}
|
||||||
|
create={ChangeEquipmentStatusCreate}
|
||||||
|
show={ChangeEquipmentStatusShow}
|
||||||
|
/>
|
||||||
|
</Admin>
|
||||||
|
);
|
||||||
15
frontend/src/main.tsx
Normal file
15
frontend/src/main.tsx
Normal file
@@ -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(
|
||||||
|
<React.StrictMode>
|
||||||
|
<App />
|
||||||
|
</React.StrictMode>
|
||||||
|
);
|
||||||
|
}).catch((error) => {
|
||||||
|
console.error('Failed to initialize Keycloak:', error);
|
||||||
|
});
|
||||||
@@ -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 = () => (
|
||||||
|
<Create>
|
||||||
|
<SimpleForm>
|
||||||
|
<ReferenceInput
|
||||||
|
source="equipmentId"
|
||||||
|
reference="equipment"
|
||||||
|
label="Оборудование"
|
||||||
|
required
|
||||||
|
/>
|
||||||
|
<SelectInput
|
||||||
|
source="newStatus"
|
||||||
|
label="Новый статус"
|
||||||
|
choices={equipmentStatusChoices}
|
||||||
|
required
|
||||||
|
/>
|
||||||
|
<TextInput source="number" label="Номер" fullWidth />
|
||||||
|
<DateInput source="date" label="Дата изменения статуса" required />
|
||||||
|
<TextInput source="responsible" label="Ответственный" fullWidth />
|
||||||
|
</SimpleForm>
|
||||||
|
</Create>
|
||||||
|
);
|
||||||
@@ -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 = () => (
|
||||||
|
<Edit>
|
||||||
|
<SimpleForm>
|
||||||
|
<ReferenceInput
|
||||||
|
source="equipmentId"
|
||||||
|
reference="equipment"
|
||||||
|
label="Оборудование"
|
||||||
|
/>
|
||||||
|
<SelectInput
|
||||||
|
source="newStatus"
|
||||||
|
label="Новый статус"
|
||||||
|
choices={equipmentStatusChoices}
|
||||||
|
/>
|
||||||
|
<TextInput source="number" label="Номер" fullWidth />
|
||||||
|
<DateInput source="date" label="Дата изменения статуса" />
|
||||||
|
<TextInput source="responsible" label="Ответственный" fullWidth />
|
||||||
|
</SimpleForm>
|
||||||
|
</Edit>
|
||||||
|
);
|
||||||
@@ -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 = () => (
|
||||||
|
<List>
|
||||||
|
<DataTable>
|
||||||
|
<DataTable.Col
|
||||||
|
source="equipmentId"
|
||||||
|
label="Оборудование"
|
||||||
|
field={ReferenceField}
|
||||||
|
fieldProps={{ reference: 'equipment', source: 'name' }}
|
||||||
|
/>
|
||||||
|
<DataTable.Col
|
||||||
|
source="newStatus"
|
||||||
|
label="Новый статус"
|
||||||
|
field={SelectField}
|
||||||
|
fieldProps={{ choices: equipmentStatusChoices }}
|
||||||
|
/>
|
||||||
|
<DataTable.Col source="number" label="Номер" />
|
||||||
|
<DataTable.Col source="date" label="Дата изменения статуса" field={DateField} />
|
||||||
|
<DataTable.Col source="responsible" label="Ответственный" />
|
||||||
|
<DataTable.Col source="createdAt" label="Дата создания" field={DateField} />
|
||||||
|
<DataTable.Col>
|
||||||
|
<EditButton />
|
||||||
|
<ShowButton />
|
||||||
|
</DataTable.Col>
|
||||||
|
</DataTable>
|
||||||
|
</List>
|
||||||
|
);
|
||||||
@@ -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 = () => (
|
||||||
|
<Show>
|
||||||
|
<SimpleShowLayout>
|
||||||
|
<ReferenceField
|
||||||
|
source="equipmentId"
|
||||||
|
reference="equipment"
|
||||||
|
label="Оборудование"
|
||||||
|
/>
|
||||||
|
<SelectField
|
||||||
|
source="newStatus"
|
||||||
|
label="Новый статус"
|
||||||
|
choices={equipmentStatusChoices}
|
||||||
|
/>
|
||||||
|
<TextField source="number" label="Номер" />
|
||||||
|
<DateField source="date" label="Дата изменения статуса" />
|
||||||
|
<TextField source="responsible" label="Ответственный" />
|
||||||
|
<DateField source="createdAt" label="Дата создания" />
|
||||||
|
<DateField source="updatedAt" label="Дата обновления" />
|
||||||
|
</SimpleShowLayout>
|
||||||
|
</Show>
|
||||||
|
);
|
||||||
4
frontend/src/resources/change-equipment-status/index.ts
Normal file
4
frontend/src/resources/change-equipment-status/index.ts
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
export { ChangeEquipmentStatusList } from './ChangeEquipmentStatusList';
|
||||||
|
export { ChangeEquipmentStatusEdit } from './ChangeEquipmentStatusEdit';
|
||||||
|
export { ChangeEquipmentStatusCreate } from './ChangeEquipmentStatusCreate';
|
||||||
|
export { ChangeEquipmentStatusShow } from './ChangeEquipmentStatusShow';
|
||||||
24
frontend/src/resources/equipment/EquipmentCreate.tsx
Normal file
24
frontend/src/resources/equipment/EquipmentCreate.tsx
Normal file
@@ -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 = () => (
|
||||||
|
<Create>
|
||||||
|
<SimpleForm>
|
||||||
|
<TextInput source="name" label="Название оборудования" fullWidth required />
|
||||||
|
<TextInput source="serialNumber" label="Заводской (серийный) номер" fullWidth required />
|
||||||
|
<DateInput source="dateOfInspection" label="Дата поверки" />
|
||||||
|
<DateInput source="commissionedAt" label="Дата изготовления" />
|
||||||
|
<SelectInput
|
||||||
|
source="status"
|
||||||
|
label="Текущий статус"
|
||||||
|
choices={equipmentStatusChoices}
|
||||||
|
/>
|
||||||
|
</SimpleForm>
|
||||||
|
</Create>
|
||||||
|
);
|
||||||
25
frontend/src/resources/equipment/EquipmentEdit.tsx
Normal file
25
frontend/src/resources/equipment/EquipmentEdit.tsx
Normal file
@@ -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 = () => (
|
||||||
|
<Edit>
|
||||||
|
<SimpleForm>
|
||||||
|
<TextInput disabled source="id" label="Идентификатор" />
|
||||||
|
<TextInput source="name" label="Название оборудования" fullWidth />
|
||||||
|
<TextInput source="serialNumber" label="Заводской (серийный) номер" fullWidth />
|
||||||
|
<DateInput source="dateOfInspection" label="Дата поверки" />
|
||||||
|
<DateInput source="commissionedAt" label="Дата изготовления" />
|
||||||
|
<SelectInput
|
||||||
|
source="status"
|
||||||
|
label="Текущий статус"
|
||||||
|
choices={equipmentStatusChoices}
|
||||||
|
/>
|
||||||
|
</SimpleForm>
|
||||||
|
</Edit>
|
||||||
|
);
|
||||||
43
frontend/src/resources/equipment/EquipmentList.tsx
Normal file
43
frontend/src/resources/equipment/EquipmentList.tsx
Normal file
@@ -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 = () => (
|
||||||
|
<List>
|
||||||
|
<DataTable>
|
||||||
|
<DataTable.Col source="id" />
|
||||||
|
<DataTable.Col source="name" label="Название" />
|
||||||
|
<DataTable.Col source="serialNumber" label="Серийный номер" />
|
||||||
|
<DataTable.Col
|
||||||
|
source="dateOfInspection"
|
||||||
|
label="Дата поверки"
|
||||||
|
field={DateField}
|
||||||
|
/>
|
||||||
|
<DataTable.Col
|
||||||
|
source="commissionedAt"
|
||||||
|
label="Дата изготовления"
|
||||||
|
field={DateField}
|
||||||
|
/>
|
||||||
|
<DataTable.Col
|
||||||
|
source="status"
|
||||||
|
label="Статус"
|
||||||
|
field={SelectField}
|
||||||
|
fieldProps={{ choices: equipmentStatusChoices }}
|
||||||
|
/>
|
||||||
|
<DataTable.Col
|
||||||
|
source="createdAt"
|
||||||
|
label="Дата создания"
|
||||||
|
field={DateField}
|
||||||
|
/>
|
||||||
|
<DataTable.Col>
|
||||||
|
<EditButton />
|
||||||
|
<ShowButton />
|
||||||
|
</DataTable.Col>
|
||||||
|
</DataTable>
|
||||||
|
</List>
|
||||||
|
);
|
||||||
27
frontend/src/resources/equipment/EquipmentShow.tsx
Normal file
27
frontend/src/resources/equipment/EquipmentShow.tsx
Normal file
@@ -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 = () => (
|
||||||
|
<Show>
|
||||||
|
<SimpleShowLayout>
|
||||||
|
<TextField source="id" label="Идентификатор" />
|
||||||
|
<TextField source="name" label="Название оборудования" />
|
||||||
|
<TextField source="serialNumber" label="Заводской (серийный) номер" />
|
||||||
|
<DateField source="dateOfInspection" label="Дата поверки" />
|
||||||
|
<DateField source="commissionedAt" label="Дата изготовления" />
|
||||||
|
<SelectField
|
||||||
|
source="status"
|
||||||
|
label="Текущий статус"
|
||||||
|
choices={equipmentStatusChoices}
|
||||||
|
/>
|
||||||
|
<DateField source="createdAt" label="Дата создания" />
|
||||||
|
<DateField source="updatedAt" label="Дата обновления" />
|
||||||
|
</SimpleShowLayout>
|
||||||
|
</Show>
|
||||||
|
);
|
||||||
4
frontend/src/resources/equipment/index.ts
Normal file
4
frontend/src/resources/equipment/index.ts
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
export { EquipmentList } from './EquipmentList';
|
||||||
|
export { EquipmentEdit } from './EquipmentEdit';
|
||||||
|
export { EquipmentCreate } from './EquipmentCreate';
|
||||||
|
export { EquipmentShow } from './EquipmentShow';
|
||||||
Reference in New Issue
Block a user