修改脚本

.idea/workspace.xml

@@ -2,7 +2,9 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="b5beace6-e4f4-419b-8299-c67e17af5998" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/Modules/Camera/Enum/CameraEnum.php" beforeDir="false" afterPath="$PROJECT_DIR$/Modules/Camera/Enum/CameraEnum.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Modules/Admin/Traits/ClassifyMethod.php" beforeDir="false" afterPath="$PROJECT_DIR$/Modules/Admin/Traits/ClassifyMethod.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Modules/Camera/Entities/CameraList.php" beforeDir="false" afterPath="$PROJECT_DIR$/Modules/Camera/Entities/CameraList.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Modules/Mine/Entities/MineList.php" beforeDir="false" afterPath="$PROJECT_DIR$/Modules/Mine/Entities/MineList.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/Console/Commands/UpdateHkList.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Console/Commands/UpdateHkList.php" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -19,8 +21,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/Modules/Camera/Enum/CameraEnum.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="697">
-              <caret line="54" column="25" selection-start-line="54" selection-start-column="10" selection-end-line="54" selection-end-column="25" />
+            <state relative-caret-position="116">
+              <caret line="13" column="34" selection-start-line="13" selection-start-column="10" selection-end-line="13" selection-end-column="34" />
             </state>
           </provider>
         </entry>
@@ -38,60 +40,57 @@
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/Modules/Camera/Jobs/CameraListExcel.php">
+        <entry file="file://$PROJECT_DIR$/app/Http/Controllers/TestsController.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="524">
-              <caret line="143" column="44" selection-start-line="143" selection-start-column="8" selection-end-line="143" selection-end-column="44" />
+            <state relative-caret-position="424">
+              <caret line="37" column="26" lean-forward="true" selection-start-line="37" selection-start-column="26" selection-end-line="37" selection-end-column="26" />
               <folding>
-                <element signature="e#39#68#0#PHP" expanded="true" />
+                <element signature="e#126#164#0#PHP" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/Http/Controllers/TestsController.php">
+        <entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/HaiKangController.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="424">
-              <caret line="37" column="26" lean-forward="true" selection-start-line="37" selection-start-column="26" selection-end-line="37" selection-end-column="26" />
+            <state relative-caret-position="419">
+              <caret line="147" column="43" selection-start-line="147" selection-start-column="43" selection-end-line="147" selection-end-column="43" />
               <folding>
-                <element signature="e#126#164#0#PHP" expanded="true" />
+                <element signature="e#141#185#0#PHP" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/CameraApiController.php">
+        <entry file="file://$PROJECT_DIR$/Modules/Admin/Traits/ClassifyMethod.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="579">
-              <caret line="38" column="48" selection-start-line="38" selection-start-column="48" selection-end-line="38" selection-end-column="48" />
+            <state relative-caret-position="455">
+              <caret line="237" column="52" selection-start-line="237" selection-start-column="52" selection-end-line="237" selection-end-column="52" />
               <folding>
-                <element signature="e#141#162#0#PHP" expanded="true" />
+                <element signature="e#126#153#0#PHP" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php">
+        <entry file="file://$PROJECT_DIR$/Modules/Mine/Entities/MineList.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="253">
-              <caret line="441" column="27" selection-start-line="441" selection-start-column="27" selection-end-line="441" selection-end-column="27" />
-              <folding>
-                <element signature="e#129#150#0#PHP" expanded="true" />
-              </folding>
+            <state relative-caret-position="210">
+              <caret line="11" column="113" selection-start-line="11" selection-start-column="113" selection-end-line="11" selection-end-column="113" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/HaiKangController.php">
+        <entry file="file://$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="312">
-              <caret line="141" column="39" selection-start-line="141" selection-start-column="36" selection-end-line="141" selection-end-column="39" />
+            <state relative-caret-position="123">
+              <caret line="441" column="27" selection-start-line="441" selection-start-column="27" selection-end-line="441" selection-end-column="27" />
               <folding>
-                <element signature="e#141#185#0#PHP" expanded="true" />
+                <element signature="e#129#150#0#PHP" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -100,8 +99,8 @@
       <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/app/Console/Commands/UpdateHkList.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="230">
-              <caret line="64" column="37" lean-forward="true" selection-start-line="64" selection-start-column="37" selection-end-line="64" selection-end-column="37" />
+            <state relative-caret-position="261">
+              <caret line="53" column="81" selection-start-line="53" selection-start-column="81" selection-end-line="53" selection-end-column="81" />
               <folding>
                 <element signature="e#40#71#0#PHP" expanded="true" />
               </folding>
