This commit is contained in:
zimoyin
2026-04-09 13:55:39 +08:00
parent 13fd9c5f0a
commit 398e014128
12 changed files with 360 additions and 47 deletions
@@ -127,15 +127,17 @@ class DeviceStatusService extends BaseService
$deviceId = $this->resolveDeviceId($deviceId);
if (!$deviceId) return [];
// 先查一次设备名称,避免 N+1
$device = OpmDsDevice::find($deviceId);
$deviceName = $device->name ?? '';
$cycles = $this->repository->getAllCyclesByDevice($deviceId);
return $cycles->map(function ($item) {
$device = OpmDsDevice::find($item->device_id);
return $cycles->map(function ($item) use ($deviceName) {
return [
'id' => $item->id,
'operation' => $item->operation,
'name' => $device->name ?? '',
'name' => $deviceName,
'created_at' => $item->created_at,
'start_time' => $item->start_time,
'pack' => $item->pack,