diff --git a/app/Http/Controllers/AlarmControllerCommon.php b/app/Http/Controllers/AlarmControllerCommon.php index f7ce8ea..39abb61 100644 --- a/app/Http/Controllers/AlarmControllerCommon.php +++ b/app/Http/Controllers/AlarmControllerCommon.php @@ -243,8 +243,6 @@ class AlarmControllerCommon extends Controller } - - public function getDeviceAlarms(Request $request) { $validator = Validator::make($request->all(), [ diff --git a/app/Services/CustomerInfoService.php b/app/Services/CustomerInfoService.php index 27e7df5..21f5ea1 100644 --- a/app/Services/CustomerInfoService.php +++ b/app/Services/CustomerInfoService.php @@ -543,7 +543,7 @@ class CustomerInfoService } } -public function fetchDeviceAlarms(array $deviceIds) +public function fetchDeviceAlarms(array $deviceIds, $data=[]) { try { $token = $this->adminService->getToken(); @@ -554,8 +554,8 @@ public function fetchDeviceAlarms(array $deviceIds) $url = env('THINGSBOARD_URL') . 'api/alarmsQuery/find'; // Timestamp range (modify as needed) - $startTs = now()->subDays(30)->timestamp * 1000; - $endTs = now()->timestamp * 1000; + $startTs = $data['startTs'] ?? now()->subDays(30)->timestamp * 1000; + $endTs = $data['endTs'] ?? now()->timestamp * 1000; $payload = [ "entityFilter" => [ @@ -569,6 +569,8 @@ public function fetchDeviceAlarms(array $deviceIds) "pageSize" => 100, "page" => 0, "textSearch" => "", + "statusList" => $data['statusList'] ?? [], + "severityList" => $data['severityList'] ?? [], "sortOrder" => [ "key" => [ "type" => "ALARM_FIELD", diff --git a/routes/admin_api.php b/routes/admin_api.php index f8fa871..bfacd41 100644 --- a/routes/admin_api.php +++ b/routes/admin_api.php @@ -8,6 +8,7 @@ use App\Http\Controllers\APIS\AdminApi\AdminDashboardController; use App\Http\Controllers\APIS\AdminApi\CustomerController; use App\Http\Controllers\APIS\AdminApi\UsersController; use App\Http\Controllers\APIS\AdminApi\DeviceController; +use App\Http\Controllers\APIS\CustomerApi\TelemetryController; use Illuminate\Http\Request; use Illuminate\Support\Facades\Route; use App\Http\Controllers\APIS\AdminApi\AssetadmintController; @@ -67,7 +68,7 @@ Route::get('/alarm/{id}', [AlarmControllerCommon::class, 'getAlarmById'])->name( Route::post('/alarm/ack/{id}', [AlarmControllerCommon::class, 'acknowledgeAlarmById'])->name('ack.alarm'); Route::post('/alarm/filter', [AlarmControllerCommon::class, 'filterAlarm'])->name('alarm.filter'); Route::post('/alarm/clear/{id}', [AlarmControllerCommon::class, 'clearAlarmById'])->name('clear.alarm'); - +Route::get('/get-admin-alarms', [TelemetryController::class, 'getAdminAlarms']); //******************************************************* Rule Chain API ******************************************************** Route::get('/rule-chains', [RuleChainController::class, 'getRuleChainList'])->name('list.RuleChain');