添加同步海康区域脚本

.idea/workspace.xml

@@ -30,7 +30,7 @@
         <entry file="file://$PROJECT_DIR$/app/Http/Controllers/TestsController.php">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="311">
-              <caret line="24" column="23" lean-forward="true" selection-start-line="23" selection-start-column="8" selection-end-line="24" selection-end-column="23" />
+              <caret line="24" column="23" selection-start-line="23" selection-start-column="8" selection-end-line="24" selection-end-column="23" />
               <folding>
                 <element signature="e#126#164#0#PHP" expanded="true" />
               </folding>
@@ -66,7 +66,7 @@
         <entry file="file://$PROJECT_DIR$/Modules/Mine/Http/Controllers/MineController.php">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="331">
-              <caret line="76" column="31" lean-forward="true" selection-start-line="75" selection-start-column="8" selection-end-line="76" selection-end-column="31" />
+              <caret line="76" column="31" selection-start-line="75" selection-start-column="8" selection-end-line="76" selection-end-column="31" />
               <folding>
                 <element signature="e#49#93#0#PHP" expanded="true" />
               </folding>
@@ -77,8 +77,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/Modules/Admin/Traits/ClassifyMethod.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="103">
-              <caret line="215" column="50" selection-start-line="215" selection-start-column="37" selection-end-line="215" selection-end-column="50" />
+            <state relative-caret-position="649">
+              <caret line="235" column="82" selection-start-line="235" selection-start-column="69" selection-end-line="235" selection-end-column="82" />
             </state>
           </provider>
         </entry>
@@ -86,8 +86,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/Modules/Mine/Services/MineServices.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="508">
-              <caret line="274" column="39" selection-start-line="274" selection-start-column="39" selection-end-line="274" selection-end-column="39" />
+            <state relative-caret-position="603">
+              <caret line="272" column="38" selection-start-line="272" selection-start-column="38" selection-end-line="272" selection-end-column="38" />
               <folding>
                 <element signature="e#127#148#0#PHP" expanded="true" />
               </folding>
@@ -95,11 +95,11 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/HaiKangController.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="199">
-              <caret line="127" column="39" selection-start-line="127" selection-start-column="27" selection-end-line="127" selection-end-column="39" />
+            <state relative-caret-position="422">
+              <caret line="139" column="24" selection-start-line="139" selection-start-column="24" selection-end-line="139" selection-end-column="24" />
               <folding>
                 <element signature="e#141#185#0#PHP" expanded="true" />
               </folding>
@@ -107,11 +107,11 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
+      <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/app/Console/Commands/UpdateHkList.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="508">
-              <caret line="50" column="77" lean-forward="true" selection-start-line="50" selection-start-column="77" selection-end-line="50" selection-end-column="77" />
+            <state relative-caret-position="495">
+              <caret line="49" column="73" selection-start-line="49" selection-start-column="73" selection-end-line="49" selection-end-column="73" />
               <folding>
                 <element signature="e#40#71#0#PHP" expanded="true" />
               </folding>
@@ -161,7 +161,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/Modules/Camera/Database/Migrations/2021_04_20_071702_create_camera_field_list.php" />
         <option value="$PROJECT_DIR$/Modules/Camera/Entities/CameraList.php" />
         <option value="$PROJECT_DIR$/storage/logs/laravel-2021-04-20.log" />
         <option value="$PROJECT_DIR$/storage/logs/laravel-2021-04-21.log" />
@@ -210,8 +209,9 @@
         <option value="$PROJECT_DIR$/Modules/Camera/Enum/CameraEnum.php" />
         <option value="$PROJECT_DIR$/app/Http/Controllers/TestsController.php" />
         <option value="$PROJECT_DIR$/Modules/Mine/Services/MineServices.php" />
-        <option value="$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/HaiKangController.php" />
         <option value="$PROJECT_DIR$/app/Console/Commands/UpdateHkList.php" />
+        <option value="$PROJECT_DIR$/Modules/Mine/Database/Migrations/2021_05_19_033907_add_field_to_mine_list.php" />
+        <option value="$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/HaiKangController.php" />
       </list>
     </option>
   </component>
@@ -520,12 +520,12 @@
       <updated>1618368322468</updated>
       <workItem from="1618368323697" duration="143000" />
       <workItem from="1618368497550" duration="219162000" />
-      <workItem from="1621301484015" duration="17608000" />
+      <workItem from="1621301484015" duration="19145000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="236913000" />
+    <option name="totallyTimeSpent" value="238450000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="0" width="1440" height="900" extended-state="0" />
@@ -556,13 +556,6 @@
     <option name="version" value="1" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="jar://$APPLICATION_HOME_DIR$/plugins/php/lib/php.jar!/stubs/standard/standard_2.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="260">
-          <caret line="597" column="9" selection-start-line="597" selection-start-column="9" selection-end-line="597" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/vendor/filp/whoops/src/Whoops/Resources/views/env_details.html.php">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
@@ -834,13 +827,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Modules/Admin/Traits/ClassifyMethod.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="103">
-          <caret line="215" column="50" selection-start-line="215" selection-start-column="37" selection-end-line="215" selection-end-column="50" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/Modules/Camera/Enum/CameraEnum.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="676">
@@ -851,7 +837,7 @@
     <entry file="file://$PROJECT_DIR$/app/Http/Controllers/TestsController.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="311">
-          <caret line="24" column="23" lean-forward="true" selection-start-line="23" selection-start-column="8" selection-end-line="24" selection-end-column="23" />
+          <caret line="24" column="23" selection-start-line="23" selection-start-column="8" selection-end-line="24" selection-end-column="23" />
           <folding>
             <element signature="e#126#164#0#PHP" expanded="true" />
           </folding>
