From cb40ea63836f2254ba3c2bbe07f4a271903830d4 Mon Sep 17 00:00:00 2001 From: vine_liutk <961510893@qq.com> Date: Wed, 21 Jun 2023 15:38:29 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=9F=BA=E7=A1=80=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/Api/DeviceController.php | 18 +++------ .../Controllers/Api/SettingController.php | 38 +++++++++++++++++++ routes/api.php | 2 +- 3 files changed, 44 insertions(+), 14 deletions(-) create mode 100644 app/Http/Controllers/Api/SettingController.php diff --git a/app/Http/Controllers/Api/DeviceController.php b/app/Http/Controllers/Api/DeviceController.php index a00a634..63af631 100644 --- a/app/Http/Controllers/Api/DeviceController.php +++ b/app/Http/Controllers/Api/DeviceController.php @@ -9,28 +9,20 @@ use DB; class DeviceController extends Controller { - /** - * 获取设备监控的类别列表; - */ - public function getMonitorMode(){ - - } - - public function getMonitorData(Request $request){ - $baseId = $request->input('base_id'); - $deviceType = $request->input('device_type'); - $deviceColumn = $request->input('device_column'); //指定字段 - } /** * 统计某个实验田下所有设备状态数量 */ public function typeStateNum(Request $request) { $regionId = $request->input('region_id', 0); + $monitorId = $request->input('monitor_id', 0); $query = Device::query(); - if($regionId){ + if($monitorId){ + $deviceIds = MonitorDevice::where('monitor_id', $monitorId)->pluck('id')->toArray(); + $query->whereIn('id', $deviceIds); + }elseif($regionId){ $monitorIds = RegionMonitor::where('region_id', $regionId)->pluck('id')->toArray(); if(count($monitorIds) > 0){ diff --git a/app/Http/Controllers/Api/SettingController.php b/app/Http/Controllers/Api/SettingController.php new file mode 100644 index 0000000..64ffee1 --- /dev/null +++ b/app/Http/Controllers/Api/SettingController.php @@ -0,0 +1,38 @@ + '稻田种植面积', + 'value' => '6,120', + ], + [ + 'name' => '稻田种植面积', + 'value' => '6,120', + ],[ + 'name' => '稻田种植面积', + 'value' => '6,120', + ],[ + 'name' => '稻田种植面积', + 'value' => '6,120', + ],[ + 'name' => '稻田种植面积', + 'value' => '6,120', + ],[ + 'name' => '稻田种植面积', + 'value' => '6,120', + ], + ]; + return $this->json($data); + } +} diff --git a/routes/api.php b/routes/api.php index 730060f..648e817 100644 --- a/routes/api.php +++ b/routes/api.php @@ -1,7 +1,6 @@ 'auth:sanctum'], function () { Route::get('devices-num', [DeviceController::class, 'typeStateNum'])->name('device.type_state_num'); Route::get('monitor-modes', [MonitorModeController::class, 'getMonitorMode'])->name('monitor_modes.list'); Route::get('monitor-modes/device-data', [MonitorModeController::class, 'getMonitorDeviceData'])->name('monitor_modes.device_data'); + Route::get('static/base-data', [SettingController::class, 'staticBaseData'])->name('static.base_data'); Route::prefix('users')->group(function () { Route::delete('logout', [UserController::class, 'logout']);