terrylee/star-cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[RELEASE] fix/remote-dispense → main:遠端強制重啟 APP 指令正式上線

Browse Source
This commit is contained in:
sky121113 2026-06-23 14:13:20 +08:00
commit 9e9ed4bc9e
8 changed files with 36 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Admin/RemoteController.php
View File

@ -142,7 +142,7 @@ class RemoteController extends Controller
{
$validated = $request->validate([
'machine_id' => 'required|exists:machines,id',
'command_type' => 'required|string|in:reboot,reboot_card,checkout,lock,unlock,change,dispense,fanon,fanoff,fanauto',
'command_type' => 'required|string|in:reboot,reboot_force,reboot_card,checkout,lock,unlock,change,dispense,fanon,fanoff,fanauto',
'amount' => 'nullable|integer|min:0',
'slot_no' => 'nullable|string',
'note' => 'nullable|string|max:255',

2
app/Jobs/Machine/ProcessCommandAck.php
View File

@ -147,7 +147,7 @@ class ProcessCommandAck implements ShouldQueue
]);
// 記錄維護類指令到機台日誌 (MachineLog)
if (in_array($command->command_type, ['reboot', 'reboot_card', 'lock', 'unlock', 'checkout', 'change', 'reload_stock', 'update_products', 'update_ads', 'update_settings'], true)) {
if (in_array($command->command_type, ['reboot', 'reboot_force', 'reboot_card', 'lock', 'unlock', 'checkout', 'change', 'reload_stock', 'update_products', 'update_ads', 'update_settings'], true)) {
$msgKey = $status === 'success' ? 'log.command.success' : 'log.command.failed';
$level = $status === 'success' ? 'info' : 'warning';

3
lang/en.json
View File

@ -927,6 +927,7 @@
"Identification": "Identification",
"Identity & Codes": "Identity & Codes",
"Identity and Codes": "Identity and Codes",
"Ignore busy state (use when stuck)": "Ignore busy state (use when stuck)",
"Image": "Image",
"Image Downloaded": "Image Downloaded",
"Immediate": "Immediate",
@ -1077,6 +1078,7 @@
"Machine Flavor": "Machine Flavor",
"Machine Flow ID": "Machine Flow ID",
"Machine Flow ID / Time": "Machine Flow ID / Time",
"Machine Force Reboot": "Machine Force Reboot",
"Machine Images": "Machine Images",
"Machine Inbound Confirmation": "Machine Inbound Confirmation",
"Machine Info": "Machine Info",
@ -2422,6 +2424,7 @@
"command.lock": "Lock",
"command.reboot": "Reboot",
"command.reboot_card": "Reboot Card Reader",
"command.reboot_force": "Force Reboot",
"command.reload_stock": "Sync Stock",
"command.unlock": "Unlock",
"command.update_ads": "Sync Ads",

3
lang/ja.json
View File

@ -927,6 +927,7 @@
"Identification": "識別情報",
"Identity & Codes": "識別・コード",
"Identity and Codes": "Identity and Codes",
"Ignore busy state (use when stuck)": "ビジー状態を無視（フリーズ時に使用）",
"Image": "画像",
"Image Downloaded": "画像をダウンロードしました",
"Immediate": "即時",
@ -1077,6 +1078,7 @@
"Machine Flavor": "Machine Flavor",
"Machine Flow ID": "機器フローID",
"Machine Flow ID / Time": "機器フローID / 時間",
"Machine Force Reboot": "アプリ強制再起動",
"Machine Images": "機器写真",
"Machine Inbound Confirmation": "入庫確認",
"Machine Info": "機器情報",
@ -2422,6 +2424,7 @@
"command.lock": "ロック",
"command.reboot": "再起動",
"command.reboot_card": "カードリーダー再起動",
"command.reboot_force": "強制再起動",
"command.reload_stock": "在庫同期",
"command.unlock": "ロック解除",
"command.update_ads": "広告同期",

3
lang/zh_TW.json
View File

@ -927,6 +927,7 @@
"Identification": "識別資訊",
"Identity & Codes": "識別與代碼",
"Identity and Codes": "識別與代碼",
"Ignore busy state (use when stuck)": "無視忙碌狀態（卡死時使用）",
"Image": "圖片",
"Image Downloaded": "圖片已下載",
"Immediate": "立即",
@ -1077,6 +1078,7 @@
"Machine Flavor": "機台風味",
"Machine Flow ID": "機台流水號",
"Machine Flow ID / Time": "機台流水號 / 時間",
"Machine Force Reboot": "強制重啟 APP",
"Machine Images": "機台照片",
"Machine Inbound Confirmation": "機台入庫確認",
"Machine Info": "機台資訊",
@ -2422,6 +2424,7 @@
"command.lock": "鎖機",
"command.reboot": "重啟",
"command.reboot_card": "讀卡機重啟",
"command.reboot_force": "強制重啟",
"command.reload_stock": "同步庫存",
"command.unlock": "解鎖",
"command.update_ads": "同步廣告",

23
resources/views/admin/remote/index.blade.php
View File

@ -34,6 +34,7 @@
'No active cargo lanes found' => __('No active cargo lanes found'),
'Empty' => __('Empty'),
'Machine Reboot' => __('Machine Reboot'),
'Machine Force Reboot' => __('Machine Force Reboot'),
'Card Reader Reboot' => __('Card Reader Reboot'),
'Remote Settlement' => __('Remote Settlement'),
'Lock Page Lock' => __('Lock Page Lock'),
@ -444,6 +445,7 @@
getCommandName(type) {
const names = {
'reboot': this.translations['Machine Reboot'],
'reboot_force': this.translations['Machine Force Reboot'],
'reboot_card': this.translations['Card Reader Reboot'],
'checkout': this.translations['Remote Settlement'],
'lock': this.translations['Lock Page Lock'],
@ -661,6 +663,27 @@
</div>
</button>
<!-- Force Reboot (ignores busy / stuck dialog) -->
<button @click="sendCommand('reboot_force')"
class="p-6 rounded-3xl border border-amber-200 dark:border-amber-500/30 flex items-center gap-5 hover:border-amber-500/60 dark:hover:border-amber-400/70 hover:bg-amber-500/5 dark:hover:bg-amber-400/5 group transition-all bg-white/50 dark:bg-slate-900/40 shadow-sm">
<div
class="w-12 h-12 rounded-2xl bg-amber-500/10 flex items-center justify-center text-amber-500 dark:text-amber-400 group-hover:scale-110 transition-transform duration-500 border border-amber-500/20 dark:border-amber-400/20">
<svg class="w-6 h-6" fill="none" stroke="currentColor"
viewBox="0 0 24 24">
<path stroke-linecap="round" stroke-linejoin="round"
stroke-width="2"
d="M13 10V3L4 14h7v7l9-11h-7z" />
</svg>
</div>
<div class="text-left">
<div
class="text-sm font-black text-slate-800 dark:text-white group-hover:text-amber-600 dark:group-hover:text-amber-400 transition-colors">
{{ __('Machine Force Reboot') }}</div>
<div class="text-[11px] text-slate-400 dark:text-slate-500 mt-0.5">
{{ __('Ignore busy state (use when stuck)') }}</div>
</div>
</button>
<!-- Card Reader Reboot -->
<button @click="sendCommand('reboot_card')"
class="p-6 rounded-3xl border border-slate-100 dark:border-slate-800 flex items-center gap-5 hover:border-cyan-500/50 dark:hover:border-cyan-400/60 hover:bg-cyan-500/5 dark:hover:bg-cyan-400/5 group transition-all bg-white/50 dark:bg-slate-900/40 shadow-sm">

1
resources/views/admin/remote/partials/tab-history-index.blade.php
View File

@ -85,6 +85,7 @@
<div class="w-full sm:w-48">
<x-searchable-select name="command_type" :options="[
'reboot' => __('Machine Reboot'),
'reboot_force' => __('Machine Force Reboot'),
'reboot_card' => __('Card Reader Reboot'),
'checkout' => __('Remote Settlement'),
'lock' => __('Lock Page Lock'),

1
resources/views/admin/remote/stock.blade.php
View File

@ -304,6 +304,7 @@
getCommandName(type) {
const names = {
'reboot': {{ Js::from(__('Machine Reboot')) }},
'reboot_force': {{ Js::from(__('Machine Force Reboot')) }},
'reboot_card': {{ Js::from(__('Card Reader Reboot')) }},
'checkout': {{ Js::from(__('Remote Settlement')) }},
'lock': {{ Js::from(__('Lock Page Lock')) }},