@@ -868,42 +854,56 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Modules/Mine/Http/Controllers/MineController.php">
+    <entry file="file://$PROJECT_DIR$/app/Console/Commands/UpdateHkList.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="331">
-          <caret line="76" column="31" lean-forward="true" selection-start-line="75" selection-start-column="8" selection-end-line="76" selection-end-column="31" />
+        <state relative-caret-position="495">
+          <caret line="49" column="73" selection-start-line="49" selection-start-column="73" selection-end-line="49" selection-end-column="73" />
           <folding>
-            <element signature="e#49#93#0#PHP" expanded="true" />
+            <element signature="e#40#71#0#PHP" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/HaiKangController.php">
+    <entry file="file://$PROJECT_DIR$/Modules/Mine/Database/Migrations/2021_05_19_033907_add_field_to_mine_list.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="294">
+          <caret line="16" column="74" lean-forward="true" selection-start-line="16" selection-start-column="74" selection-end-line="16" selection-end-column="74" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Modules/Mine/Http/Controllers/MineController.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="199">
-          <caret line="127" column="39" selection-start-line="127" selection-start-column="27" selection-end-line="127" selection-end-column="39" />
+        <state relative-caret-position="331">
+          <caret line="76" column="31" selection-start-line="75" selection-start-column="8" selection-end-line="76" selection-end-column="31" />
           <folding>
-            <element signature="e#141#185#0#PHP" expanded="true" />
+            <element signature="e#49#93#0#PHP" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/Modules/Mine/Services/MineServices.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="508">
-          <caret line="274" column="39" selection-start-line="274" selection-start-column="39" selection-end-line="274" selection-end-column="39" />
+        <state relative-caret-position="603">
+          <caret line="272" column="38" selection-start-line="272" selection-start-column="38" selection-end-line="272" selection-end-column="38" />
           <folding>
             <element signature="e#127#148#0#PHP" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/Console/Commands/UpdateHkList.php">
+    <entry file="file://$PROJECT_DIR$/Modules/Admin/Traits/ClassifyMethod.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="649">
+          <caret line="235" column="82" selection-start-line="235" selection-start-column="69" selection-end-line="235" selection-end-column="82" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/HaiKangController.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="508">
-          <caret line="50" column="77" lean-forward="true" selection-start-line="50" selection-start-column="77" selection-end-line="50" selection-end-column="77" />
+        <state relative-caret-position="422">
+          <caret line="139" column="24" selection-start-line="139" selection-start-column="24" selection-end-line="139" selection-end-column="24" />
           <folding>
-            <element signature="e#40#71#0#PHP" expanded="true" />
+            <element signature="e#141#185#0#PHP" expanded="true" />
           </folding>
         </state>
       </provider>

Modules/Camera/Http/Controllers/Api/HaiKangController.php

@@ -13,6 +13,7 @@ use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Input;
 use Illuminate\Support\Facades\Log;
 use Modules\Camera\Enum\CameraEnum;
+use Modules\Mine\Entities\MineList;
 use Modules\Mine\Services\MineServices;
 
 
@@ -135,14 +136,19 @@ class HaiKangController extends BaseController
                 $arr[$key]['name']            = $value['name'];
                 $arr[$key]['parentIndexCode'] = $value['parentIndexCode'];
                 $arr[$key]['treeCode']        = $value['treeCode'];
+
+                $id     = MineList::where('index_code', $value['indexCode'])->value('id');
                 $params = [
-                    'parent_id' => $parent_id,
-                    'title'     => $value['name'],
-                    'sort'      => 1,
+                    'id'         => $id,
+                    'parent_id'  => $parent_id,
+                    'title'      => $value['name'],
+                    'sort'       => 1,
+                    'index_code' => $value['indexCode'],
                 ];
                 $result  = $mineService->add($params);
                 $mine_id = $result->id;
-                $arr[$key]['children']        = array_values(self::saveTree($regions, $mine_id, $value['indexCode']));
+
+                $arr[$key]['children'] = array_values(self::saveTree($regions, $mine_id, $value['indexCode']));
                 if (count($arr[$key]['children']) == 0) {
                     unset($arr[$key]['children']);
                 }

Modules/Mine/Database/Migrations/2021_05_19_033907_add_field_to_mine_list.php

@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddFieldToMineList extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('mine_list', function (Blueprint $table) {
+            $table->string('index_code', 100)->after('can_del')->nullable()->comment('海康返回区域code');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('mine_list', function (Blueprint $table) {
+            $table->dropColumn('index_code');
+        });
+    }
+}

Modules/Mine/Services/MineServices.php

@@ -260,8 +260,6 @@ class MineServices{
 
         $query = MineListExt::where('mine_id', $mine_id)->first();
 
-        $mine_name       = MineList::where('id', $mine_id)->value('title');
-
         Input::replace(
             [
                 'url'     => trim($query->ip, '/') . ':' . $query->port,

app/Console/Commands/UpdateHkList.php

@@ -47,8 +47,8 @@ class UpdateHkList extends Command
     public function updateAreaList()
     {
         //查询使用海康服务器的矿区id
-//        $mine_id_list = MineListExt::where('is_hak', 1)->pluck('id')->all();
-        $mine_id_list = MineListExt::where('mine_id', 5)->pluck('id')->all();
+//        $mine_id_list = MineListExt::where('is_hak', 1)->pluck('mine_id')->all();
+        $mine_id_list = MineListExt::where('mine_id', 5)->pluck('mine_id')->all();
 
         foreach ($mine_id_list as $key => $val) {
             $result = MineServices::getHaiKangArea($val, CameraEnum::REQUEST_TYPE_LOCAL);