From 2812832fa5ab325766031bef9cd1b90f488c2094 Mon Sep 17 00:00:00 2001 From: EL <1175065040@qq.com> Date: Thu, 12 Mar 2026 16:00:17 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=98=E6=9B=B4=E8=83=8C=E6=99=AF=EF=BC=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 原用户查询仍为占位实现,未读取数据库 影响范围: 用户列表查询逻辑 用户模块依赖注入配置 相关 TypeScript/ESM 导入路径规范化 feat(users): 接入 Prisma 用户查询并统一 ESM 导入路径 在用户模块中注册 PrismaService 作为 provider,完善依赖注入链路 将 UsersService 的 findAll 实现改为通过 Prisma 查询用户列表 为控制器查询接口补充明确的返回类型定义 统一相关导入语句为 .js 后缀,适配当前 ESM 导入规范 删除已不再使用的用户实体占位文件 --- src/app.module.ts | 2 +- src/users/dto/update-user.dto.ts | 2 +- src/users/entities/user.entity.ts | 1 - src/users/users.controller.ts | 19 ++++++++++++++----- src/users/users.module.ts | 7 ++++--- src/users/users.service.ts | 11 +++++++---- 6 files changed, 27 insertions(+), 15 deletions(-) delete mode 100644 src/users/entities/user.entity.ts diff --git a/src/app.module.ts b/src/app.module.ts index 867c4b1..7980cc5 100644 --- a/src/app.module.ts +++ b/src/app.module.ts @@ -1,5 +1,5 @@ import { Module } from '@nestjs/common'; -import { UsersModule } from './users/users.module'; +import { UsersModule } from './users/users.module.js'; @Module({ imports: [UsersModule], diff --git a/src/users/dto/update-user.dto.ts b/src/users/dto/update-user.dto.ts index dfd37fb..912cdc5 100644 --- a/src/users/dto/update-user.dto.ts +++ b/src/users/dto/update-user.dto.ts @@ -1,4 +1,4 @@ import { PartialType } from '@nestjs/mapped-types'; -import { CreateUserDto } from './create-user.dto'; +import { CreateUserDto } from './create-user.dto.js'; export class UpdateUserDto extends PartialType(CreateUserDto) {} diff --git a/src/users/entities/user.entity.ts b/src/users/entities/user.entity.ts deleted file mode 100644 index 4f82c14..0000000 --- a/src/users/entities/user.entity.ts +++ /dev/null @@ -1 +0,0 @@ -export class User {} diff --git a/src/users/users.controller.ts b/src/users/users.controller.ts index 3eca7eb..4323ea6 100644 --- a/src/users/users.controller.ts +++ b/src/users/users.controller.ts @@ -1,7 +1,16 @@ -import { Controller, Get, Post, Body, Patch, Param, Delete } from '@nestjs/common'; -import { UsersService } from './users.service'; -import { CreateUserDto } from './dto/create-user.dto'; -import { UpdateUserDto } from './dto/update-user.dto'; +import { + Controller, + Get, + Post, + Body, + Patch, + Param, + Delete, +} from '@nestjs/common'; +import { UsersService } from './users.service.js'; +import { CreateUserDto } from './dto/create-user.dto.js'; +import { UpdateUserDto } from './dto/update-user.dto.js'; +import { User } from '../generated/prisma/client.js'; @Controller('users') export class UsersController { @@ -13,7 +22,7 @@ export class UsersController { } @Get() - findAll() { + findAll(): Promise { return this.usersService.findAll(); } diff --git a/src/users/users.module.ts b/src/users/users.module.ts index ecca17a..5b27469 100644 --- a/src/users/users.module.ts +++ b/src/users/users.module.ts @@ -1,9 +1,10 @@ import { Module } from '@nestjs/common'; -import { UsersService } from './users.service'; -import { UsersController } from './users.controller'; +import { UsersService } from './users.service.js'; +import { UsersController } from './users.controller.js'; +import { PrismaService } from '../prisma.service.js'; @Module({ controllers: [UsersController], - providers: [UsersService], + providers: [UsersService, PrismaService], }) export class UsersModule {} diff --git a/src/users/users.service.ts b/src/users/users.service.ts index 0a55903..9c7f481 100644 --- a/src/users/users.service.ts +++ b/src/users/users.service.ts @@ -1,15 +1,18 @@ import { Injectable } from '@nestjs/common'; -import { CreateUserDto } from './dto/create-user.dto'; -import { UpdateUserDto } from './dto/update-user.dto'; +import { CreateUserDto } from './dto/create-user.dto.js'; +import { UpdateUserDto } from './dto/update-user.dto.js'; +import { PrismaService } from '../prisma.service.js'; +import { User } from '../generated/prisma/client.js'; @Injectable() export class UsersService { + constructor(private prisma: PrismaService) {} create(createUserDto: CreateUserDto) { return 'This action adds a new user'; } - findAll() { - return `This action returns all users`; + findAll(): Promise { + return this.prisma.user.findMany(); } findOne(id: number) {