修复编码风格

app/Admin/Controllers/AgriculturalBaseController.php

@@ -2,13 +2,11 @@
 
 namespace App\Admin\Controllers;
 
-use Dcat\Admin\Form;
-use Dcat\Admin\Grid;
-use Dcat\Admin\Show;
-use Dcat\Admin\Admin;
 use App\Enums\BaseType;
 use App\Models\AgriculturalBase;
-use Illuminate\Support\Facades\DB;
+use Dcat\Admin\Admin;
+use Dcat\Admin\Form;
+use Dcat\Admin\Grid;
 use Dcat\Admin\Http\Controllers\AdminController;
 
 class AgriculturalBaseController extends AdminController
@@ -42,7 +40,6 @@ class AgriculturalBaseController extends AdminController
 
             $grid->filter(function (Grid\Filter $filter) {
                 $filter->like('name')->width(3);
-
             });
         });
     }

app/Admin/Controllers/CropController.php

@@ -2,14 +2,14 @@
 
 namespace App\Admin\Controllers;
 
+use App\Http\Resources\CropResource;
 use App\Models\Crop;
+use Dcat\Admin\Admin;
 use Dcat\Admin\Form;
 use Dcat\Admin\Grid;
-use Dcat\Admin\Show;
-use Dcat\Admin\Admin;
-use App\Http\Resources\CropResource;
-use Peidikeji\Keywords\Models\Keywords;
 use Dcat\Admin\Http\Controllers\AdminController;
+use Dcat\Admin\Show;
+use Peidikeji\Keywords\Models\Keywords;
 
 class CropController extends AdminController
 {
@@ -39,7 +39,6 @@ class CropController extends AdminController
 
             $grid->filter(function (Grid\Filter $filter) {
                 $filter->like('name')->width(3);
-
             });
         });
     }
@@ -48,7 +47,6 @@ class CropController extends AdminController
      * Make a show builder.
      *
      * @param  mixed  $id
-     *
      * @return Show
      */
     protected function detail($id)
@@ -84,7 +82,7 @@ class CropController extends AdminController
             // $form->text('parent_id');
             $form->radio('crop_type')->options([
                 1 => '基地',
-                2=> '镇街'
+                2 => '镇街',
             ])->default(2);
             $form->text('name');
             $form->switch('is_end');
@@ -102,8 +100,10 @@ class CropController extends AdminController
         });
     }
 
-    public function info($id){
+    public function info($id)
+    {
         $crop = Crop::findOrFail($id);
+
         return CropResource::make($crop);
     }
 }

app/Admin/Controllers/CropYieldController.php

@@ -2,14 +2,14 @@
 
 namespace App\Admin\Controllers;
 
+use App\Models\AgriculturalBase;
 use App\Models\Crop;
+use App\Models\CropYield;
+use Dcat\Admin\Admin;
 use Dcat\Admin\Form;
 use Dcat\Admin\Grid;
-use Dcat\Admin\Show;
-use Dcat\Admin\Admin;
-use App\Models\CropYield;
-use App\Models\AgriculturalBase;
 use Dcat\Admin\Http\Controllers\AdminController;
