diff --git a/app/Http/Controllers/AlarmControllerCommon.php b/app/Http/Controllers/AlarmControllerCommon.php index 92864cd..b8bf600 100644 --- a/app/Http/Controllers/AlarmControllerCommon.php +++ b/app/Http/Controllers/AlarmControllerCommon.php @@ -40,6 +40,7 @@ class AlarmControllerCommon extends Controller 'propagateToTenant' => true, 'originator' => $request->originator ?? 1, // 'assigneeId' => $request->assigneeId ?? 1, + 'acknowledged' => false, ]; diff --git a/app/Services/AlarmService.php b/app/Services/AlarmService.php index 5b3f93e..9fc7197 100644 --- a/app/Services/AlarmService.php +++ b/app/Services/AlarmService.php @@ -320,8 +320,7 @@ class AlarmService if (!empty($data['deviceId'])) { $deviceId = $data['deviceId']; - } - elseif (!empty($data['assetId'])) { + } elseif (!empty($data['assetId'])) { $deviceId = Device::where('asset_id', $data['assetId'])->value('id'); } @@ -401,6 +400,7 @@ class AlarmService // ], 'details' => $data['details'] ?? [], 'propagate' => $data['propagate'] ?? false, + 'acknowledged' => false, 'propagateToOwner' => $data['propagateToOwner'] ?? false, ];