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

View File

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