From 438f037bb55eec054490143e5d69b699419a22dd Mon Sep 17 00:00:00 2001
From: vine_liutk <961510893@qq.com>
Date: Thu, 5 Jan 2023 10:32:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AE=BE=E5=A4=87=E5=8F=AF?=
 =?UTF-8?q?=E4=BB=A5=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AgriculturalBaseController.php            |  2 +-
 app/Http/Controllers/DeviceController.php     |  2 +-
 app/Http/Requestes/DeviceRequest.php          |  1 +
 app/Http/Resources/DeviceResource.php         |  3 +-
 app/Models/Device.php                         |  1 +
 ...01_05_102857_add_sort_to_devices_table.php | 34 +++++++++++++++++++
 6 files changed, 40 insertions(+), 3 deletions(-)
 create mode 100644 database/migrations/2023_01_05_102857_add_sort_to_devices_table.php

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 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('devices', function (Blueprint $table) {
+            //
+            $table->unsignedInteger('sort')->nullable()->default(0)->comment('排序');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('devices', function (Blueprint $table) {
+            //
+            $table->dropColumn(['sort']);
+        });
+    }
+};