userAssest
This commit is contained in:
@@ -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,
|
||||
|
||||
|
||||
];
|
||||
@@ -215,8 +215,6 @@ class AlarmControllerCommon extends Controller
|
||||
public function filterAlarm(Request $request)
|
||||
{
|
||||
try {
|
||||
$token = readHeaderToken();
|
||||
$useId = $token['sub'];
|
||||
|
||||
$alarmData = $request->only([
|
||||
'severity',
|
||||
@@ -225,10 +223,11 @@ class AlarmControllerCommon extends Controller
|
||||
'startTs',
|
||||
'endTs',
|
||||
'deviceId',
|
||||
'assetId'
|
||||
'assetId',
|
||||
'assignId',
|
||||
]);
|
||||
|
||||
$apiResponse = $this->alarmService->filterAlarm($alarmData, $useId);
|
||||
$apiResponse = $this->alarmService->filterAlarm($alarmData);
|
||||
|
||||
return jsonResponseWithSuccessMessage('Alarm data retrieved successfully', ['api_response' => $apiResponse]);
|
||||
} catch (Exception $e) {
|
||||
|
||||
Reference in New Issue
Block a user