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

Update

dev
Jing Li 2022-11-23 20:55:48 +08:00
parent 71f4247ece
commit 57237a5048
2 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Console/Commands/SoilMonitoringLogFixCommand.php
View File

@ -76,7 +76,9 @@ class SoilMonitoringLogFixCommand extends Command
$log->save();
$linkosDeviceLogService->handleSoilMonitoringDailyLog($device, $time);
if ($log->wasChanged()) {
$linkosDeviceLogService->handleSoilMonitoringDailyLog($device, $time);
}
} catch (Throwable $e) {
report($e);
}

34
app/Console/Commands/WaterQualityMonitoringLogFixCommand.php
View File

@ -45,10 +45,6 @@ class WaterQualityMonitoringLogFixCommand extends Command
->get();
foreach ($devices as $device) {
if (WaterQualityMonitoringLog::where('device_id', $device->id)->where('monitored_at', $time)->first()) {
continue;
}
$last = WaterQualityMonitoringLog::where('device_id', $device->id)
->where('monitored_at', $time->copy()->subHour())
->first();
@ -58,19 +54,31 @@ class WaterQualityMonitoringLogFixCommand extends Command
}
try {
WaterQualityMonitoringLog::create([
$log = WaterQualityMonitoringLog::firstOrCreate([
'device_id' => $device->id,
'agricultural_base_id' => $device->agricultural_base_id,
'chlorine' => $last->chlorine,
'conductivity' => $last->conductivity,
'oxygen' => $last->oxygen,
'ph' => $last->ph,
'temperature' => $last->temperature,
'turbidity' => $last->turbidity,
'monitored_at' => $time,
], [
'agricultural_base_id' => $device->agricultural_base_id,
]);
$linkosDeviceLogService->handleWaterQualityMonitoringDailyLog($device, $time);
foreach ([
'chlorine',
'conductivity',
'oxygen',
'ph',
'temperature',
'turbidity',
] as $key) {
if (is_null($log->{$key})) {
$log->{$key} = $last->{$key};
}
}
$log->save();
if ($log->wasChanged()) {
$linkosDeviceLogService->handleWaterQualityMonitoringDailyLog($device, $time);
}
} catch (Throwable $e) {
report($e);
}