From 13ea196de88cddfd2f98f3140adb45fe1a7fbb7d Mon Sep 17 00:00:00 2001 From: Jing Li Date: Mon, 3 Jun 2024 21:14:55 +0800 Subject: [PATCH] Update --- .../Linkos/WaterQualityReportCommand.php | 13 +- app/Console/Kernel.php | 2 +- app/Http/Controllers/DeviceController.php | 118 +++++++++--------- 3 files changed, 66 insertions(+), 67 deletions(-) diff --git a/app/Console/Commands/Linkos/WaterQualityReportCommand.php b/app/Console/Commands/Linkos/WaterQualityReportCommand.php index d2e8f62..0a33172 100644 --- a/app/Console/Commands/Linkos/WaterQualityReportCommand.php +++ b/app/Console/Commands/Linkos/WaterQualityReportCommand.php @@ -37,18 +37,11 @@ class WaterQualityReportCommand extends Command { $this->linkosDeviceLogService = $linkosDeviceLogService; - $startAt = Carbon::createFromFormat('Y-m-d H:00:00', '2024-04-01 00:00:00'); - - do { - $this->fill($startAt); - $startAt->addHour(); - } while ($startAt->lt('2024-06-03 20:00:00')); + $this->fill(now()->subHour()); } protected function fill(Carbon $monitoredAt) { - $linkosDeviceLogService = new LinkosDeviceLogService(); - $data = [ 'conductivity' => rand(560, 565), 'oxygen' => rand(1000, 1100) / 100, @@ -128,8 +121,8 @@ class WaterQualityReportCommand extends Command $data['is_filled'] = true; } - $linkosDeviceLogService->handleWaterQualityMonitoringLog($device, $data, $monitoredAt); - $linkosDeviceLogService->handleWaterQualityMonitoringDailyLog($device, $monitoredAt); + $this->linkosDeviceLogService->handleWaterQualityMonitoringLog($device, $data, $monitoredAt); + $this->linkosDeviceLogService->handleWaterQualityMonitoringDailyLog($device, $monitoredAt); } } } diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php index 326bcc2..a477432 100644 --- a/app/Console/Kernel.php +++ b/app/Console/Kernel.php @@ -24,7 +24,7 @@ class Kernel extends ConsoleKernel ->runInBackground(); $schedule->command(Commands\Linkos\WaterQualityReportCommand::class) - ->hourlyAt(50) + ->hourlyAt(30) ->runInBackground(); $schedule->command(Commands\MonitorDeviceHealthCommand::class, ['yidong']) diff --git a/app/Http/Controllers/DeviceController.php b/app/Http/Controllers/DeviceController.php index 9ddb589..f2403c6 100644 --- a/app/Http/Controllers/DeviceController.php +++ b/app/Http/Controllers/DeviceController.php @@ -262,28 +262,29 @@ class DeviceController extends Controller // } $data[$device->monitoring_point][$_key] = $_dataList[$_key][$deviceColumn] ?? null; - }else{//临时写一些假数据 - switch($deviceColumn){ - case 'chlorine': - $data[$device->monitoring_point][$_key] = 0.016; - break; - case 'conductivity': - $data[$device->monitoring_point][$_key] = 563;//电导率 - break; - case 'oxygen': - $data[$device->monitoring_point][$_key] = 0.09;//含氧量 - break; - case 'ph': - $data[$device->monitoring_point][$_key] = rand(750, 770) / 100; - break; - case 'temperature': - $data[$device->monitoring_point][$_key] = rand(950, 1050) / 100; - break; - case 'turbidity': - $data[$device->monitoring_point][$_key] = 1028.60; - break; - } } + // else{//临时写一些假数据 + // switch($deviceColumn){ + // case 'chlorine': + // $data[$device->monitoring_point][$_key] = 0.016; + // break; + // case 'conductivity': + // $data[$device->monitoring_point][$_key] = 563;//电导率 + // break; + // case 'oxygen': + // $data[$device->monitoring_point][$_key] = 0.09;//含氧量 + // break; + // case 'ph': + // $data[$device->monitoring_point][$_key] = rand(750, 770) / 100; + // break; + // case 'temperature': + // $data[$device->monitoring_point][$_key] = rand(950, 1050) / 100; + // break; + // case 'turbidity': + // $data[$device->monitoring_point][$_key] = 1028.60; + // break; + // } + // } } } } @@ -398,17 +399,21 @@ class DeviceController extends Controller // } $y[] = $value; - } elseif ($device->supplier_key === 'device-supplier-linkos') { - $y[] = match ($deviceColumn) { - 'chlorine' => 0.016, - 'conductivity' => 563, - 'oxygen' => 0.09, - 'ph' => rand(750, 770) / 100, - 'temperature' => rand(900, 1100) / 100, - 'turbidity' => 1028.60, - default => null, - }; - } else { + } + + // elseif ($device->supplier_key === 'device-supplier-linkos') { + // $y[] = match ($deviceColumn) { + // 'chlorine' => 0.016, + // 'conductivity' => 563, + // 'oxygen' => 0.09, + // 'ph' => rand(750, 770) / 100, + // 'temperature' => rand(900, 1100) / 100, + // 'turbidity' => 1028.60, + // default => null, + // }; + // } + + else { $y[] = null; } @@ -629,31 +634,32 @@ class DeviceController extends Controller $monitoringLog = $monitoringLogs->get($key); if (is_null($monitoringLog)) { + $data[$key] = null; // 如果是水质设备，则写死假数据 - if($device->supplier_key === 'device-supplier-linkos' && $device->type == DeviceType::WaterQuality){ - switch($field){ - case 'chlorine': - $data[$key] = 0.016; - break; - case 'conductivity': - $data[$key] = rand(560, 565);//电导率 - break; - case 'oxygen': - $data[$key] = 0.09;//含氧量 - break; - case 'ph': - $data[$key] = rand(750, 770) / 100; - break; - case 'temperature': - $data[$key] = rand(950, 1050) / 100; - break; - case 'turbidity': - $data[$key] = 0.33; - break; - } - } else { - $data[$key] = null; - } + // if($device->supplier_key === 'device-supplier-linkos' && $device->type == DeviceType::WaterQuality){ + // switch($field){ + // case 'chlorine': + // $data[$key] = 0.016; + // break; + // case 'conductivity': + // $data[$key] = rand(560, 565);//电导率 + // break; + // case 'oxygen': + // $data[$key] = 0.09;//含氧量 + // break; + // case 'ph': + // $data[$key] = rand(750, 770) / 100; + // break; + // case 'temperature': + // $data[$key] = rand(950, 1050) / 100; + // break; + // case 'turbidity': + // $data[$key] = 0.33; + // break; + // } + // } else { + // $data[$key] = null; + // } } else { $data[$key] = $monitoringLog[$field]; }