diff --git a/app/Http/Controllers/AgriculturalBaseController.php b/app/Http/Controllers/AgriculturalBaseController.php index 3dc084f..25f0d3e 100644 --- a/app/Http/Controllers/AgriculturalBaseController.php +++ b/app/Http/Controllers/AgriculturalBaseController.php @@ -133,7 +133,7 @@ class AgriculturalBaseController extends Controller $list = Device::where([ 'agricultural_base_id' => $agriculturalBasic->id, 'type'=>$deviceType - ])->get()->pluck('monitoring_point', 'id')->toArray(); + ])->orderBy('sort', 'desc')->get()->pluck('monitoring_point', 'id')->toArray(); return $this->json($list); } } diff --git a/app/Http/Controllers/DeviceController.php b/app/Http/Controllers/DeviceController.php index e29bf63..fca1ce4 100644 --- a/app/Http/Controllers/DeviceController.php +++ b/app/Http/Controllers/DeviceController.php @@ -196,7 +196,7 @@ class DeviceController extends Controller $deviceData = Device::where([ 'agricultural_base_id' => $baseId, 'type' => $deviceType, - ])->get(); + ])->orderBy('sort', 'desc')->get(); $data = []; switch ($deviceType) { diff --git a/app/Http/Requestes/DeviceRequest.php b/app/Http/Requestes/DeviceRequest.php index d1e4218..4c08d4b 100644 --- a/app/Http/Requestes/DeviceRequest.php +++ b/app/Http/Requestes/DeviceRequest.php @@ -30,6 +30,7 @@ class DeviceRequest extends FormRequest 'extends.password' => 'required_if:type,1|string', 'extends.passage' => 'required_if:type,1|string', 'is_recommend' => 'filled|boolean', + 'sort' => 'nullable|integer|min:0', ]; } diff --git a/app/Http/Resources/DeviceResource.php b/app/Http/Resources/DeviceResource.php index 7f203c1..1275dc8 100644 --- a/app/Http/Resources/DeviceResource.php +++ b/app/Http/Resources/DeviceResource.php @@ -29,7 +29,8 @@ class DeviceResource extends JsonResource return $this->createdBy?->name; }, ''), //录入人 'created_at' => strtotime($this->created_at) ?? 0, //录入时间 - 'is_recommend' => $this->is_recommend + 'is_recommend' => $this->is_recommend, + 'sort' => $this->sort, ]; } } diff --git a/app/Models/Device.php b/app/Models/Device.php index b83464b..3e6b0cd 100644 --- a/app/Models/Device.php +++ b/app/Models/Device.php @@ -36,6 +36,7 @@ class Device extends Model 'extends', 'created_by', 'updated_by', + 'sort', ]; public function base() diff --git a/database/migrations/2023_01_05_102857_add_sort_to_devices_table.php b/database/migrations/2023_01_05_102857_add_sort_to_devices_table.php new file mode 100644 index 0000000..902285a --- /dev/null +++ b/database/migrations/2023_01_05_102857_add_sort_to_devices_table.php @@ -0,0 +1,34 @@ +unsignedInteger('sort')->nullable()->default(0)->comment('排序'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('devices', function (Blueprint $table) { + // + $table->dropColumn(['sort']); + }); + } +};