校验码

app/Admin/Actions/Grid/CloneEquipResourceRecordAction.php

@@ -3,6 +3,7 @@
 namespace App\Admin\Actions\Grid;
 
 use App\Admin\Forms\CloneEquipResourceRecordForm;
+use App\Admin\Renders\EquipResourceRecordRender;
 use Dcat\Admin\Actions\Response;
 use Dcat\Admin\Grid\RowAction;
 use Dcat\Admin\Traits\HasPermissions;
@@ -69,6 +70,7 @@ class CloneEquipResourceRecordAction extends RowAction
             ->lg()
             ->title($this->title)
             ->body($form)
+            ->onLoad((new EquipResourceRecordRender())->script())
             ->button($this->title);
     }
 }

app/Admin/Controllers/EquipResourceRecordController.php

@@ -12,6 +12,8 @@ use Dcat\Admin\Grid;
 use Dcat\Admin\Layout\Content;
 use Dcat\Admin\Show;
 use Dcat\Admin\Http\Controllers\AdminController;
+use GuzzleHttp\Client;
+use Illuminate\Support\Facades\Http;
 
 class EquipResourceRecordController extends AdminController
 {
@@ -32,6 +34,7 @@ class EquipResourceRecordController extends AdminController
     protected function grid()
     {
         return Grid::make(new EquipResourceRecord(), function (Grid $grid) {
+            $grid->model()->orderBy('id', 'desc');
             $grid->column('id')->sortable();
             $grid->column('imei');
             $grid->column('obj_id');
@@ -91,6 +94,7 @@ class EquipResourceRecordController extends AdminController
 //        return $equip_resource_service->writeCache();
 
         return Form::make(new EquipResourceRecord(), function (Form $form) {
+
             $form->display('id');
             $form->text('imei')->required();
             $form->text('obj_id')->required();
@@ -99,9 +103,9 @@ class EquipResourceRecordController extends AdminController
             $form->datetime('expired_time')->required();
             $form->text('trigger_msg')->default(4)->required();
             $form->text('api-key')->required();
-            $form->text('res_id')->required();
+            $form->text('res_id')->default(5750)->required();
 
-//            68C0 0866472059902068 01 09 0111 00 0000000002 01 8D16
+//            68C0 0866472059902068 01 09 0111 00 00 00000002 01 8D16
 //            $a = EquipResourceRecordService::getCheckCode('68C008664720599020680109011100000000000201');
             $form->text('起始符')->default(68)->disable(true);
             $form->text('设备类型')->default('C0')->disable(true);
@@ -110,8 +114,8 @@ class EquipResourceRecordController extends AdminController
             $form->text('数据长度')->default('09')->disable(true);
             $form->text('指令标识')->default('0111')->disable(true);
             $form->text('数据')->default('00')->disable(true);
-            $form->select('命令方式')->options(['00', '11'])->disable(false);
+            $form->select('命令方式')->options(['00', '11'])->default(0)->disable(false);
-            $form->text('自定义数组');
+            $form->text('自定义数组')->size(8);
             $form->text('固定字节')->default('01')->disable(true);
             $form->text('累加和校验')->disable(true);
             $form->text('结束符')->default('16')->disable(true);
@@ -131,10 +135,9 @@ class EquipResourceRecordController extends AdminController
 
         $res = $equip_resource_service->writeCache($param);
 
-        if (!empty($res['errno'])){
+        if (isset($res['errno'])){
             if ($res['errno'] === 0) {
-                $this->form()->store($param);
+                return $this->form()->store($param);
-                return $this->form()->response()->success('提交成功');
             }
 
             return $this->form()->response()->error($res['error']);

app/Admin/Controllers/TestController.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Admin\Controllers;
+
+use App\Admin\Metrics\Examples;
+use App\Http\Controllers\Controller;
+use Dcat\Admin\Http\Controllers\Dashboard;
+use Dcat\Admin\Layout\Column;
+use Dcat\Admin\Layout\Content;
+use Dcat\Admin\Layout\Row;
+use GuzzleHttp\Client;
+
+class TestController extends Controller
+{
+    public function platformCacheList()
+    {
+        $query = http_build_query([
+            'imei' => '866472059915631',
+            'start' => '2016-08-05T08:00:00',
+        ]);
+        $client = new Client([
+            'base_uri' => config('onenet.api_host'),
+            'headers' => [
+                'api-key' => "knxzLGDiojaDvbIOvhG3QXRtScc=",
+            ]
+
+        ]);
+
+        $response = $client->request('GET', '/nbiot/offline/history?' . $query);
+        dump($response->getBody()->getContents());
+    }
+}

app/Admin/Forms/CloneEquipResourceRecordForm.php

@@ -24,7 +24,7 @@ class CloneEquipResourceRecordForm extends Form implements LazyRenderable
 
         $res = $equip_resource_service->writeCache($input);
 
-        if (!empty($res['errno'])){
+        if (isset($res['errno'])){
             if ($res['errno'] === 0) {
                 $equip_resource_model = new EquipResourceRecordModel();
                 $equip_resource_model['imei'] = $input['imei'];
@@ -52,6 +52,7 @@ class CloneEquipResourceRecordForm extends Form implements LazyRenderable
      */
     public function form()
     {
+
         $this->text('imei')->required();
         $this->text('obj_id')->required();
         $this->text('obj_inst_id')->required();
@@ -148,7 +149,7 @@ class CloneEquipResourceRecordForm extends Form implements LazyRenderable
             '数据长度' => $val5,
             '指令标识' => $val6,
             '数据' => $val7,
-            '命令方式' => $val8,
+            '命令方式' => $val8 == '11' ? 1 : 0,
             '自定义数组' => $val9,
             '固定字节' => $val10,
             '累加和校验' => $val11,

app/Admin/Renders/EquipResourceRecordRender.php

@@ -45,7 +45,7 @@ class EquipResourceRecordRender implements Renderable {
                 val8 = '11'
             }
 
-            let str = val1 + val2 + val3 + val4 + val5 + val6 + val7 + val8 + val8 + val9 + val10
+            let str = val1 + val2 + val3 + val4 + val5 + val6 + val7 + val8 + val9 + val10
 
             let itotal=0,len = str.length,num = 0;
             while(num<len){

app/Admin/Services/EquipResourceRecordService.php

@@ -14,7 +14,7 @@ class EquipResourceRecordService
             'obj_id' => $param['obj_id'],
             'obj_inst_id' => $param['obj_inst_id'],
             'mode' => $param['mode'],
-            'expired_time' => $param['expired_time'],
+            'expired_time' => str_replace(' ', 'T', $param['expired_time']),
             'trigger_msg' => $param['trigger_msg'],
         ]);
         $client = new Client([

app/Admin/routes.php

@@ -13,8 +13,9 @@ Route::group([
 ], function (Router $router) {
 
     $router->get('/', 'HomeController@index');
-    $router->post('/test', 'HomeController@test');
+    $router->get('/test', 'HomeController@test');
     $router->resource('equip_resource', 'EquipResourceRecordController');
+    $router->get('/test/platformCacheList', 'TestController@platformCacheList');
 
 });