fnvtk/cunkebao_v3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

设备管理 - 调整新设备的扫描时间由120秒调整为60秒，降低用户等待时长

Browse Source
This commit is contained in:
柳清爽
2025-04-29 16:48:37 +08:00
parent 79718d36c5
commit bd4f9185bd
2 changed files with 42 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Server/application/superadmin/controller/devices/GetAddResultedDevicesController.php
View File

@@ -45,12 +45,10 @@ class GetAddResultedDevicesController extends Controller
protected function migrateData(int $accountId): void
{
$companyId = $this->getCompanyIdByAccountId($accountId);
$deviceIds = $this->getAllDevicesIdWithInCompany($companyId);
$deviceIds = $this->getAllDevicesIdWithInCompany($companyId) ?: [0];
if ($deviceIds) {
// 从 s2_device 导入数据。
$this->getNewDeviceFromS2_device($deviceIds, $companyId);
}
// 从 s2_device 导入数据。
$this->getNewDeviceFromS2_device($deviceIds, $companyId);
}
/**
@@ -93,14 +91,12 @@ class GetAddResultedDevicesController extends Controller
);
$result = json_decode($result, true);
$result = $result['data']['results'][0];
$result = $result['data']['results'][0] ?? false;
return true;
return (
return $result ? (
// 125是前端延迟5秒 + 轮询120次 1次/s
time() - strtotime($result['lastUpdateTime']) <= 125
);
time() - strtotime($result['lastUpdateTime']) <= 65
) : false;
}
/**