+use Dcat\Admin\Show;
 
 class CropYieldController extends AdminController
 {
@@ -21,6 +21,7 @@ class CropYieldController extends AdminController
     protected function grid()
     {
         $builder = CropYield::with(['base', 'crop', 'createdBy', 'updatedBy']);
+
         return Grid::make($builder, function (Grid $grid) {
             $grid->column('id')->sortable();
             $grid->column('base.name', '区域')->label();
@@ -55,7 +56,6 @@ class CropYieldController extends AdminController
      * Make a show builder.
      *
      * @param  mixed  $id
-     *
      * @return Show
      */
     protected function detail($id)
@@ -84,6 +84,7 @@ class CropYieldController extends AdminController
     protected function form()
     {
         $builder = CropYield::with(['base', 'crop']);
+
         return Form::make($builder, function (Form $form) {
             $model = $form->model();
 
@@ -98,7 +99,7 @@ class CropYieldController extends AdminController
             $form->currency('yield')->symbol($model->crop?->unit ?? '斤');
 
             Admin::script(
-                <<<JS
+                <<<'JS'
                     let crop;
                     $('body').on('select2:select', 'select.field_crop_id', function(e){
                         let url_path = '/admin/api/crops/' + e.params.data.id
@@ -120,12 +121,14 @@ class CropYieldController extends AdminController
                 if ($v === null) {
                     $v = 0;
                 }
+
                 return $v;
             });
             $form->currency('output')->symbol('元')->default(0)->required()->saving(function ($v) {
                 if ($v === null) {
                     $v = 0;
                 }
+
                 return $v;
             });
             // $form->text('created_by');

app/Admin/Controllers/FriendLinkController.php

@@ -2,12 +2,11 @@
 
 namespace App\Admin\Controllers;
 
+use App\Models\FriendLink;
 use Carbon\Carbon;
+use Dcat\Admin\Admin;
 use Dcat\Admin\Form;
 use Dcat\Admin\Grid;
-use Dcat\Admin\Show;
-use Dcat\Admin\Admin;
-use App\Models\FriendLink;
 use Dcat\Admin\Http\Controllers\AdminController;
 
 class FriendLinkController extends AdminController
@@ -40,7 +39,6 @@ class FriendLinkController extends AdminController
 
             $grid->filter(function (Grid\Filter $filter) {
                 $filter->like('name')->width(3);
-
             });
         });
     }
@@ -79,7 +77,7 @@ class FriendLinkController extends AdminController
                             return $this->model()->content;
                         } else {
                             return '';
-                            };
+                        }
                     });
                 })
                 ->when(FriendLink::TYPE_ARTICLE, function ($form) {

app/Admin/Form/CropExtends.php

@@ -19,12 +19,14 @@ class CropExtends extends Field
     public function listen($listen = '')
     {
         $this->listen = $listen;
+
         return $this;
     }
 
     public function render()
     {
         $this->addVariables(['listen' => $this->listen]);
+
         return parent::render();
     }
 
@@ -43,6 +45,7 @@ class CropExtends extends Field
                 $toValue[$item['name']] = $item['value'];
             }
         }
+
         return $toValue;
     }
 
@@ -72,5 +75,4 @@ class CropExtends extends Field
     {
         return $this->addVariables(['crop' => $crop]);
     }
-
 }

app/Admin/bootstrap.php

@@ -1,11 +1,11 @@
 <?php
 
+use App\Admin\Form\Amap;
+use App\Admin\Form\CropExtends;
+use Dcat\Admin\Admin;
 use Dcat\Admin\Form;
 use Dcat\Admin\Grid;
 use Dcat\Admin\Show;
-use Dcat\Admin\Admin;
-use App\Admin\Form\Amap;
-use App\Admin\Form\CropExtends;
 
 /**
  * Dcat-admin - admin builder based on Laravel.

app/Http/Controllers/AdminUserController.php

@@ -51,6 +51,7 @@ class AdminUserController extends Controller
     public function show(AdminUser $adminUser)
     {
         $adminUser->load(['bases', 'roles']);
+
         return $this->json(AdminUserResource::make($adminUser));
     }
 

app/Http/Controllers/AgriculturalBaseController.php

@@ -3,14 +3,14 @@
 namespace App\Http\Controllers;
 
 use App\Enums\BaseType;
+use App\Enums\DeviceStatus;
 use App\Enums\DeviceType;
 use App\Helpers\Paginator;
-use App\Enums\DeviceStatus;
-use Illuminate\Http\Request;
-use App\Models\AgriculturalBase;
-use Illuminate\Support\Facades\DB;
 use App\Http\Requestes\AgriculturalBaseRequest;
 use App\Http\Resources\AgriculturalBaseResource;
+use App\Models\AgriculturalBase;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
 
 class AgriculturalBaseController extends Controller
 {
@@ -57,6 +57,7 @@ class AgriculturalBaseController extends Controller
     public function show(AgriculturalBase $agriculturalBasic)
     {
         $agriculturalBasic->load('crops');
+
         return $this->json(AgriculturalBaseResource::make($agriculturalBasic));
     }
 
@@ -105,7 +106,8 @@ class AgriculturalBaseController extends Controller
     /**
      * 获取指定设备类型下有设备的基地
      */
