sayliR #99

Merged
Sayli.Raut merged 2 commits from sayliR into main 2025-04-24 11:40:37 +00:00
2 changed files with 10 additions and 10 deletions

View File

@@ -30,16 +30,16 @@ class AlarmControllerCommon extends Controller
$alarmData = [
'type' => $request->type ?? null,
'severity' => $request->severity ?? null,
'acknowledged' => false ?? null,
'cleared' => $request->cleared ?? Carbon::now()->timestamp,
'acknowledged' => false,
'cleared' => false,
'startTs' => $request->startTs ?? Carbon::now()->timestamp,
'endTs' => $request->endTs ?? Carbon::now()->timestamp,
'details' => $request->details ?? [],
'propagate' => $request->propagate ?? false,
'propagateToOwner' => $request->propagateToOwner ?? false,
'propagateToTenant' => $request->propagateToTenant ?? false,
'propagate' => true,
'propagateToOwner' => true,
'propagateToTenant' => true,
'originator' => $request->originator ?? 1,
'assigneeId' => $request->assigneeId ?? 1,
// 'assigneeId' => $request->assigneeId ?? 1,
];

View File

@@ -395,10 +395,10 @@ class AlarmService
'id' => $data['originator'] ?? null,
'entityType' => 'DEVICE'
],
'assigneeId' => [
'id' => $data['assigneeId'] ?? null,
'entityType' => 'USER'
],
// 'assigneeId' => [
// 'id' => $data['assigneeId'] ?? null,
// 'entityType' => 'USER'
// ],
'details' => $data['details'] ?? [],
'propagate' => $data['propagate'] ?? false,
'propagateToOwner' => $data['propagateToOwner'] ?? false,