From be50495f2796236541f2be1cbc76f0b432cc1208 Mon Sep 17 00:00:00 2001 From: lijunjie Date: Fri, 26 Aug 2022 10:45:56 +0800 Subject: [PATCH] =?UTF-8?q?onenet=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/AdminSettingController.php | 25 +++- app/Admin/Controllers/EquipController.php | 3 +- app/Admin/Controllers/TestController.php | 4 - app/Admin/Services/EquipInfoService.php | 10 +- app/Admin/routes.php | 10 +- resources/views/admin/test.blade.php | 132 ------------------ 6 files changed, 34 insertions(+), 150 deletions(-) delete mode 100644 resources/views/admin/test.blade.php diff --git a/app/Admin/Controllers/AdminSettingController.php b/app/Admin/Controllers/AdminSettingController.php index 9ec03b2..83a681b 100644 --- a/app/Admin/Controllers/AdminSettingController.php +++ b/app/Admin/Controllers/AdminSettingController.php @@ -8,15 +8,16 @@ use Dcat\Admin\Grid; use Dcat\Admin\Layout\Content; use Dcat\Admin\Show; use Dcat\Admin\Http\Controllers\AdminController; +use function Symfony\Component\Translation\t; class AdminSettingController extends AdminController { - public function test(Content $content) + public function create(Content $content) { return $content->body( Form::make(new AdminSetting(), function (Form $form) { - $form->text('slug1')->disable(true); + $form->text('slug')->disable(false); $form->text('value'); $form->display('created_at'); @@ -25,6 +26,20 @@ class AdminSettingController extends AdminController ); } + public function showOnenet(Content $content) + { + return $content + ->translation($this->translation()) + ->title($this->title()) + ->description($this->description()['edit'] ?? trans('admin.edit')) + ->body($this->form()->edit('onenet_api_key')); + } + + public function editOnenet() + { + return $this->form()->update('onenet_api_key'); + } + /** * Make a grid builder. * @@ -70,11 +85,11 @@ class AdminSettingController extends AdminController protected function form() { return Form::make(new AdminSetting(), function (Form $form) { - $form->display('slug'); + $form->text('slug')->display(false); $form->text('value'); - $form->display('created_at'); - $form->display('updated_at'); + $form->display('created_at')->display(false);; + $form->display('updated_at')->display(false);; }); } } diff --git a/app/Admin/Controllers/EquipController.php b/app/Admin/Controllers/EquipController.php index 2dfee67..b254d33 100644 --- a/app/Admin/Controllers/EquipController.php +++ b/app/Admin/Controllers/EquipController.php @@ -44,8 +44,9 @@ class EquipController extends AdminController // 自定义图标 $modal->icon('feather icon-edit'); // 传递当前行字段值 + return EquipCacheForm::make()->payload([ - 'imei' => key($this->auth_info), + 'imei' => key($this->auth_info ?? []), 'obj_id' => $this->id, 'api_key' => $api_key, ]); diff --git a/app/Admin/Controllers/TestController.php b/app/Admin/Controllers/TestController.php index c675171..a0f0e0b 100644 --- a/app/Admin/Controllers/TestController.php +++ b/app/Admin/Controllers/TestController.php @@ -12,10 +12,6 @@ use GuzzleHttp\Client; class TestController extends Controller { - public function test() - { - return - } public function platformCacheList() { $query = http_build_query([ diff --git a/app/Admin/Services/EquipInfoService.php b/app/Admin/Services/EquipInfoService.php index ab3ba88..e5f607b 100644 --- a/app/Admin/Services/EquipInfoService.php +++ b/app/Admin/Services/EquipInfoService.php @@ -12,7 +12,7 @@ class EquipInfoService public static function getInfos($param) { $page = $param['page'] ?? 1; - $per_page = $param['per_page'] ?? 1; + $per_page = $param['per_page'] ?? 20; $query = [ 'page' => $page, 'per_page' => $per_page, @@ -38,11 +38,11 @@ class EquipInfoService $res = !empty($res['data']['devices']) ? $res['data']['devices'] : []; foreach ($res as &$re) { $re['online'] = $re['online'] == true ? '在线' : '离线'; -// $re['location'] = implode(',', $re['location']); -// -// $re['auth_info'] = implode(',', $re['auth_info']); } - $res[] = []; + if (count($res) == $per_page){ + $res[] = []; + } + $res = new Paginator($res, $per_page, $page, [ diff --git a/app/Admin/routes.php b/app/Admin/routes.php index 67c94dd..e755188 100644 --- a/app/Admin/routes.php +++ b/app/Admin/routes.php @@ -11,14 +11,18 @@ Route::group([ 'namespace' => config('admin.route.namespace'), 'middleware' => config('admin.route.middleware'), ], function (Router $router) { - $router->get('/', 'HomeController@index'); - $router->get('/test', 'HomeController@test'); $router->resource('equip_resource', 'EquipResourceRecordController'); $router->resource('equip', 'EquipController'); -// $router->resource('admin_set', 'AdminSettingController'); $router->get('equip_info', 'EquipInfoController@index'); + // $router->resource('admin_set', 'AdminSettingController'); + $router->get('admin_set/onenet', 'AdminSettingController@showOnenet'); + $router->put('onenet_api_key', 'AdminSettingController@editOnenet'); + + + + $router->get('/test/platformCacheList', 'TestController@platformCacheList'); $router->get('/test/cancelAllCache', 'TestController@cancelAllCache'); $router->get('/test/getDatapoints', 'TestController@getDatapoints'); diff --git a/resources/views/admin/test.blade.php b/resources/views/admin/test.blade.php deleted file mode 100644 index de23392..0000000 --- a/resources/views/admin/test.blade.php +++ /dev/null @@ -1,132 +0,0 @@ - - - - - - - Laravel - - - - - - - - - - -
- @if (Route::has('login')) - - @endif - -
-
- - - - - -
- -
-
-
-
- -
Documentation
-
- -
-
- Laravel has wonderful, thorough documentation covering every aspect of the framework. Whether you are new to the framework or have previous experience with Laravel, we recommend reading all of the documentation from beginning to end. -
-
-
- -
-
- -
Laracasts
-
- -
-
- Laracasts offers thousands of video tutorials on Laravel, PHP, and JavaScript development. Check them out, see for yourself, and massively level up your development skills in the process. -
-
-
- -
-
- -
Laravel News
-
- -
-
- Laravel News is a community driven portal and newsletter aggregating all of the latest and most important news in the Laravel ecosystem, including new package releases and tutorials. -
-
-
- -
-
- -
Vibrant Ecosystem
-
- -
-
- Laravel's robust library of first-party tools and libraries, such as Forge, Vapor, Nova, and Envoyer help you take your projects to the next level. Pair them with powerful open source libraries like Cashier, Dusk, Echo, Horizon, Sanctum, Telescope, and more. -
-
-
-
-
- -
-
-
- - - - - - Shop - - - - - - - - Sponsor - -
-
- -
- Laravel v{{ Illuminate\Foundation\Application::VERSION }} (PHP v{{ PHP_VERSION }}) -
-
-
-
- -