From 9f0b6741c2a629737dc8f84b640c4ef575dd29d5 Mon Sep 17 00:00:00 2001 From: "allen.yan" Date: Fri, 4 Jul 2025 09:32:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=20=E5=BF=83=E8=B7=B3?= =?UTF-8?q?=E5=B0=81=E5=8C=85=20=E5=95=8F=E9=A1=8C=2020250704?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/RoomControlController.php | 5 ++--- app/Http/Requests/ReceiveRoomRegisterRequest.php | 2 -- database/migrations/2025_05_06_055307_create_rooms_table.php | 2 ++ 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/app/Http/Controllers/RoomControlController.php b/app/Http/Controllers/RoomControlController.php index da242ee..10ba8eb 100644 --- a/app/Http/Controllers/RoomControlController.php +++ b/app/Http/Controllers/RoomControlController.php @@ -169,12 +169,11 @@ class RoomControlController extends Controller if ($room->exists && $room->internal_ip !== $validated['ip']) { $validated['status'] = 'error'; - $room->internal_ip = $validated['ip']; } else { $validated['status'] = 'online'; - $room->internal_ip ??= $validated['ip']; // 新的話補上 } - + $room->internal_ip = $validated['ip']; + $room->port = 1000; $room->is_online=1; $room->touch(); // 更新 updated_at $room->save(); diff --git a/app/Http/Requests/ReceiveRoomRegisterRequest.php b/app/Http/Requests/ReceiveRoomRegisterRequest.php index 2945bd0..3641e41 100644 --- a/app/Http/Requests/ReceiveRoomRegisterRequest.php +++ b/app/Http/Requests/ReceiveRoomRegisterRequest.php @@ -22,8 +22,6 @@ class ReceiveRoomRegisterRequest extends ApiRequest public function rules(): array { return [ - 'room_name' => 'nullable|string', - 'room_ip' => 'nullable|string', 'email' => 'required|email', 'password' => 'required', ]; diff --git a/database/migrations/2025_05_06_055307_create_rooms_table.php b/database/migrations/2025_05_06_055307_create_rooms_table.php index d4468c7..1ace277 100644 --- a/database/migrations/2025_05_06_055307_create_rooms_table.php +++ b/database/migrations/2025_05_06_055307_create_rooms_table.php @@ -24,6 +24,8 @@ return new class extends Migration $table->dateTime('started_at')->nullable()->comment('開始時間'); // $table->dateTime('ended_at')->nullable()->comment('結束時間'); // $table->timestamps(); + // 👇 複合唯一鍵（分店 + 樓層 + 類型 + 包廂名稱） + $table->unique(['branch_id', 'floor', 'type', 'name'], 'unique_room_name_per_branch_floor_type'); }); }