app/Http/Controllers/AgriculturalBaseController.php

@@ -9,7 +9,6 @@ use App\Helpers\Paginator;
 use App\Http\Requestes\AgriculturalBaseRequest;
 use App\Http\Resources\AgriculturalBaseResource;
 use App\Models\AgriculturalBase;
-use App\Models\Device;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 
@@ -115,17 +114,4 @@ 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
-            ])->get()->pluck('monitoring_point', 'id')->toArray();
-        return $this->json($list);
-    }
 }

app/Http/Controllers/UserController.php

@@ -18,7 +18,7 @@ class UserController extends Controller
         $input = $request->input();
         $user = auth('api')->user();
 
-        $user->password = bcrypt($input['password']);
+        $user->password = bcrypt($input['new_password']);
         $user->save();
 
         $user->tokens()->delete();

database/migrations/2022_10_11_025843_create_agricultural_bases_table.php

@@ -17,7 +17,7 @@ return new class extends Migration
             $table->id();
             $table->string('name')->comment('名称');
             $table->unsignedTinyInteger('type')->default(1)->comment('类别：1基地，2城镇');
-            $table->unsignedBigInteger('parent_id')->nullable()->comment('父级');
+            $table->unsignedBigInteger('parent_id')->nullable()->default('父级');
             $table->string('person')->nullable()->comment('负责人');
             $table->string('address')->nullable()->comment('地址');
             $table->string('address_lat')->nullable()->comment('地址维度');

routes/api.php

@@ -30,8 +30,6 @@ Route::group(['middleware' => 'auth:sanctum'], function () {
         Route::apiResource('agricultural-basic', AgriculturalBaseController::class)->names('agricultural_basic');//基地
         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::apiResource('crops', CropController::class)->names('crops');//基地农作物
         Route::apiResource('town-crops', CropController::class)->names('town_crops');//城镇农作物