From e9d061b6ffc7edbc18f32242242d8988019e62e2 Mon Sep 17 00:00:00 2001 From: Nikhil Kadam Date: Fri, 23 May 2025 17:33:44 +0530 Subject: [PATCH] Add graph parameters for Oil device --- .../APIS/CustomerApi/TelemetryController.php | 8 ++++---- app/Http/Helpers/Webhelper.php | 20 +++++++++++-------- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/app/Http/Controllers/APIS/CustomerApi/TelemetryController.php b/app/Http/Controllers/APIS/CustomerApi/TelemetryController.php index 1b76a99..c841ca1 100644 --- a/app/Http/Controllers/APIS/CustomerApi/TelemetryController.php +++ b/app/Http/Controllers/APIS/CustomerApi/TelemetryController.php @@ -1375,9 +1375,9 @@ class TelemetryController extends Controller $key2 = explode(',', $parameters[$deviceProfileId]['keyNameList2']); $x1 = TimeseriesKeyMaster::where('key_name', $key1[0])->first('display_name'); - $x2 = TimeseriesKeyMaster::where('key_name', $key1[1])->first('display_name'); + $x2 = array_key_exists(1, $key1) ? TimeseriesKeyMaster::where('key_name', $key1[1])->first('display_name') : null; $y1 = TimeseriesKeyMaster::where('key_name', $key2[0])->first('display_name'); - $y2 = TimeseriesKeyMaster::where('key_name', $key2[1])->first('display_name'); + $y2 = array_key_exists(1, $key2) ? TimeseriesKeyMaster::where('key_name', $key2[1])->first('display_name') : null; $min1 = $key1[0] === 'PowerLoss_value' ? 0 : 0; $max1 = $key1[0] === 'PowerLoss_value' ? 10 : 100; @@ -1405,11 +1405,11 @@ class TelemetryController extends Controller } $graph1['y1'] = ['name' => $x1['display_name'], 'min' => $min1, 'max' => $max1]; - $graph1['y2'] = ['name' => $x2['display_name'], 'min' => 0, 'max' => 50000]; + $graph1['y2'] = $x2 ? ['name' => $x2['display_name'], 'min' => 0, 'max' => 50000] : null; $graph1[$date] = $value1; $graph2['y1'] = ['name' => $y1['display_name'], 'min' => 0, 'max' => 100]; - $graph2['y2'] = ['name' => $y2['display_name'], 'min' => 0, 'max' => 50000]; + $graph2['y2'] = $y2 ? ['name' => $y2['display_name'], 'min' => 0, 'max' => 50000] : null; $graph2[$date] = $value2; } diff --git a/app/Http/Helpers/Webhelper.php b/app/Http/Helpers/Webhelper.php index ed747d7..81146ee 100644 --- a/app/Http/Helpers/Webhelper.php +++ b/app/Http/Helpers/Webhelper.php @@ -377,37 +377,41 @@ function parameters() { $keys = [ - "4e989080-04ad-11f0-a9dc-45dd276e4cd5" => [ + "4e989080-04ad-11f0-a9dc-45dd276e4cd5" => [ // 1. Gas Engine "keyNameList1" => 'PowerLoss_value,ChannelSpeed', "keyNameList2" => 'MechanicalHealth_valueInHealth,ChannelSpeed', ], - "88986090-16b3-11f0-a9dc-45dd276e4cd5" => [ + "88986090-16b3-11f0-a9dc-45dd276e4cd5" => [ // 2. 2 Stroke Engine "keyNameList1" => 'PowerLoss_value,ChannelSpeed', "keyNameList2" => 'MechanicalHealth_valueInHealth,ChannelSpeed', ], - "a7802800-f34d-11ef-a9dc-45dd276e4cd5" => [ + "a7802800-f34d-11ef-a9dc-45dd276e4cd5" => [ // 3. Engine "keyNameList1" => 'PowerLoss_value,ChannelSpeed', "keyNameList2" => 'MechanicalHealth_valueInHealth,ChannelSpeed', ], - "b82d42a0-f34d-11ef-a9dc-45dd276e4cd5" => [ + "b82d42a0-f34d-11ef-a9dc-45dd276e4cd5" => [ // 4. Bearing "keyNameList1" => 'GlobalMixed_valueInPercent,ChannelSpeed', "keyNameList2" => 'BearingGlobal_valueInPercent,ChannelSpeed', ], - "b60d08f0-16b3-11f0-a9dc-45dd276e4cd5" => [ + "b60d08f0-16b3-11f0-a9dc-45dd276e4cd5" => [ // 5. Gearbox "keyNameList1" => 'GlobalMixed_valueInPercent,ChannelSpeed', "keyNameList2" => 'BearingGlobal_valueInPercent,ChannelSpeed', ], - "b13497a0-f34d-11ef-a9dc-45dd276e4cd5" => [ + "b13497a0-f34d-11ef-a9dc-45dd276e4cd5" => [ // 6. Turbine "keyNameList1" => 'RegularityDeviation_valueInPercent,BladeStatus_valueInPercent,ChannelSpeed', "keyNameList2" => 'BearingStatus_valueInPercent,TurbineCoupling_valueInPercent,ChannelSpeed', ], - "72907b10-04ad-11f0-a9dc-45dd276e4cd5" => [ + "72907b10-04ad-11f0-a9dc-45dd276e4cd5" => [ // 7. Gas Turbine "keyNameList1" => 'RegularityDeviation_valueInPercent,BladeStatus_valueInPercent,ChannelSpeed', "keyNameList2" => 'BearingStatus_valueInPercent,TurbineCoupling_valueInPercent,ChannelSpeed', ], - "bfbd2490-f34d-11ef-a9dc-45dd276e4cd5" => [ + "bfbd2490-f34d-11ef-a9dc-45dd276e4cd5" => [ // 8. Torque "keyNameList1" => 'StaticTorque_value,ChannelSpeed', "keyNameList2" => 'StaticPower_value,ChannelSpeed', + ], + "bfd52480-15eb-11f0-a9dc-45dd276e4cd5" => [ // 9. Oil + "keyNameList1" => 'OT', + "keyNameList2" => 'TDN', ] ];