Jing Li 2023-12-30 23:41:11 +08:00
parent b46e1ff1c6
commit 53c44e8165
2 changed files with 25 additions and 37 deletions

View File

@ -64,17 +64,13 @@ class MonitorDeviceHealthCommand extends Command
); );
foreach ($result['data'] as $item) { foreach ($result['data'] as $item) {
$device = Device::supplierBy('device-supplier-yidong') Device::where('sn', $item['deviceId'])
->where('supplier_key', 'device-supplier-yidong')
->where('type', DeviceType::Monitor) ->where('type', DeviceType::Monitor)
->where('sn', $item['deviceId']) ->whereIn('status', [DeviceStatus::Online, DeviceStatus::Offline])
->first(); ->update([
if (! in_array($device?->status, [DeviceStatus::Online, DeviceStatus::Offline])) {
continue;
}
$device->update([
'status' => $item['deviceStatus'] === 1 ? DeviceStatus::Online : DeviceStatus::Offline, 'status' => $item['deviceStatus'] === 1 ? DeviceStatus::Online : DeviceStatus::Offline,
'updated_at' => now(),
]); ]);
} }
@ -96,31 +92,23 @@ class MonitorDeviceHealthCommand extends Command
], ],
); );
$devices = Device::supplierBy('device-supplier-dianxin') foreach ($result['data'] as $item) {
Device::where('sn', $item['channelcode'])
->where('supplier_key', 'device-supplier-dianxin')
->where('type', DeviceType::Monitor) ->where('type', DeviceType::Monitor)
->whereIn('status', [DeviceStatus::Online, DeviceStatus::Offline]) ->whereIn('status', [DeviceStatus::Online, DeviceStatus::Offline])
->get(); ->update([
'extends' => json_encode([
foreach ($devices as $device) {
foreach ($result['data'] as $item) {
if ($device->sn !== $item['channelcode']) {
continue;
}
$device->update([
'extends' => [
'ip' => '', 'ip' => '',
'port' => '', 'port' => '',
'username' => '', 'username' => '',
'password' => '', 'password' => '',
'passage' => $item['citId'], 'passage' => $item['citId'],
'rtsp_url' => '', 'rtsp_url' => '',
], ]),
'status' => $item['channelstatus'] === 1 ? DeviceStatus::Online : DeviceStatus::Offline, 'status' => $item['channelstatus'] === 1 ? DeviceStatus::Online : DeviceStatus::Offline,
'updated_at' => now(),
]); ]);
break;
}
} }
} }
} }

View File

@ -33,7 +33,7 @@ class HttpClient
'headers' => $headers, 'headers' => $headers,
'json' => $data, 'json' => $data,
]); ]);
} catch (YiDongException $e) { } catch (QlyException $e) {
throw $e; throw $e;
} }
} }