视频服务器区域（天地伟业）添加设备ID

Modules/Camera/Resources/views/mine_add.blade.php

@@ -854,7 +854,7 @@
     @endforeach
 
     <div class="layui-form-item" id="user_name">
-        <label class="layui-form-label">矿区单位名称</label>
+        <label class="layui-form-label">矿区单位</label>
         <div class="layui-input-block">
             <input class="layui-input" type="text" name="title" value="{{ $item['title'] ?? (old('title') ?? ($column['default'] ?? '')) }}"/>
         </div>
@@ -907,6 +907,13 @@
         </div>
     </div>
 
+    <div class="layui-form-item" id="sOrgId">
+        <label class="layui-form-label" id="sOrgId">设备ID</label>
+        <div class="layui-input-block">
+            <input class="layui-input" type="text" name="sOrgId"  value="{{ $item['sOrgId'] ?? (old('sOrgId') ?? ($column['default'] ?? '')) }}"/>
+        </div>
+    </div>
+
     <div id="kongbai">
         <br><br><br><br><br><br><br><br><br><br><br>
     </div>
@@ -945,6 +952,7 @@
         document.getElementById("key").style.display = 'none';
         document.getElementById("secret").style.display = 'none';
         document.getElementById("kongbai").style.display = 'block';
+        document.getElementById("sOrgId").style.display = 'none';
     }
     if($('input:radio[name="is_hak"]:checked').val() == 1){//海康
         document.getElementById("ip").style.display = 'block';
@@ -954,6 +962,7 @@
         document.getElementById("key_name").innerHTML = "请求key";
         document.getElementById("secret_name").innerHTML = "请求secret";
         document.getElementById("kongbai").style.display = 'none';
+        document.getElementById("sOrgId").style.display = 'none';
     }
     if($('input:radio[name="is_hak"]:checked').val() == 4){//天地伟业
         document.getElementById("ip").style.display = 'block';
@@ -963,6 +972,7 @@
         document.getElementById("key_name").innerHTML = "用户名";
         document.getElementById("secret_name").innerHTML = "密码";
         document.getElementById("kongbai").style.display = 'none';
+        document.getElementById("sOrgId").style.display = 'block';
     }
 
     layui.use(['form', 'laydate', 'table'], function () {
@@ -981,6 +991,7 @@
                 document.getElementById("key").style.display = 'none';
                 document.getElementById("secret").style.display = 'none';
                 document.getElementById("kongbai").style.display = 'block';
+                document.getElementById("sOrgId").style.display = 'none';
 
             }else if(val == 1){
                 document.getElementById("ip").style.display = 'block';
@@ -990,6 +1001,7 @@
                 document.getElementById("key_name").innerHTML = "请求key";
                 document.getElementById("secret_name").innerHTML = "请求secret";
                 document.getElementById("kongbai").style.display = 'none';
+                document.getElementById("sOrgId").style.display = 'none';
             }else if(val == 4){
                 document.getElementById("ip").style.display = 'block';
                 document.getElementById("port").style.display = 'block';
@@ -998,6 +1010,7 @@
                 document.getElementById("key_name").innerHTML = "用户名";
                 document.getElementById("secret_name").innerHTML = "密码";
                 document.getElementById("kongbai").style.display = 'none';
+                document.getElementById("sOrgId").style.display = 'block';
             }
         });
 

Modules/Mine/Database/Migrations/2022_03_18_182708_update_mine_list_ext_table.php

@@ -0,0 +1,30 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class UpdateMineListExtTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('mine_list_ext', function (Blueprint $table) {
+            $table->string('sOrgId')->nullable()->comment('设备ID');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }
+}

Modules/Mine/Http/Controllers/MineController.php

@@ -51,13 +51,14 @@ class MineController extends BaseController
 
         $formObj = new FromAuxiliary('mine/list/add');
         $formObj->tree_select('parent_id', '父级矿区单位', $titleList);
-        $formObj->input('title', '矿区单位名称');
+        $formObj->input('title', '矿区单位');
         $formObj->input('sort', '排序', 1);
         $formObj->radio('is_hak', '视频服务器类型', [MineEnum::IS_HAK_YES => '海康',MineEnum::IS_HAK_TD => '天地伟业',MineEnum::IS_HAK_NO => '其它', ], 1);
         $formObj->input('ip', 'ip地址');
         $formObj->input('port', '端口');
         $formObj->input('key', '请求key');
         $formObj->input('secret', '请求secret');
+        $formObj->input('sOrgId', '设备ID');
 //        $formObj->radio('show', '是否显示', [1 => '是', 0 => '否'], 1);
         $formObj->title = '添加矿区单位';
         return $this->from($formObj);
@@ -120,6 +121,7 @@ class MineController extends BaseController
         $formObj->input('port', '端口');
         $formObj->input('key', '请求key');
         $formObj->input('secret', '请求secret');
+        $formObj->input('sOrgId', '设备ID');
         $formObj->title = '修改矿区单位';
         return $this->from($formObj);
     }

Modules/Mine/Services/MineServices.php

@@ -151,6 +151,7 @@ class MineServices{
                 'key'        => $params['key'],
                 'secret'     => $params['secret'],
                 'is_hak'     => $params['is_hak'],
+                'sOrgId'     => $params['sOrgId'],
                 'created_at' => date('Y-m-d H:i:s'),
                 'updated_at' => date('Y-m-d H:i:s'),
             ]
@@ -172,6 +173,7 @@ class MineServices{
                     'key'        => $params['key'],
                     'secret'     => $params['secret'],
                     'is_hak'     => $params['is_hak'],
+                    'sOrgId'     => $params['sOrgId'],
                     'updated_at' => date('Y-m-d H:i:s'),
                 ]
             );
@@ -271,6 +273,7 @@ class MineServices{
             $mine_list->key    = $mine_list_ext->key;
             $mine_list->secret = $mine_list_ext->secret;
             $mine_list->is_hak = $mine_list_ext->is_hak;
+            $mine_list->sOrgId = $mine_list_ext->sOrgId;
         }
 
         return $mine_list;