From 9b64450dac57da7bef269913490c03340fa23cf6 Mon Sep 17 00:00:00 2001 From: Jing Li Date: Sun, 8 Oct 2023 11:42:47 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=91=E6=8E=A7=E7=82=B9=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/Api/MonitorModeController.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) 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)); }