-    public function deviceBase(Request $request){
+    public function deviceBase(Request $request)
+    {
         $deviceType = $request->input('device_type', DeviceType::Monitor);
         $list = AgriculturalBase::filter($request->all())->whereHas('devices', function ($q) use ($deviceType) {
             return $q->where('type', $deviceType)->where('status', DeviceStatus::Online);

app/Http/Controllers/ChartController.php

@@ -7,7 +7,6 @@ use App\Models\Materiel;
 use App\Models\RiceShrimpFlow;
 use App\Models\RiceShrimpIndustry;
 use App\Models\RiceShrimpPrice;
-use App\Services\RiceShrimpPriceService;
 use Illuminate\Http\Request;
 
 class ChartController extends Controller

app/Http/Controllers/CropController.php

@@ -14,6 +14,7 @@ class CropController extends Controller
     {
         $query = Crop::filter($request->input());
         $list = $query->sort()->get();
+
         return $this->json(CropResource::collection($list));
     }
 

app/Http/Controllers/CropYieldController.php

@@ -2,16 +2,15 @@
 
 namespace App\Http\Controllers;
 
-use App\Models\Crop;
-use App\Models\CropYield;
 use App\Helpers\Paginator;
-use Illuminate\Http\Request;
-use App\Models\AgriculturalBase;
-use Illuminate\Support\Facades\DB;
-use Peidikeji\Keywords\Models\Keywords;
 use App\Http\Requestes\CropYieldRequest;
 use App\Http\Resources\CropYieldResource;
-use App\Http\Requestes\CropYieldUpdateRequest;
+use App\Models\AgriculturalBase;
+use App\Models\Crop;
+use App\Models\CropYield;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
+use Peidikeji\Keywords\Models\Keywords;
 
 class CropYieldController extends Controller
 {
@@ -39,7 +38,7 @@ class CropYieldController extends Controller
             'base_id' => $baseId,
             'crop_id' => $cropId,
             'time_year' => $timeYear,
-            'quarter' => $quarter
+            'quarter' => $quarter,
         ])->exists()) {
             return $this->error('该数据已存在，无法添加，请修改');
         }
@@ -72,7 +71,7 @@ class CropYieldController extends Controller
             'base_id' => $baseId,
             'crop_id' => $cropId,
             'time_year' => $timeYear,
-            'quarter' => $quarter
+            'quarter' => $quarter,
         ])->where('id', '<>', $cropYield->id)->exists()) {
             return $this->error('该数据已存在，无法添加，请修改');
         }
@@ -100,7 +99,8 @@ class CropYieldController extends Controller
      * @param  Request  $request
      * @return void
      */
-    public function quarterStaticsChart(Request $request){
+    public function quarterStaticsChart(Request $request)
+    {
         $categoryId = $request->input('category_id'); //获取产业ID
         $cropId = $request->input('crop_id', 0); //农作物ID
 
@@ -112,7 +112,7 @@ class CropYieldController extends Controller
 
         $crop = Crop::where([
             'category_id' => $categoryId,
-            'id' => $cropId
+            'id' => $cropId,
         ])->first();
 
         $staticCropIds = [];
@@ -127,7 +127,7 @@ class CropYieldController extends Controller
                     '第2季度' => null,
                     '第3季度' => null,
                     '第4季度' => null,
-                ]
+                ],
             ],
             'cultivated' => [
                 'name' => '种养殖面积',
@@ -147,8 +147,8 @@ class CropYieldController extends Controller
                     '第2季度' => null,
                     '第3季度' => null,
                     '第4季度' => null,
-                ]
-            ]
+                ],
+            ],
         ];
         if ($crop?->is_end) {
             $staticCropIds[] = $crop->id;
@@ -165,9 +165,9 @@ class CropYieldController extends Controller
                             '第2季度' => null,
                             '第3季度' => null,
                             '第4季度' => null,
-                        ]
+                        ],
                     ];
-                    $extendsQ .= ", sum((extends->> '".$item['name']."')::NUMERIC) as extend_".$i."_total ";
+                    $extendsQ .= ", sum((extends->> '".$item['name']."')::NUMERIC) as extend_".$i.'_total ';
                 }
             }
         } else {
@@ -187,7 +187,7 @@ class CropYieldController extends Controller
             $q->where('base_id', $baseId);
         }
         $q1 = clone $q;