@@ -110,10 +109,19 @@
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/Modules/Camera/Entities/CameraList.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="231">
+              <caret line="12" column="98" selection-start-line="12" selection-start-column="89" selection-end-line="12" selection-end-column="98" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <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="-3621">
-              <caret line="22" column="6" selection-start-line="22" selection-start-column="6" selection-end-line="22" selection-end-column="6" />
+            <state relative-caret-position="508">
+              <caret line="272" column="39" selection-start-line="272" selection-start-column="39" selection-end-line="272" selection-end-column="39" />
               <folding>
                 <element signature="e#127#148#0#PHP" expanded="true" />
               </folding>
@@ -125,7 +133,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>formSelects.</find>
       <find>formSelects:</find>
       <find>formSelects</find>
       <find>sendLoginResponse</find>
@@ -155,6 +162,7 @@
       <find>getRegionsList</find>
       <find>degree</find>
       <find>getHaiKangCamera</find>
+      <find>updateOrCreate</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -163,8 +171,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/storage/logs/laravel-2021-04-20.log" />
-        <option value="$PROJECT_DIR$/storage/logs/laravel-2021-04-21.log" />
         <option value="$PROJECT_DIR$/Modules/Admin/Enum/AdminEnum.php" />
         <option value="$PROJECT_DIR$/Modules/Admin/Http/Controllers/UsersController.php" />
         <option value="$PROJECT_DIR$/Modules/Camera/Routes/web.php" />
@@ -210,9 +216,11 @@
         <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" />
         <option value="$PROJECT_DIR$/app/Http/Controllers/TestsController.php" />
-        <option value="$PROJECT_DIR$/Modules/Admin/Traits/ClassifyMethod.php" />
         <option value="$PROJECT_DIR$/Modules/Camera/Enum/CameraEnum.php" />
         <option value="$PROJECT_DIR$/Modules/Camera/Database/Migrations/2021_05_19_070340_add_field_to_camera_list_05191503.php" />
+        <option value="$PROJECT_DIR$/Modules/Camera/Entities/CameraList.php" />
+        <option value="$PROJECT_DIR$/Modules/Mine/Entities/MineList.php" />
+        <option value="$PROJECT_DIR$/Modules/Admin/Traits/ClassifyMethod.php" />
         <option value="$PROJECT_DIR$/app/Console/Commands/UpdateHkList.php" />
       </list>
     </option>
@@ -522,12 +530,12 @@
       <updated>1618368322468</updated>
       <workItem from="1618368323697" duration="143000" />
       <workItem from="1618368497550" duration="219162000" />
-      <workItem from="1621301484015" duration="24183000" />
+      <workItem from="1621301484015" duration="25296000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="243488000" />
+    <option name="totallyTimeSpent" value="244601000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="0" width="1440" height="900" extended-state="0" />
@@ -623,20 +631,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Modules/Mine/Entities/MineList.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="168">
-          <caret line="9" column="20" lean-forward="true" selection-end-line="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/Modules/Camera/Entities/CameraList.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="210">
-          <caret line="11" column="35" selection-end-line="13" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/Modules/Mine/Entities/MineListExt.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="21">
@@ -796,26 +790,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="441">
-          <caret line="238" column="37" selection-start-line="238" selection-start-column="32" selection-end-line="238" selection-end-column="37" />
-          <folding>
-            <element signature="e#126#153#0#PHP" expanded="true" />
-          </folding>
-        </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="312">
-          <caret line="141" column="39" selection-start-line="141" selection-start-column="36" selection-end-line="141" selection-end-column="39" />
-          <folding>
-            <element signature="e#141#185#0#PHP" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/Modules/Mine/Http/Controllers/Api/MineApiController.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="487">
@@ -846,13 +820,6 @@
         </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="697">
-          <caret line="54" column="25" selection-start-line="54" selection-start-column="10" selection-end-line="54" selection-end-column="25" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/CameraController.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="417">
@@ -887,30 +854,71 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="123">
+          <caret line="441" column="27" selection-start-line="441" selection-start-column="27" selection-end-line="441" selection-end-column="27" />
+          <folding>
+            <element signature="e#129#150#0#PHP" expanded="true" />
+          </folding>
+        </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="116">
+          <caret line="13" column="34" selection-start-line="13" selection-start-column="10" selection-end-line="13" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Modules/Camera/Entities/CameraList.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="231">
+          <caret line="12" column="98" selection-start-line="12" selection-start-column="89" selection-end-line="12" selection-end-column="98" />
+        </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="-3621">
-          <caret line="22" column="6" selection-start-line="22" selection-start-column="6" selection-end-line="22" selection-end-column="6" />
+        <state relative-caret-position="508">
+          <caret line="272" column="39" selection-start-line="272" selection-start-column="39" selection-end-line="272" selection-end-column="39" />
           <folding>
             <element signature="e#127#148#0#PHP" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php">
