filter code change

2025-04-02 19:19:04 +05:30
parent 534b6006e0
commit aeae6b0583
4 changed files with 62 additions and 32 deletions
--- a/app/Http/Controllers/AlarmControllerCommon.php
+++ b/app/Http/Controllers/AlarmControllerCommon.php
@@ -158,21 +158,20 @@ class AlarmControllerCommon extends Controller
    public function filterAlarm(Request $request)
    {
        try {
+            $token = readHeaderToken();
+            $useId = $token['sub'];
+
            $alarmData = $request->only([
-                // 'statusList',
                'severity',
-                // 'type',
-                // 'assigneeId',
                'pageSize',
                'page',
-                // 'textSearch',
-                // 'sortProperty',
-                // 'sortOrder',
                'startTs',
-                'endTs'
+                'endTs',
+                'deviceId',
+                'assetId'
            ]);

-            $apiResponse = $this->alarmService->filterAlarm($alarmData);
+            $apiResponse = $this->alarmService->filterAlarm($alarmData, $useId);

            return jsonResponseWithSuccessMessage('Alarm data retrieved successfully', ['api_response' => $apiResponse]);
        } catch (Exception $e) {