-        $sumSql = "quarter, sum(yield) as yield_total, sum(cultivated) as cultivated_total, sum(output) as output_total ";
+        $sumSql = 'quarter, sum(yield) as yield_total, sum(cultivated) as cultivated_total, sum(output) as output_total ';
         if ($extendsQ) {
             $sumSql .= $extendsQ;
         }
@@ -206,9 +206,9 @@ class CropYieldController extends Controller
 
     /**
      * 行业产值统计，查询某年，可选镇(饼状图)
-     *
      */
-    public function categoryStaticsChart(Request $request){
+    public function categoryStaticsChart(Request $request)
+    {
         $baseId = $request->input('base_id'); //镇
         $year = $request->input('year', date('Y')); //年份
 
@@ -218,7 +218,7 @@ class CropYieldController extends Controller
             $q->where('base_id', $baseId);
         }
         $q->groupBy('category_id');
-        $totalData = $q->select(DB::raw("category_id, sum(output) as output_total "))
+        $totalData = $q->select(DB::raw('category_id, sum(output) as output_total '))
                     ->get()
                     ->keyBy('category_id')->toArray();
 
@@ -233,15 +233,15 @@ class CropYieldController extends Controller
         }
 
         return $this->json([
-            'list' =>$data
+            'list' => $data,
         ]);
     }
 
     /**
      * 总产值，查询年折线图(当年往前查4年)，可选镇
-     *
      */
-    public function totalStaticsChart(Request $request){
+    public function totalStaticsChart(Request $request)
+    {
         $baseId = $request->input('base_id'); //镇
         $nowYear = date('Y');
 
@@ -252,11 +252,10 @@ class CropYieldController extends Controller
         $q->where('time_year', '>=', $nowYear - 3);
 
         $q->groupBy('time_year');
-        $totalData = $q->select(DB::raw("time_year, sum(output) as output_total "))
+        $totalData = $q->select(DB::raw('time_year, sum(output) as output_total '))
                     ->get()
                     ->keyBy('time_year')->toArray();
 
-
         $data = [];
         for ($i = 0; $i < 4; $i++) {
             $_year = $nowYear - $i;
@@ -276,7 +275,8 @@ class CropYieldController extends Controller
      *
      * @return void
      */
-    public function totalStaticsList(Request $request){
+    public function totalStaticsList(Request $request)
+    {
         $year = $request->input('year', date('Y')); //年份
         $categoryId = $request->input('category_id'); //行业ID
 
@@ -286,7 +286,7 @@ class CropYieldController extends Controller
             $q->where('category_id', $categoryId);
         }
         $q->groupBy('base_id');
-        $totalData = $q->select(DB::raw("base_id, sum(output) as output_total "))
+        $totalData = $q->select(DB::raw('base_id, sum(output) as output_total '))
                     ->get()
                     ->keyBy('base_id')->toArray();
 

app/Http/Controllers/DeviceController.php

@@ -2,17 +2,17 @@
 
 namespace App\Http\Controllers;
 
-use App\Models\Device;
+use App\Enums\DeviceStatus;
 use App\Enums\DeviceType;
 use App\Helpers\Paginator;
-use App\Enums\DeviceStatus;
-use Illuminate\Http\Request;
-use App\Models\SoilMonitoringLog;
-use Illuminate\Support\Facades\DB;
 use App\Http\Requestes\DeviceRequest;
 use App\Http\Resources\DeviceResource;
-use App\Models\WaterQualityMonitoringLog;
+use App\Models\Device;
 use App\Models\MeteorologicalMonitoringLog;
+use App\Models\SoilMonitoringLog;
+use App\Models\WaterQualityMonitoringLog;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
 
 class DeviceController extends Controller
 {
@@ -73,7 +73,8 @@ class DeviceController extends Controller
     /**
      * 统计某个基地下所有设备状态数量
      */
-    public function typeStatusNum(Request $request){
+    public function typeStatusNum(Request $request)
+    {
         $baseId = $request->input('base_id');
 
         $query = Device::where('agricultural_base_id', $baseId)->groupBy('type')->groupBy('status');
@@ -91,6 +92,7 @@ class DeviceController extends Controller
                 $data[$typeKey][$statusKey] = $resData[$typeKey][$statusKey] ?? 0;
             }
         }
+
         return $this->json($data);
     }
 
@@ -156,7 +158,7 @@ class DeviceController extends Controller
         //先获取基地下该类型所有设备
         $deviceData = Device::where([
             'agricultural_base_id' => $baseId,
-            'type' => $deviceType
+            'type' => $deviceType,
         ])->get();
 
         $data = [];
@@ -201,7 +203,7 @@ class DeviceController extends Controller
                 }
                 break;
         }
+
         return $this->json($data);
     }
-
 }

