diff --git a/app/Http/Controllers/Api/MonitorModeController.php b/app/Http/Controllers/Api/MonitorModeController.php index 948b362..5683972 100644 --- a/app/Http/Controllers/Api/MonitorModeController.php +++ b/app/Http/Controllers/Api/MonitorModeController.php @@ -5,9 +5,9 @@ namespace App\Http\Controllers\Api; use App\Filters\MonitorModeFilter; use App\Http\Controllers\Controller; use App\Http\Resources\DeviceResource; +use App\Http\Resources\FarmWormPhotoResource; use App\Http\Resources\MonitorModeResource; use App\Models\FarmWormPhoto; -use App\Http\Resources\FarmWormPhotoResource; use App\Models\MeteorologicalDailyReport; use App\Models\MonitorMode; use App\Services\Admin\DeviceService; @@ -20,7 +20,11 @@ class MonitorModeController extends Controller */ public function getMonitorMode(Request $request) { - $monitors = MonitorMode::filter($request->all(), MonitorModeFilter::class)->get();//有推荐,排序字段,不过目前没开放; + $monitors = MonitorMode::filter($request->all(), MonitorModeFilter::class) + ->latest('sort') + ->oldest('id') + ->get(); + return $this->json(MonitorModeResource::collection($monitors)); }