pdkj
/
lcly-data-admin
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

调整警报信息返回

dev
vine_liutk 2022-11-18 10:01:34 +08:00
parent 038e3989ec
commit bfcb01ba51
3 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -62,7 +62,7 @@ class DeviceWarningController extends Controller
*/
public function warningLog(Request $request)
{
$query = DeviceWarning::filter($request->input())->orderBy('created_at', 'desc');
$query = DeviceWarning::with(['base', 'device'])->filter($request->input())->orderBy('created_at', 'desc');
$list = $query->simplePaginate(Paginator::resolvePerPage('per_page', 20, 50));
return $this->json(DeviceWarningResource::collection($list));

9
app/Http/Resources/DeviceWarningResource.php
View File

@ -16,6 +16,15 @@ class DeviceWarningResource extends JsonResource
{
return [
'id' => $this->id,
'base_name' => $this->whenLoaded('base', function () {
return $this->base?->name ?? '';
}, ''),
'point_name' => $this->whenLoaded('device', function () {
return $this->device?->monitoring_point ?? '';
}, ''),
'device_type' => $this->whenLoaded('device', function () {
return $this->device?->type ?? 0;
}, ''),
'lv' => $this->lv,
'status' => $this->status,
'content' => $this->content,

4
app/Models/DeviceWarning.php
View File

@ -18,4 +18,8 @@ class DeviceWarning extends Model
public function base(){
return $this->belongsTo(AgriculturalBase::class, 'base_id');
}
public function device(){
return $this->belongsTo(Device::class, 'device_id');
}
}