app/Http/Controllers/DeviceWarningController.php

@@ -3,10 +3,10 @@
 namespace App\Http\Controllers;
 
 use App\Helpers\Paginator;
-use Illuminate\Http\Request;
-use App\Models\DeviceWarning;
-use Peidikeji\Setting\Models\Setting;
 use App\Http\Resources\DeviceWarningResource;
+use App\Models\DeviceWarning;
+use Illuminate\Http\Request;
+use Peidikeji\Setting\Models\Setting;
 
 class DeviceWarningController extends Controller
 {
@@ -32,7 +32,6 @@ class DeviceWarningController extends Controller
 
     public function updateRule(Request $request)
     {
-
         $slug = $request->input(['slug']);
         $ruleValue = $request->input(['value'], []);
 
@@ -48,7 +47,7 @@ class DeviceWarningController extends Controller
                 }
             }
             $rule->update([
-                'value' => json_encode($oldValue)
+                'value' => json_encode($oldValue),
             ]);
         }
 
@@ -67,5 +66,4 @@ class DeviceWarningController extends Controller
 
         return $this->json(DeviceWarningResource::collection($list));
     }
-
 }

app/Http/Controllers/FriendLinkController.php

@@ -3,13 +3,14 @@
 namespace App\Http\Controllers;
 
 use App\Helpers\Paginator;
+use App\Http\Resources\FriendLinkResource;
 use App\Models\FriendLink;
 use Illuminate\Http\Request;
