From ceb0e2bf14b3fd251d3719de72176646f605f91d Mon Sep 17 00:00:00 2001
From: xyx <xiongyuxing@gongxue100.com>
Date: Mon, 13 Jul 2026 16:11:53 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=B7=BB=E5=8A=A0=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E5=BA=8A=E4=BD=8D=E7=94=9F=E6=88=90=E9=80=BB=E8=BE=91=E5=B9=B6?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=BA=8A=E4=BD=8D=E6=B7=BB=E5=8A=A0=E9=AA=8C?=
 =?UTF-8?q?=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/admin/src/pages/Rooms/index.tsx   | 21 ++++++++++++------
 apps/server/src/rooms/rooms.service.ts | 30 ++++++++++++++++++++++++--
 2 files changed, 42 insertions(+), 9 deletions(-)

diff --git a/apps/admin/src/pages/Rooms/index.tsx b/apps/admin/src/pages/Rooms/index.tsx
index df2140a..e27ce95 100644
--- a/apps/admin/src/pages/Rooms/index.tsx
+++ b/apps/admin/src/pages/Rooms/index.tsx
@@ -156,6 +156,11 @@ const RoomsPage: React.FC = () => {
     if (filterStatus) result = result.filter((r: Record<string, unknown>) => r.status === filterStatus);
     return result;
   }, [data, searchText, filterBuilding, filterStatus]);
+  const remainingBedSlots = useMemo(() => {
+    const capacity = Number(drawerRoom?.capacity) || 0;
+    return Math.max(capacity - beds.length, 0);
+  }, [drawerRoom?.capacity, beds.length]);
+  const defaultBatchBedCount = Math.min(4, Math.max(remainingBedSlots, 1));
 
   const handleSave = async () => {
     const values = await form.validateFields();
@@ -167,7 +172,7 @@ const RoomsPage: React.FC = () => {
         message.success('更新成功');
       } else {
         await api.post('/rooms', payload);
-        message.success('创建成功');
+        message.success(`创建成功，已自动生成 ${values.capacity} 张床位`);
       }
       setModalOpen(false);
       form.resetFields();
@@ -634,24 +639,26 @@ const RoomsPage: React.FC = () => {
                       type="primary"
                       size="small"
                       icon={<PlusOutlined />}
-                      disabled={drawerRoom?.status === 'archived'}
+                      disabled={drawerRoom?.status === 'archived' || remainingBedSlots === 0}
                       onClick={() => { setBedEditing(null); bedForm.resetFields(); setBedModalOpen(true); }}
                     >
                       添加床位
                     </Button>
                     <Popconfirm
-                      title="批量生成床位"
+                      title={remainingBedSlots > 0 ? '批量生成床位' : '床位已达到额定人数'}
                       description={
-                        <InputNumber min={1} max={20} defaultValue={4} id="batch-bed-count" style={{ width: 80 }} />
+                        remainingBedSlots > 0
+                          ? <InputNumber min={1} max={remainingBedSlots} defaultValue={defaultBatchBedCount} id="batch-bed-count" style={{ width: 80 }} />
+                          : '如需增加床位，请先调整宿舍额定人数'
                       }
                       onConfirm={() => {
                         const input = document.getElementById('batch-bed-count') as HTMLInputElement;
-                        handleBatchBeds(input ? parseInt(input.value) || 4 : 4);
+                        handleBatchBeds(input ? parseInt(input.value) || defaultBatchBedCount : defaultBatchBedCount);
                       }}
                       okText="生成"
-                      disabled={drawerRoom?.status === 'archived'}
+                      disabled={drawerRoom?.status === 'archived' || remainingBedSlots === 0}
                     >
-                      <Button size="small" disabled={drawerRoom?.status === 'archived'}>批量生成</Button>
+                      <Button size="small" disabled={drawerRoom?.status === 'archived' || remainingBedSlots === 0}>批量生成</Button>
                     </Popconfirm>
                   </div>
                   <Table
diff --git a/apps/server/src/rooms/rooms.service.ts b/apps/server/src/rooms/rooms.service.ts
index 42c2f65..b7c9970 100644
--- a/apps/server/src/rooms/rooms.service.ts
+++ b/apps/server/src/rooms/rooms.service.ts
@@ -110,7 +110,9 @@ export class RoomsService {
       roomType: dto.roomType ?? parsed.roomType,
       capacity: dto.capacity ?? parsed.capacity,
     });
-    return this.repo.save(entity);
+    const room = await this.repo.save(entity);
+    await this.createDefaultBeds(room.id, room.capacity);
+    return room;
   }
 
   async update(id: number, dto: UpdateRoomDto) {
@@ -312,7 +314,7 @@ export class RoomsService {
       }
       // 智能解析房间号
       const parsed = RoomsService.parseRoomNumber(row.roomNumber.trim());
-      await this.repo.save(
+      const room = await this.repo.save(
         this.repo.create({
           roomNumber: row.roomNumber.trim(),
           building: row.building?.trim() || parsed.building || undefined,
@@ -323,6 +325,7 @@ export class RoomsService {
           monthlyRate: row.monthlyRate ?? undefined,
         }),
       );
+      await this.createDefaultBeds(room.id, room.capacity);
       imported++;
     }
     return {
@@ -353,6 +356,7 @@ export class RoomsService {
     const room = await this.repo.findOne({ where: { id: roomId } });
     if (!room) throw new NotFoundException('宿舍不存在');
     if (room.status === 'archived') throw new BadRequestException('已归档宿舍不能添加床位');
+    await this.assertCanAddBeds(room, 1);
     const existing = await this.bedRepo.findOne({ where: { roomId, bedNumber: dto.bedNumber } });
     if (existing) throw new BadRequestException('该床位编号已存在');
     const bed = this.bedRepo.create({ ...dto, roomId });
@@ -387,6 +391,7 @@ export class RoomsService {
     if (!room) throw new NotFoundException('宿舍不存在');
     if (room.status === 'archived') throw new BadRequestException('已归档宿舍不能添加床位');
     const existing = await this.bedRepo.find({ where: { roomId }, order: { bedNumber: 'ASC' } });
+    this.assertCanAddBedsFromCount(room, existing.length, dto.count);
     const numbers = existing.map((b) => {
       const match = b.bedNumber.match(/^\d+/);
       return match ? parseInt(match[0]) : 0;
@@ -399,6 +404,27 @@ export class RoomsService {
     return this.bedRepo.save(beds);
   }
 
+  private async createDefaultBeds(roomId: number, capacity: number): Promise<void> {
+    const count = Math.max(capacity ?? 0, 0);
+    if (count === 0) return;
+    const beds = Array.from({ length: count }, (_, index) =>
+      this.bedRepo.create({ roomId, bedNumber: `${index + 1}号床` }),
+    );
+    await this.bedRepo.save(beds);
+  }
+
+  private async assertCanAddBeds(room: Room, count: number): Promise<void> {
+    const existingCount = await this.bedRepo.count({ where: { roomId: room.id } });
+    this.assertCanAddBedsFromCount(room, existingCount, count);
+  }
+
+  private assertCanAddBedsFromCount(room: Room, existingCount: number, count: number): void {
+    const remaining = Math.max((room.capacity ?? 0) - existingCount, 0);
+    if (count > remaining) {
+      throw new BadRequestException(`床位不能超过额定人数，当前已有 ${existingCount} 张，额定 ${room.capacity} 张，最多还能添加 ${remaining} 张`);
+    }
+  }
+
   // ── 柜子管理 ──
 
   async getRoomLockers(roomId: number): Promise<Locker[]> {