pdkj
/
lcly-data-admin
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update

dev
Jing Li 2023-08-11 20:56:09 +08:00
parent 72f056cf04
commit 56226b84a6
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Console/Commands/BiAng/DeviceLogSyncCommand.php
View File

@ -76,7 +76,7 @@ class DeviceLogSyncCommand extends Command
}); });
try { try {
(new BiAngDeviceLogService())->sync($device, $now); (new BiAngDeviceLogService())->sync($device, $now->copy());
$this->info('同步成功！'); $this->info('同步成功！');
} catch (Throwable $e) { } catch (Throwable $e) {

6
app/Services/BiAngDeviceLogService.php
View File

@ -38,7 +38,7 @@ class BiAngDeviceLogService
]); ]);
$device->update([ $device->update([
'status' => $syncTime->copy()->subMinutes(60)->lt($log->reported_at) ? DeviceStatus::Online : DeviceStatus::Offline, 'status' => $syncTime->subMinutes(60)->lt($log->reported_at) ? DeviceStatus::Online : DeviceStatus::Offline,
]); ]);
break; break;
case DeviceType::Meteorological: case DeviceType::Meteorological:
@ -52,7 +52,7 @@ class BiAngDeviceLogService
]); ]);
$device->update([ $device->update([
'status' => $syncTime->copy()->subMinutes(60)->lt($log->reported_at) ? DeviceStatus::Online : DeviceStatus::Offline, 'status' => $syncTime->subMinutes(60)->lt($log->reported_at) ? DeviceStatus::Online : DeviceStatus::Offline,
]); ]);
break; break;
@ -62,7 +62,7 @@ class BiAngDeviceLogService
if ($data['status'] === 'online') { if ($data['status'] === 'online') {
InsecticidalLampReport::updateOrCreate([ InsecticidalLampReport::updateOrCreate([
'device_id' => $device->id, 'device_id' => $device->id,
'reported_at' => $syncTime->copy()->startOfHour(), 'reported_at' => $syncTime->startOfHour(),
], [ ], [
'battery_vol' => $data['vol'], 'battery_vol' => $data['vol'],
'killed_num' => $data['dct'], 'killed_num' => $data['dct'],