-use App\Http\Resources\FriendLinkResource;
 
 class FriendLinkController extends Controller
 {
-    public function index(Request $request){
+    public function index(Request $request)
+    {
         $query = FriendLink::filter($request->all());
 
         $list = $query->simplePaginate(Paginator::resolvePerPage('per_page', 20, 50));

app/Http/Controllers/RiceShrimpFlowController.php

@@ -9,7 +9,6 @@ use App\Models\RiceShrimpFlow;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\ResourceCollection;
-use Illuminate\Validation\ValidationException;
 
 class RiceShrimpFlowController extends Controller
 {

app/Http/Controllers/RiceShrimpIndustryController.php

@@ -9,7 +9,6 @@ use App\Models\RiceShrimpIndustry;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\ResourceCollection;
-use Illuminate\Validation\ValidationException;
 
 class RiceShrimpIndustryController extends Controller
 {

app/Http/Controllers/RiceShrimpPriceController.php

@@ -2,7 +2,6 @@
 
 namespace App\Http\Controllers;
 
-use App\Exceptions\BizException;
 use App\Http\Requestes\RiceShrimpPriceStoreRequest;
 use App\Http\Requestes\RiceShrimpPriceUpdateRequest;
 use App\Http\Resources\RiceShrimpPriceResource;
@@ -10,7 +9,6 @@ use App\Models\RiceShrimpPrice;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\ResourceCollection;
-use Illuminate\Validation\ValidationException;
 
 class RiceShrimpPriceController extends Controller
 {

app/Http/Requestes/MaterielStoreRequest.php

@@ -5,7 +5,6 @@ namespace App\Http\Requestes;
 use App\Enums\MaterielType;
 use App\Rules\Quarter;
 use Illuminate\Foundation\Http\FormRequest;
-use Illuminate\Validation\Rule;
 use Illuminate\Validation\Rules\Enum;
 
 class MaterielStoreRequest extends FormRequest

app/Http/Requestes/MaterielUpdateRequest.php

@@ -4,7 +4,6 @@ namespace App\Http\Requestes;
 
 use App\Rules\Quarter;
 use Illuminate\Foundation\Http\FormRequest;
-use Illuminate\Validation\Rule;
 use Illuminate\Validation\Rules\Enum;
 
 class MaterielUpdateRequest extends FormRequest

app/Http/Requestes/RiceShrimpFlowStoreRequest.php

@@ -4,7 +4,6 @@ namespace App\Http\Requestes;
 
 use App\Rules\Quarter;
 use Illuminate\Foundation\Http\FormRequest;
-use Illuminate\Validation\Rule;
 
 class RiceShrimpFlowStoreRequest extends FormRequest
 {

app/Http/Requestes/RiceShrimpIndustryStoreRequest.php

@@ -4,7 +4,6 @@ namespace App\Http\Requestes;
 
 use App\Rules\Quarter;
 use Illuminate\Foundation\Http\FormRequest;
-use Illuminate\Validation\Rule;
 
 class RiceShrimpIndustryStoreRequest extends FormRequest
 {

app/Http/Requestes/RiceShrimpIndustryUpdateRequest.php

@@ -4,7 +4,6 @@ namespace App\Http\Requestes;
 
 use App\Rules\Quarter;
 use Illuminate\Foundation\Http\FormRequest;
-use Illuminate\Validation\Rule;
 
 class RiceShrimpIndustryUpdateRequest extends FormRequest
 {

app/Http/Requestes/RiceShrimpPriceStoreRequest.php

@@ -4,7 +4,6 @@ namespace App\Http\Requestes;
 
 use App\Rules\Quarter;
 use Illuminate\Foundation\Http\FormRequest;
-use Illuminate\Validation\Rule;
 
 class RiceShrimpPriceStoreRequest extends FormRequest
 {

app/Http/Requestes/RiceShrimpPriceUpdateRequest.php

@@ -4,7 +4,6 @@ namespace App\Http\Requestes;
 
 use App\Rules\Quarter;
 use Illuminate\Foundation\Http\FormRequest;
-use Illuminate\Validation\Rule;
 
 class RiceShrimpPriceUpdateRequest extends FormRequest
 {

app/Http/Resources/RiceShrimpPriceResource.php

@@ -2,7 +2,6 @@
 
 namespace App\Http\Resources;
 
-use App\Models\AdminUser;
 use Illuminate\Http\Resources\Json\JsonResource;
 
 class RiceShrimpPriceResource extends JsonResource

app/ModelFilters/AgriculturalBaseFilter.php

@@ -11,7 +11,8 @@ class AgriculturalBaseFilter extends ModelFilter
         return $this->where('type', $type);
     }
 
-    public function parentId($parentId){
+    public function parentId($parentId)
+    {
         return $this->where('parent_id', $parentId);
     }
 }

app/ModelFilters/CropFilter.php

@@ -22,7 +22,8 @@ class CropFilter extends ModelFilter
         return $q;
     }
 
-    public function cropType($cropType){
+    public function cropType($cropType)
+    {
         return $this->where('crop_type', $cropType);
     }
 
@@ -31,8 +32,8 @@ class CropFilter extends ModelFilter
         return $this->where('category_id', $categoryId);
     }
 
-
-    public function parent($parentId){
+    public function parent($parentId)
+    {
         return $this->where('parent_id', $parentId);
     }
 }

app/ModelFilters/DeviceFilter.php

@@ -21,7 +21,8 @@ class DeviceFilter extends ModelFilter
         return $this->where('type', $type);
     }
 
-    public function status($status){
+    public function status($status)
+    {
         return $this->where('status', $status);
     }
 }

app/ModelFilters/DeviceWarningFilter.php

@@ -11,7 +11,8 @@ class DeviceWarningFilter extends ModelFilter
         return $this->where('base_id', $base);
     }
 
-    public function status($status){
+    public function status($status)
+    {
         return $this->where('status', $status);
     }
 }

app/ModelFilters/FriendLinkFilter.php

@@ -16,11 +16,13 @@ class FriendLinkFilter extends ModelFilter
         return $this->where('type', $type);
     }
 
-    public function recommend($recommend){
+    public function recommend($recommend)
+    {
         return $this->where('is_recommend', $recommend);
     }
 
-    public function show($show){
+    public function show($show)
+    {
         return $this->where('is_show', $show);
     }
 }

app/Models/AgriculturalBase.php

@@ -3,9 +3,9 @@
 namespace App\Models;
 
 use App\Enums\BaseType;
+use Dcat\Admin\Traits\HasDateTimeFormatter;
 use EloquentFilter\Filterable;
 use Illuminate\Database\Eloquent\Model;
-use Dcat\Admin\Traits\HasDateTimeFormatter;
 
 class AgriculturalBase extends Model
 {
@@ -42,11 +42,13 @@ class AgriculturalBase extends Model
         return $this->belongsToMany(Crop::class, 'base_crops', 'base_id', 'crop_id');
     }
 
-    public function yieldLogs(){
+    public function yieldLogs()
+    {
         return $this->hasMany(CropYield::class, 'base_id');
     }
 
-    public function devices(){
+    public function devices()
+    {
         return $this->hasMany(Device::class, 'agricultural_base_id');
     }
 }

app/Models/Crop.php

@@ -2,11 +2,11 @@
 
 namespace App\Models;
 
+use Dcat\Admin\Traits\HasDateTimeFormatter;
+use Dcat\Admin\Traits\ModelTree;
 use EloquentFilter\Filterable;
 use Illuminate\Database\Eloquent\Model;
 use Peidikeji\Keywords\Models\Keywords;
-use Dcat\Admin\Traits\HasDateTimeFormatter;
-use Dcat\Admin\Traits\ModelTree;
 
 class Crop extends Model
 {
@@ -17,7 +17,7 @@ class Crop extends Model
     protected $orderColumn = 'sort';
 
     protected $casts = [
-        'extends' => 'array'
+        'extends' => 'array',
     ];
 
     public function scopeSort($q)
@@ -32,14 +32,16 @@ class Crop extends Model
         'path', 'is_end',
         'sort',
         'extends',
-        'crop_type'
+        'crop_type',
     ];
 
-    public function category(){
+    public function category()
+    {
         return $this->belongsTo(Keywords::class, 'category_id');
     }
 
-    public function parent(){
+    public function parent()
+    {
         return $this->belongsTo(self::class, 'parent_id');
     }
 }

app/Models/CropYield.php

@@ -2,9 +2,9 @@
 
 namespace App\Models;
 
+use Dcat\Admin\Traits\HasDateTimeFormatter;
 use EloquentFilter\Filterable;
 use Illuminate\Database\Eloquent\Model;
-use Dcat\Admin\Traits\HasDateTimeFormatter;
 
 class CropYield extends Model
 {
@@ -18,7 +18,7 @@ class CropYield extends Model
         'base_id', 'crop_id', 'time_year', 'yield', 'cultivated', 'output', 'user_id',
         'created_by', 'updated_by',
         'quarter', 'extends',
-        'category_id'
+        'category_id',
     ];
 
     /**

app/Models/DeviceWarning.php

@@ -3,8 +3,8 @@
 namespace App\Models;
 
 use EloquentFilter\Filterable;
-use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
 
 class DeviceWarning extends Model
 {
@@ -12,6 +12,6 @@ class DeviceWarning extends Model
 
     protected $fillable = [
         'device_id', 'base_id', 'lv', 'content', 'status', 'remarks',
-        'linkos_device_id', 'linkos_reported_at'
+        'linkos_device_id', 'linkos_reported_at',
     ];
 }

app/Models/FriendLink.php

@@ -3,10 +3,10 @@
 namespace App\Models;
 
 use Dcat\Admin\Admin;
-use EloquentFilter\Filterable;
-use Illuminate\Database\Eloquent\Model;
 use Dcat\Admin\Traits\HasDateTimeFormatter;
+use EloquentFilter\Filterable;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
 
 class FriendLink extends Model
 {
@@ -19,7 +19,7 @@ class FriendLink extends Model
     public const TYPE_ARTICLE = 3; //文章
 
     protected $fillable = [
-        'name', 'type', 'content', 'sort', 'is_recommend', 'is_show'
+        'name', 'type', 'content', 'sort', 'is_recommend', 'is_show',
     ];
 
     public static function typeMap()
@@ -27,7 +27,7 @@ class FriendLink extends Model
         return [
             self::TYPE_LINK => '链接',
             self::TYPE_VIDEO => '视频',
-            self::TYPE_ARTICLE => '文章'
+            self::TYPE_ARTICLE => '文章',
         ];
     }
 
@@ -46,7 +46,8 @@ class FriendLink extends Model
         return "<span class='label' style='background: $background;'>{$name}</span>";
     }
 
-    public function scopeSort($q){
+    public function scopeSort($q)
+    {
         return $q->orderBy('sort', 'desc')->orderBy('created_at', 'desc');
     }
 }

database/seeders/AgriculturalBaseSeeder.php

@@ -2,11 +2,10 @@
 
 namespace Database\Seeders;
 
-use Throwable;
-use Illuminate\Support\Str;
-use Illuminate\Database\Seeder;
 use App\Models\AgriculturalBase;
+use Illuminate\Database\Seeder;
 use Illuminate\Support\Facades\DB;
+use Throwable;
 
 class AgriculturalBaseSeeder extends Seeder
 {

database/seeders/KeywordsTableSeeder.php

@@ -27,7 +27,7 @@ class KeywordsTableSeeder extends Seeder
         $list = [
             ['key' => 'crops-category', 'name' => '农作物产业分类', 'value' => '', 'list' => [
                 ['key' => 'crops-cate-nongye', 'name' => '农业', 'type_key' => 'crops-category', 'value' => ''],
-                ['key' => 'crops-cate-yuye', 'name' => '渔业', 'type_key' => 'crops-category', 'value' => '',],
+                ['key' => 'crops-cate-yuye', 'name' => '渔业', 'type_key' => 'crops-category', 'value' => ''],
                 ['key' => 'crops-cate-xumuye', 'name' => '畜牧业', 'type_key' => 'crops-category', 'value' => ''],
                 ['key' => 'crops-cate-lingye', 'name' => '林业', 'type_key' => 'crops-category', 'value' => ''],
                 ['key' => 'crops-cate-activity', 'name' => '其他', 'type_key' => 'crops-category', 'value' => ''],

database/seeders/SettingTableSeeder.php

@@ -107,7 +107,7 @@ class SettingTableSeeder extends Seeder
                     "3":[{"min":null,"max":null}],
                     "4":[{"min":null,"max":null}]
                 }
-            }']
+            }'],
         ];
         Setting::insert($list);
     }

dcat_admin_ide_helper.php

@@ -7,6 +7,7 @@
  *
  * @author jqh <841324345@qq.com>
  */
+
 namespace Dcat\Admin {
     use Illuminate\Support\Collection;
 
@@ -253,9 +254,13 @@ namespace Dcat\Admin {
      * @method Grid\Column|Collection ph(string $label = null)
      * @method Grid\Column|Collection turbidity(string $label = null)
      */
-    class Grid {}
+    class Grid
+    {
+    }
 
-    class MiniGrid extends Grid {}
+    class MiniGrid extends Grid
+    {
+    }
 
     /**
      * @property Show\Field|Collection id
@@ -500,30 +505,32 @@ namespace Dcat\Admin {
      * @method Show\Field|Collection ph(string $label = null)
      * @method Show\Field|Collection turbidity(string $label = null)
      */
-    class Show {}
+    class Show
+    {
+    }
 
     /**
      * @method \App\Admin\Form\Amap amap(...$params)
      */
-    class Form {}
-
+    class Form
+    {
+    }
 }
 
 namespace Dcat\Admin\Grid {
-    /**
 
-     */
-    class Column {}
+    class Column
+    {
+    }
 
-    /**
-     
-     */
-    class Filter {}
+    class Filter
+    {
+    }
 }
 
 namespace Dcat\Admin\Show {
-    /**
 
-     */
-    class Field {}
+    class Field
+    {
+    }
 }

lang/zh_CN/agricultural-base.php

@@ -1,4 +1,5 @@
 <?php
+
 return [
     'labels' => [
         'AgriculturalBase' => '基地数据',

lang/zh_CN/crop-yield.php

@@ -1,4 +1,5 @@
 <?php
+
 return [
     'labels' => [
         'CropYield' => 'CropYield',

lang/zh_CN/crop.php

@@ -1,4 +1,5 @@
 <?php
+
 return [
     'labels' => [
         'Crop' => 'Crop',

lang/zh_CN/friend-link.php

@@ -1,4 +1,5 @@
 <?php
+
 return [
     'labels' => [
         'FriendLink' => '友情链接',