feat: 添加批量操作

Author: kuangshp

src/api/login/login.service.ts

@@ -82,6 +82,7 @@ export class LoginService {
       .createQueryBuilder('account')
       .select('account.id', 'id')
       .addSelect('account.username', 'username')
+      .addSelect('account.tenantId', 'tenantId')
       .addSelect('account.status', 'status')
       .addSelect('account.accountType', 'accountType')
       .addSelect('account.password', 'password')

src/api/login/vo/login.vo.ts

@@ -10,6 +10,7 @@ export class LoginVo {
 export class LoginAccountVo {
   readonly id!: number; // 账号id
   readonly username!: string; // 用户名
+  readonly tenantId!: number; // 商户id
   readonly accountType!: number; // 账号类型:0普通账号,1是主账号,2是超管
   readonly status!: number; // 状态0是正常,1是禁用
   readonly password!: string; // 密码

src/api/tenant/dto/tenant.dto.ts

@@ -11,7 +11,7 @@ export class TenantDto {
   @IsOptional({ message: '商户联系人' })
   username!: string;
 
-  @IsMobilePhone('zh-CN', { strictMode: true }, { message: '手机号码格式错误' })
+  @IsMobilePhone('zh-CN', { strictMode: false }, { message: '手机号码格式错误' })
   @IsOptional({ message: '手机号码' })
   mobile!: string;
 

src/api/tenant/tenant.controller.ts

@@ -10,6 +10,7 @@ import {
   Query,
   UseGuards,
 } from '@nestjs/common';
+import { CurrentUser, ICurrentUserType } from '@src/decorators';
 import { AuthGuard } from '@src/guard/auth.guard';
 import { TenantDto } from './dto/tenant.dto';
 import { QueryTenantDto } from './dto/tenant.query';
@@ -25,14 +26,36 @@ export class TenantController {
     return await this.tenantService.createTenantApi(req);
   }
 
+  @Post('delete')
+  async batchDeleteTenantByIdListApi(
+    @Body() idList: number[],
+    @CurrentUser('userInfo') currentUser: ICurrentUserType
+  ): Promise<string> {
+    return await this.tenantService.batchDeleteTenantByIdListApi(idList, currentUser);
+  }
+
   @Delete(':id')
-  async deleteTenantByIdApi(@Param('id', new ParseIntPipe()) id: number): Promise<string> {
-    return await this.tenantService.deleteTenantByIdApi(id);
+  async deleteTenantByIdApi(
+    @Param('id', new ParseIntPipe()) id: number,
+    @CurrentUser('userInfo') currentUser: ICurrentUserType
+  ): Promise<string> {
+    return await this.tenantService.deleteTenantByIdApi(id, currentUser);
+  }
+
+  @Post('/batchStatus')
+  async batchModifyTenantStatusByIdApi(
+    @Body() idList: number[],
+    @CurrentUser('userInfo') currentUser: ICurrentUserType
+  ): Promise<string> {
+    return await this.tenantService.batchModifyTenantStatusByIdApi(idList, currentUser);
   }
 
   @Put('/status/:id')
-  async modifyTenantStatusByIdApi(@Param('id', new ParseIntPipe()) id: number): Promise<string> {
-    return await this.tenantService.modifyTenantStatusByIdApi(id);
+  async modifyTenantStatusByIdApi(
+    @Param('id', new ParseIntPipe()) id: number,
+    @CurrentUser('userInfo') currentUser: ICurrentUserType
+  ): Promise<string> {
+    return await this.tenantService.modifyTenantStatusByIdApi(id, currentUser);
   }
 
   @Put(':id')

src/api/tenant/tenant.service.ts

@@ -10,6 +10,7 @@ import { TenantPageVo, TenantVo } from './vo/tenant.vo';
 import { AreaEntity } from '../area/entities/area.entity';
 import { mapToObj } from '@src/utils';
 import { AccountEntity } from '../account/entities/account.entity';
+import { ICurrentUserType } from '@src/decorators';
 
 @Injectable()
 export class TenantService {
@@ -42,6 +43,32 @@ export class TenantService {
     return '创建成功';
   }
 
+  /**
+   * @Author: 水痕
+   * @Date: 2023-10-09 20:58:51
+   * @LastEditors: 水痕
+   * @Description: 根据id列表批量删除
+   * @param {number} idList
+   * @return {*}
+   */
+  async batchDeleteTenantByIdListApi(
+    idList: number[],
+    currentUser: ICurrentUserType
+  ): Promise<string> {
+    console.log(idList, '获取到的数据', currentUser);
+    const { tenantId } = currentUser;
+    console.log(tenantId, idList.includes(tenantId), '???');
+    if (idList.includes(tenantId)) {
+      throw new HttpException('自己不能删除自己', HttpStatus.OK);
+    }
+    const { affected } = await this.tenantRepository.softDelete(idList);
+    if (affected) {
+      return '删除成功';
+    } else {
+      return '删除成功';
+    }
+  }
+
   /**
    * @Author: 水痕
    * @Date: 2023-10-07 10:50:10
@@ -50,7 +77,11 @@ export class TenantService {
    * @param {number} id
    * @return {*}
    */
-  async deleteTenantByIdApi(id: number): Promise<string> {
+  async deleteTenantByIdApi(id: number, currentUser: ICurrentUserType): Promise<string> {
+    const { tenantId } = currentUser;
+    if (tenantId == id) {
+      throw new HttpException('自己不能删除自己', HttpStatus.OK);
+    }
     const { affected } = await this.tenantRepository.softDelete(id);
     if (affected) {
       return '删除成功';
@@ -59,6 +90,40 @@ export class TenantService {
     }
   }
 
+  /**
+   * @Author: 水痕
+   * @Date: 2023-10-09 22:06:30
+   * @LastEditors: 水痕
+   * @Description: 批量修改状态
+   * @return {*}
+   */
+  async batchModifyTenantStatusByIdApi(
+    idList: number[],
+    currentUser: ICurrentUserType
+  ): Promise<string> {
+    const { tenantId } = currentUser;
+    if (idList.includes(tenantId)) {
+      throw new HttpException('自己不能修改自己', HttpStatus.OK);
+    }
+    const tenantEntityList: Pick<TenantEntity, 'status'>[] = await this.tenantRepository.find({
+      where: { id: In(idList) },
+      select: ['status'],
+    });
+    if ([...new Set(tenantEntityList.map((item) => item.status))].length > 1) {
+      throw new HttpException('当前状态不统一,不能批量修改', HttpStatus.OK);
+    }
+    const { affected } = await this.tenantRepository.update(idList, {
+      status:
+        tenantEntityList[0]?.status == StatusEnum.FORBIDDEN
+          ? StatusEnum.NORMAL
+          : StatusEnum.FORBIDDEN,
+    });
+    if (affected) {
+      return '修改成功';
+    } else {
+      return '修改失败';
+    }
+  }
   /**
    * @Author: 水痕
    * @Date: 2023-10-07 20:51:30
@@ -67,7 +132,11 @@ export class TenantService {
    * @param {number} id
    * @return {*}
    */
-  async modifyTenantStatusByIdApi(id: number): Promise<string> {
+  async modifyTenantStatusByIdApi(id: number, currentUser: ICurrentUserType): Promise<string> {
+    const { tenantId } = currentUser;
+    if (tenantId == id) {
+      throw new HttpException('自己不能修改自己', HttpStatus.OK);
+    }
     const tenantEntity: Pick<TenantEntity, 'status'> | null = await this.tenantRepository.findOne({
       where: { id },
       select: ['status'],

src/guard/auth.guard.ts

@@ -21,6 +21,7 @@ export class AuthGuard implements CanActivate {
     if (token) {
       // 如果传递了token的话就要从redis中查询是否有该token
       const result = await this.redisService.get(token);
+      console.log(result, '当前数据--->');
       if (result) {
         // 这里我们知道result数据类型就是我们定义的直接断言
         request.user = result;