Vib360/backend_vib360_laravel
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

merge into: Vib360:sayali
Branches Tags
Vib360:main Vib360:nikhil Vib360:shailesh Vib360:sneha Vib360:sayliR Vib360:sayali
...
pull from: Vib360:sayliR
Branches Tags
Vib360:main Vib360:nikhil Vib360:shailesh Vib360:sneha Vib360:sayliR Vib360:sayali

8 Commits
sayali ... sayliR

Author SHA1 Message Date
sayliraut
3b29f4c95a change 2025-04-28 19:38:22 +05:30
sayliraut
45742aa117 change 2025-04-28 19:38:06 +05:30
Sayli Raut
4483c7317c Merge pull request 'sayliR' (#106) from sayliR into main 
Reviewed-on: Nikhil.Kadam/vib360#106
 2025-04-28 14:04:00 +00:00
sayliraut
a0f2431704 changes 2025-04-28 19:33:31 +05:30
sayliraut
fc45f740f5 changes 2025-04-28 19:33:05 +05:30
Sayli Parab
7ade7f620c Merge pull request 'userAssest' (#105) from sayali into main 
Reviewed-on: Nikhil.Kadam/vib360#105
 2025-04-28 11:30:57 +00:00
Sayli Parab
365d14b11a Merge pull request 'assign' (#104) from sayali into main 
Reviewed-on: Nikhil.Kadam/vib360#104
 2025-04-28 11:08:37 +00:00
Sayli Parab
11883f6757 Merge pull request 'sayali' (#103) from sayali into main 
Reviewed-on: Nikhil.Kadam/vib360#103
 2025-04-28 10:33:08 +00:00
2 changed files with 3 additions and 4 deletions
Expand all files Collapse all files

2
app/Http/Controllers/AlarmControllerCommon.php
View File

@@ -202,7 +202,7 @@ class AlarmControllerCommon extends Controller
]);
}
return jsonResponseWithErrorMessage('Failed to clear alarm: ' . $clearResponse->body(), $clearResponse->status());
} catch (\Exception $e) {
Log::error('Error clearing alarm: ' . $e->getMessage());

5
app/Services/AlarmService.php
View File

@@ -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');
}
@@ -387,7 +386,7 @@ class AlarmService
$payload = [
'type' => $data['type'] ?? null,
'severity' => $data['severity'] ?? null,
'acknowledged' => $data['acknowledged'] ?? null,
'acknowledged' => false,
'cleared' => $data['cleared'] ?? Carbon::now()->timestamp,
'startTs' => $data['startTs'] ?? Carbon::now()->timestamp,
'endTs' => $data['endTs'] ?? Carbon::now()->timestamp,