Browse Source

车位相机列表优化

master
wanghongjun 1 month ago
parent
commit
c244a88ecc
  1. 15
      app/Http/Controllers/Admin/ParkingCameraController.php
  2. 11
      app/Services/ParkingCameraService.php

15
app/Http/Controllers/Admin/ParkingCameraController.php

@ -53,6 +53,21 @@ class ParkingCameraController extends BaseController
}
}
if ($request->has('parking_id')) {
$parking_id = $request->input('parking_id');
if ($parking_id) {
$floor_ids = AdminFloor::query()->where(
'building_floor',
$parking_id
)->pluck('id');
if ($floor_ids) {
$query->whereIn('floor_id', $floor_ids->toArray());
} else {
$query->where('id', 0);
}
}
}
if ($request->has('number')) {
$number = $request->input('number');
if ($number) {

11
app/Services/ParkingCameraService.php

@ -4,12 +4,11 @@ namespace App\Services;
use App\Exceptions\CustomException;
use App\Models\AdminFloor;
use App\Models\Parking;
use App\Models\ParkingCamera;
use App\Models\ParkingSpace;
use App\Models\ParkingSpaceCamera;
use Exception;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Support\Facades\DB;
class ParkingCameraService extends BaseService
@ -256,7 +255,13 @@ class ParkingCameraService extends BaseService
// 处理列表数据
public function optionItems($item)
{
$item['floor'] = AdminFloor::getName($item['floor_id']);
$item['floor'] = '';
$item['parking'] = '';
$floor = AdminFloor::getFirst($item['floor_id']);
if ($floor) {
$item['floor'] = $floor['name'];
$item['parking'] = Parking::getName($floor['building_floor']);
}
$item['parking_space_count']
= ParkingSpaceCamera::getSpaceCount($item['id']);
$item['parking_space_numbers']

Loading…
Cancel
Save