+    <entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/HaiKangController.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="253">
-          <caret line="441" column="27" selection-start-line="441" selection-start-column="27" selection-end-line="441" selection-end-column="27" />
+        <state relative-caret-position="419">
+          <caret line="147" column="43" selection-start-line="147" selection-start-column="43" selection-end-line="147" selection-end-column="43" />
           <folding>
-            <element signature="e#129#150#0#PHP" expanded="true" />
+            <element signature="e#141#185#0#PHP" expanded="true" />
+          </folding>
+        </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="455">
+          <caret line="237" column="52" selection-start-line="237" selection-start-column="52" selection-end-line="237" selection-end-column="52" />
+          <folding>
+            <element signature="e#126#153#0#PHP" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/Modules/Mine/Entities/MineList.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="210">
+          <caret line="11" column="113" selection-start-line="11" selection-start-column="113" selection-end-line="11" selection-end-column="113" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/app/Console/Commands/UpdateHkList.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="230">
-          <caret line="64" column="37" lean-forward="true" selection-start-line="64" selection-start-column="37" selection-end-line="64" selection-end-column="37" />
+        <state relative-caret-position="261">
+          <caret line="53" column="81" selection-start-line="53" selection-start-column="81" selection-end-line="53" selection-end-column="81" />
           <folding>
             <element signature="e#40#71#0#PHP" expanded="true" />
           </folding>

Modules/Admin/Traits/ClassifyMethod.php

@@ -236,7 +236,6 @@ trait ClassifyMethod
 
         $classify         = $this->classify->updateOrCreate(['id' => $classifyInfo['id'] ?? ''], $classifyInfo);
         $classify->degree = $degree . $classify->id;
-        $classify->index_code = isset($classifyInfo['index_code']) ? $classifyInfo['index_code'] : '';
         $classify->save();
 
         // 更新子集

Modules/Camera/Entities/CameraList.php

@@ -10,5 +10,5 @@ class CameraList extends Model
     protected $table        = 'camera_list';
     public    $incrementing = false;
     protected $keyType      = 'string';
-    protected $fillable     = [];
+    protected $fillable     = ['mine_id', 'index_code', 'camera_name', 'camera_source', 'revert_id'];
 }

Modules/Mine/Entities/MineList.php

@@ -9,5 +9,5 @@ class MineList extends Model
 {
     use SoftDeletes;
     protected $table = 'mine_list';
-    protected $fillable = ['parent_id', 'title', 'slug', 'sort', 'tier', 'degree', 'show', 'can_del'];
+    protected $fillable = ['parent_id', 'title', 'slug', 'sort', 'tier', 'degree', 'show', 'can_del', 'index_code'];
 }

app/Console/Commands/UpdateHkList.php

@@ -51,8 +51,7 @@ class UpdateHkList extends Command
     public function updateAreaList()
     {
         //查询使用海康服务器的矿区id
-//        $mine_id_list = MineListExt::where('is_hak', 1)->pluck('mine_id')->all();
-        $mine_id_list = MineListExt::where('mine_id', 5)->pluck('mine_id')->all();
+        $mine_id_list = MineListExt::where('is_hak', 1)->pluck('mine_id')->all();
 
         foreach ($mine_id_list as $key => $val) {
             MineServices::getHaiKangArea($val, CameraEnum::REQUEST_TYPE_LOCAL);
@@ -69,14 +68,15 @@ class UpdateHkList extends Command
             $result = CameraServices::getHaiKangCamera($degree[0], $val->index_code, CameraEnum::CAMERA_TYPE_ALL);
 
             if ($result['status']) {
-                foreach ($result['content']['data'] as $k => $v) {
+                foreach ($result['data'] as $k => $v) {
                     $params = [
                         'mine_id'       => $val->id,
                         'camera_name'   => $v['camera_name'],
                         'index_code'    => $v['camera_id'],
+                        'revert_id'     => CameraEnum::CAMERA_DEFAULT_REVERT_ID,
                         'camera_source' => CameraEnum::CAMERA_SOURCE_2,
                     ];
-                    CameraList::updateOrCreate($v['camera_id'], $params);
+                    CameraList::updateOrCreate(['index_code' => $v['camera_id']], $params);
                 }
             }
         }