@fleetbase/fleetops-engine 0.6.55 → 0.6.57
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/addon/components/admin/map-settings.hbs +1 -1
- package/addon/components/ai/create-order-preview.hbs +297 -0
- package/addon/components/ai/create-order-preview.js +362 -0
- package/addon/components/ai/route-preview-map.hbs +79 -0
- package/addon/components/ai/route-preview-map.js +527 -0
- package/addon/components/device/details.js +1 -1
- package/addon/components/device-event/details.hbs +192 -0
- package/addon/components/device-event/details.js +151 -0
- package/addon/components/driver/schedule.js +1 -1
- package/addon/components/fleet/details.hbs +21 -8
- package/addon/components/fleet/details.js +55 -1
- package/addon/components/fleet/hierarchy-tree.hbs +137 -0
- package/addon/components/fleet/hierarchy-tree.js +528 -0
- package/addon/components/layout/fleet-ops-sidebar.js +15 -9
- package/addon/components/map/drawer/device-event-listing.js +1 -0
- package/addon/components/map/drawer/driver-listing.js +1 -0
- package/addon/components/map/drawer/place-listing.js +1 -0
- package/addon/components/map/drawer/vehicle-listing.js +1 -0
- package/addon/components/order/details.hbs +34 -1
- package/addon/components/order/form/details.hbs +4 -0
- package/addon/components/order/form.hbs +9 -1
- package/addon/components/telematic/details.hbs +1 -1
- package/addon/components/telematic/form.hbs +2 -2
- package/addon/components/telematic/settings.hbs +1 -1
- package/addon/components/vehicle/card.hbs +14 -2
- package/addon/components/vehicle/form.hbs +13 -1
- package/addon/controllers/connectivity/devices/index/details/events.js +1 -1
- package/addon/controllers/connectivity/devices/index/details/vehicle.js +2 -2
- package/addon/controllers/connectivity/events/details.js +68 -1
- package/addon/controllers/connectivity/sensors/index.js +4 -0
- package/addon/controllers/connectivity/telematics/details/events.js +1 -1
- package/addon/controllers/connectivity/telematics/details/sensors.js +4 -0
- package/addon/controllers/settings/map.js +19 -0
- package/addon/extension.js +14 -0
- package/addon/instance-initializers/register-vroom-allocation.js +1 -1
- package/addon/routes/connectivity/events/details.js +26 -1
- package/addon/routes/management/fleets/index/details.js +1 -1
- package/addon/routes/management/vehicles/index/details.js +3 -1
- package/addon/services/map-adapter/google.js +66 -1
- package/addon/services/map-adapter/leaflet.js +1 -1
- package/addon/services/map-adapter-interface.js +1 -1
- package/addon/services/map-manager.js +16 -1
- package/addon/services/map-settings.js +15 -0
- package/addon/styles/fleetops-engine.css +487 -1
- package/addon/templates/connectivity/devices/index/details/vehicle.hbs +2 -1
- package/addon/templates/connectivity/events/details.hbs +40 -1
- package/addon/templates/settings/map.hbs +38 -9
- package/addon/utils/leaflet-plugin-loader.js +5 -5
- package/addon/utils/map-drawer-dropdown-position.js +11 -13
- package/addon/utils/route-colors.js +1 -1
- package/app/components/ai/create-order-preview.js +1 -0
- package/app/components/ai/route-preview-map.js +1 -0
- package/app/components/device-event/details.hbs +192 -0
- package/app/components/device-event/details.js +1 -0
- package/app/components/fleet/hierarchy-tree.js +1 -0
- package/app/services/route-engine.js +1 -0
- package/composer.json +1 -1
- package/extension.json +1 -1
- package/package.json +6 -4
- package/scripts/normalize-rgba-alpha.js +90 -0
- package/server/migrations/2026_06_23_000001_delete_bad_afaqy_telematics_sensors.php +34 -0
- package/server/src/Exports/ContactExport.php +12 -5
- package/server/src/Exports/DeviceExport.php +92 -0
- package/server/src/Exports/DriverExport.php +28 -3
- package/server/src/Exports/EquipmentExport.php +94 -0
- package/server/src/Exports/FleetExport.php +22 -7
- package/server/src/Exports/FuelReportExport.php +16 -1
- package/server/src/Exports/IssueExport.php +25 -3
- package/server/src/Exports/MaintenanceExport.php +106 -0
- package/server/src/Exports/MaintenanceScheduleExport.php +99 -0
- package/server/src/Exports/OrderExport.php +24 -5
- package/server/src/Exports/PartExport.php +99 -0
- package/server/src/Exports/PlaceExport.php +33 -7
- package/server/src/Exports/SensorExport.php +94 -0
- package/server/src/Exports/ServiceAreaExport.php +31 -7
- package/server/src/Exports/ServiceRateExport.php +41 -1
- package/server/src/Exports/TelematicExport.php +90 -0
- package/server/src/Exports/VehicleExport.php +274 -8
- package/server/src/Exports/VendorExport.php +15 -2
- package/server/src/Exports/WorkOrderExport.php +92 -0
- package/server/src/Http/Controllers/Api/v1/Concerns/ResolvesFleetOpsApiResources.php +176 -0
- package/server/src/Http/Controllers/Api/v1/DeviceController.php +225 -0
- package/server/src/Http/Controllers/Api/v1/EquipmentController.php +114 -0
- package/server/src/Http/Controllers/Api/v1/FuelTransactionController.php +185 -0
- package/server/src/Http/Controllers/Api/v1/PartController.php +120 -0
- package/server/src/Http/Controllers/Api/v1/SensorController.php +132 -0
- package/server/src/Http/Controllers/Api/v1/WorkOrderController.php +161 -0
- package/server/src/Http/Controllers/Internal/v1/DeviceController.php +18 -0
- package/server/src/Http/Controllers/Internal/v1/EquipmentController.php +17 -0
- package/server/src/Http/Controllers/Internal/v1/MaintenanceController.php +17 -0
- package/server/src/Http/Controllers/Internal/v1/MaintenanceScheduleController.php +17 -0
- package/server/src/Http/Controllers/Internal/v1/PartController.php +17 -0
- package/server/src/Http/Controllers/Internal/v1/SensorController.php +18 -0
- package/server/src/Http/Controllers/Internal/v1/SettingController.php +29 -5
- package/server/src/Http/Controllers/Internal/v1/TelematicController.php +18 -0
- package/server/src/Http/Controllers/Internal/v1/WorkOrderController.php +17 -0
- package/server/src/Http/Filter/DeviceFilter.php +33 -10
- package/server/src/Http/Filter/EquipmentFilter.php +23 -0
- package/server/src/Http/Filter/FuelProviderTransactionFilter.php +57 -2
- package/server/src/Http/Filter/PartFilter.php +47 -0
- package/server/src/Http/Filter/SensorFilter.php +34 -6
- package/server/src/Http/Filter/WorkOrderFilter.php +23 -0
- package/server/src/Http/Requests/CreateDeviceRequest.php +51 -0
- package/server/src/Http/Requests/CreateEquipmentRequest.php +35 -0
- package/server/src/Http/Requests/CreateFuelTransactionRequest.php +50 -0
- package/server/src/Http/Requests/CreatePartRequest.php +40 -0
- package/server/src/Http/Requests/CreateSensorRequest.php +47 -0
- package/server/src/Http/Requests/CreateWorkOrderRequest.php +42 -0
- package/server/src/Http/Requests/UpdateDeviceRequest.php +7 -0
- package/server/src/Http/Requests/UpdateEquipmentRequest.php +7 -0
- package/server/src/Http/Requests/UpdateFuelTransactionRequest.php +7 -0
- package/server/src/Http/Requests/UpdatePartRequest.php +7 -0
- package/server/src/Http/Requests/UpdateSensorRequest.php +7 -0
- package/server/src/Http/Requests/UpdateWorkOrderRequest.php +7 -0
- package/server/src/Http/Resources/v1/Device.php +72 -0
- package/server/src/Http/Resources/v1/Equipment.php +57 -0
- package/server/src/Http/Resources/v1/Fleet.php +8 -2
- package/server/src/Http/Resources/v1/FuelTransaction.php +69 -0
- package/server/src/Http/Resources/v1/Part.php +64 -0
- package/server/src/Http/Resources/v1/Sensor.php +68 -0
- package/server/src/Jobs/SyncTelematicDevicesJob.php +194 -38
- package/server/src/Models/Driver.php +6 -0
- package/server/src/Models/Order.php +20 -7
- package/server/src/Models/Place.php +11 -3
- package/server/src/Observers/PurchaseRateObserver.php +2 -1
- package/server/src/Providers/FleetOpsServiceProvider.php +26 -0
- package/server/src/Support/Ai/Capabilities/AbstractFleetOpsAICapability.php +88 -0
- package/server/src/Support/Ai/Capabilities/AssetStatusCapability.php +108 -0
- package/server/src/Support/Ai/Capabilities/ConsoleNavigationCapability.php +55 -0
- package/server/src/Support/Ai/Capabilities/CreateOrderPreviewCapability.php +508 -0
- package/server/src/Support/Ai/Capabilities/DocsHelpCapability.php +49 -0
- package/server/src/Support/Ai/Capabilities/ImportOrdersPreviewCapability.php +66 -0
- package/server/src/Support/Ai/Capabilities/OperationalQueryCapability.php +319 -0
- package/server/src/Support/Ai/Capabilities/OptimizeOrderRouteCapability.php +240 -0
- package/server/src/Support/Ai/Capabilities/OrderInsightsCapability.php +95 -0
- package/server/src/Support/Ai/Capabilities/SearchResourcesCapability.php +195 -0
- package/server/src/Support/Ai/FleetOpsAiQueryResources.php +150 -0
- package/server/src/Support/Analytics/RevenueTrend.php +3 -8
- package/server/src/Support/Metrics/ActiveRevenueQuery.php +121 -0
- package/server/src/Support/Metrics/AvgOrderValueMetric.php +1 -7
- package/server/src/Support/Metrics/EarningsMetric.php +1 -10
- package/server/src/Support/Telematics/Providers/AfaqyProvider.php +104 -5
- package/server/src/Support/Telematics/Providers/SafeeProvider.php +550 -54
- package/server/src/Support/Telematics/TelematicService.php +28 -9
- package/server/src/Support/Utils.php +52 -0
- package/server/src/routes.php +67 -14
- package/server/tests/AiCreateOrderPreviewCapabilityTest.php +131 -0
- package/server/tests/AiOperationalQueryCapabilityTest.php +75 -0
- package/server/tests/ExportCoverageTest.php +79 -0
- package/server/tests/FleetHierarchyResourceTest.php +12 -0
- package/server/tests/MetricsRegistryTest.php +45 -5
- package/server/tests/OrderPayloadPlaceResolutionTest.php +53 -0
- package/server/tests/PointResolutionTest.php +63 -0
- package/server/tests/PublicFleetOpsRestEndpointsTest.php +191 -0
- package/server/tests/TelematicsHardeningTest.php +636 -1
- package/addon/components/table/cell/dropdown/action-item.hbs +0 -31
- package/addon/components/table/cell/dropdown/action-item.js +0 -62
- package/addon/components/table/cell/dropdown.hbs +0 -28
- package/addon/components/table/cell/dropdown.js +0 -91
- package/app/components/table/cell/dropdown/action-item.js +0 -1
- package/app/components/table/cell/dropdown.js +0 -1
|
@@ -211,12 +211,35 @@ class AfaqyProvider extends AbstractProvider
|
|
|
211
211
|
|
|
212
212
|
public function normalizeSensor(array $payload): array
|
|
213
213
|
{
|
|
214
|
+
$unitId = $payload['device_id'] ?? $payload['unit_id'] ?? $payload['vehicle_id'] ?? null;
|
|
215
|
+
$sensorIdentity = $this->resolveSensorIdentity($payload);
|
|
216
|
+
$sensorName = $this->resolveSensorName($payload, $sensorIdentity);
|
|
217
|
+
$value = $this->resolveSensorValue($payload);
|
|
218
|
+
|
|
219
|
+
if (!$unitId || !$sensorIdentity || !$sensorName || !$this->isSensorValue($value)) {
|
|
220
|
+
throw new \InvalidArgumentException('AFAQY sensor payload does not contain a stable identity and scalar latest value.');
|
|
221
|
+
}
|
|
222
|
+
|
|
223
|
+
$type = $this->normalizeSensorType($payload, $sensorName);
|
|
224
|
+
$internalId = implode(':', ['afaqy', $unitId, $this->sensorIdentityPart($sensorIdentity)]);
|
|
225
|
+
|
|
214
226
|
return [
|
|
215
|
-
'
|
|
216
|
-
'
|
|
217
|
-
'
|
|
218
|
-
'
|
|
219
|
-
'
|
|
227
|
+
'internal_id' => $internalId,
|
|
228
|
+
'external_id' => $internalId,
|
|
229
|
+
'name' => $sensorName,
|
|
230
|
+
'type' => $type,
|
|
231
|
+
'sensor_type' => $type,
|
|
232
|
+
'value' => $value,
|
|
233
|
+
'unit' => $payload['unit'] ?? $payload['units'] ?? data_get($payload, 'last_val.unit'),
|
|
234
|
+
'recorded_at' => $this->parseTimestamp(data_get($payload, 'last_val.dtt') ?? data_get($payload, 'last_update.dtt') ?? $payload['updated_at'] ?? $payload['created_at'] ?? null),
|
|
235
|
+
'status' => 'active',
|
|
236
|
+
'meta' => array_filter([
|
|
237
|
+
'provider' => 'afaqy',
|
|
238
|
+
'unit_id' => $unitId,
|
|
239
|
+
'provider_sensor_id' => $sensorIdentity,
|
|
240
|
+
'sensor_key' => $payload['sensor_key'] ?? null,
|
|
241
|
+
'raw' => $payload,
|
|
242
|
+
], fn ($value) => $value !== null),
|
|
220
243
|
];
|
|
221
244
|
}
|
|
222
245
|
|
|
@@ -477,4 +500,80 @@ class AfaqyProvider extends AbstractProvider
|
|
|
477
500
|
?? data_get($payload, 'fc.level')
|
|
478
501
|
?? null;
|
|
479
502
|
}
|
|
503
|
+
|
|
504
|
+
protected function resolveSensorIdentity(array $payload): ?string
|
|
505
|
+
{
|
|
506
|
+
$value = $payload['_id']
|
|
507
|
+
?? $payload['id']
|
|
508
|
+
?? $payload['sensor_id']
|
|
509
|
+
?? $payload['ident']
|
|
510
|
+
?? $payload['param']
|
|
511
|
+
?? $payload['sensor_key']
|
|
512
|
+
?? $payload['name']
|
|
513
|
+
?? data_get($payload, 'sensor.name');
|
|
514
|
+
|
|
515
|
+
if ($value === null || $value === '') {
|
|
516
|
+
return null;
|
|
517
|
+
}
|
|
518
|
+
|
|
519
|
+
return (string) $value;
|
|
520
|
+
}
|
|
521
|
+
|
|
522
|
+
protected function resolveSensorName(array $payload, ?string $fallback = null): ?string
|
|
523
|
+
{
|
|
524
|
+
$value = $payload['name']
|
|
525
|
+
?? data_get($payload, 'sensor.name')
|
|
526
|
+
?? $payload['param']
|
|
527
|
+
?? $payload['sensor_key']
|
|
528
|
+
?? $fallback;
|
|
529
|
+
|
|
530
|
+
if ($value === null || $value === '') {
|
|
531
|
+
return null;
|
|
532
|
+
}
|
|
533
|
+
|
|
534
|
+
return (string) $value;
|
|
535
|
+
}
|
|
536
|
+
|
|
537
|
+
protected function resolveSensorValue(array $payload): mixed
|
|
538
|
+
{
|
|
539
|
+
if (array_key_exists('value', $payload)) {
|
|
540
|
+
return $payload['value'];
|
|
541
|
+
}
|
|
542
|
+
|
|
543
|
+
return data_get($payload, 'last_val.value')
|
|
544
|
+
?? data_get($payload, 'last_update.value')
|
|
545
|
+
?? data_get($payload, 'last_update.val')
|
|
546
|
+
?? data_get($payload, 'last_update.state');
|
|
547
|
+
}
|
|
548
|
+
|
|
549
|
+
protected function isSensorValue(mixed $value): bool
|
|
550
|
+
{
|
|
551
|
+
return $value !== null && is_scalar($value);
|
|
552
|
+
}
|
|
553
|
+
|
|
554
|
+
protected function normalizeSensorType(array $payload, string $sensorName): string
|
|
555
|
+
{
|
|
556
|
+
$providerType = (string) ($payload['sensor_type'] ?? $payload['type'] ?? $payload['param'] ?? '');
|
|
557
|
+
$type = strtolower(trim($providerType . ' ' . $sensorName));
|
|
558
|
+
|
|
559
|
+
return match (true) {
|
|
560
|
+
str_contains($type, 'door') => 'door',
|
|
561
|
+
str_contains($type, 'temp') => 'temperature',
|
|
562
|
+
str_contains($type, 'humid') => 'humidity',
|
|
563
|
+
str_contains($type, 'fuel') => 'fuel',
|
|
564
|
+
str_starts_with($type, 'di') || str_contains($type, 'digital') => 'digital',
|
|
565
|
+
str_starts_with($type, 'ai') || str_contains($type, 'analog') => 'analog',
|
|
566
|
+
str_contains($type, 'battery') || str_contains($type, 'voltage') => 'voltage',
|
|
567
|
+
default => $this->sensorIdentityPart($type) ?: 'generic',
|
|
568
|
+
};
|
|
569
|
+
}
|
|
570
|
+
|
|
571
|
+
protected function sensorIdentityPart(string $value): string
|
|
572
|
+
{
|
|
573
|
+
$normalized = strtolower(trim($value));
|
|
574
|
+
$normalized = preg_replace('/[^a-z0-9]+/i', '_', $normalized) ?? '';
|
|
575
|
+
$normalized = trim($normalized, '_');
|
|
576
|
+
|
|
577
|
+
return $normalized !== '' ? $normalized : 'sensor';
|
|
578
|
+
}
|
|
480
579
|
}
|