监测点

app/Http/Controllers/AgriculturalBaseController.php

@@ -9,6 +9,7 @@ use App\Enums\OperationType;
 use App\Helpers\Paginator;
 use App\Http\Requestes\AgriculturalBaseRequest;
 use App\Http\Resources\AgriculturalBaseResource;
+use App\Http\Resources\DeviceResource;
 use App\Models\AgriculturalBase;
 use App\Models\Device;
 use App\Services\OperationLogService;
@@ -140,16 +141,10 @@ class AgriculturalBaseController extends Controller
         return $this->json(AgriculturalBaseResource::collection($list));
     }
 
-    /**
-     * 获取指定基地指定设备类型下所有监控点名称选项
-     * device_type
-     */
-    public function basePointList(AgriculturalBase $agriculturalBasic, Request $request){
-        $deviceType = $request->input('device_type', DeviceType::Meteorological);
-        $list = Device::where([
-            'agricultural_base_id' => $agriculturalBasic->id,
-            'type'=>$deviceType
-            ])->orderBy('sort', 'desc')->get()->pluck('monitoring_point', 'id')->toArray();
-        return $this->json($list);
+    public function basePoints(Request $request)
+    {
+        $devices = Device::filter($request->input())->orderBy('sort', 'desc')->get();
+
+        return DeviceResource::collection($devices);
     }
 }

routes/api.php

@@ -41,6 +41,7 @@ Route::group([
         Route::apiResource('town-street', AgriculturalBaseController::class)->names('town_street');//镇街
         Route::get('agricultural-device-basic', [AgriculturalBaseController::class, 'deviceBase'])->name('agricultural_basic.device_bases'); //通过设备类型查询基地
         Route::get('agricultural-device-point/{agricultural_basic}', [AgriculturalBaseController::class, 'basePointList']);//获取基地对应监控点
+        Route::get('agricultural-device-points', [AgriculturalBaseController::class, 'basePoints']);
 
         //农作物
         Route::apiResource('crops', CropController::class)->names('crops');//基地农作物