添加内网服务器维护摄像头功能

.idea/workspace.xml

@@ -2,8 +2,6 @@
 <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/Camera/Http/Controllers/Api/CameraApiController.php" beforeDir="false" afterPath="$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/CameraApiController.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/Modules/Camera/Http/Controllers/CameraController.php" beforeDir="false" afterPath="$PROJECT_DIR$/Modules/Camera/Http/Controllers/CameraController.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php" beforeDir="false" afterPath="$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php" afterDir="false" />
     </list>
@@ -21,8 +19,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="676">
-              <caret line="81" column="22" selection-start-line="81" selection-start-column="10" selection-end-line="81" selection-end-column="22" />
+            <state relative-caret-position="610">
+              <caret line="61" column="32" selection-start-line="61" selection-start-column="10" selection-end-line="61" selection-end-column="32" />
             </state>
           </provider>
         </entry>
@@ -30,8 +28,8 @@
       <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/CameraController.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="470">
-              <caret line="160" column="41" lean-forward="true" selection-start-line="160" selection-start-column="41" selection-end-line="160" selection-end-column="41" />
+            <state relative-caret-position="569">
+              <caret line="132" column="53" selection-start-line="132" selection-start-column="53" selection-end-line="132" selection-end-column="53" />
               <folding>
                 <element signature="e#51#107#0#PHP" expanded="true" />
               </folding>
@@ -42,8 +40,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/CameraApiController.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="310">
-              <caret line="79" column="76" selection-start-line="79" selection-start-column="66" selection-end-line="79" selection-end-column="76" />
+            <state relative-caret-position="373">
+              <caret line="68" column="46" selection-start-line="68" selection-start-column="46" selection-end-line="68" selection-end-column="46" />
               <folding>
                 <element signature="e#141#162#0#PHP" expanded="true" />
               </folding>
@@ -52,6 +50,15 @@
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/Modules/Camera/Routes/api.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="147">
+              <caret line="16" column="30" selection-start-line="16" selection-start-column="17" selection-end-line="16" selection-end-column="30" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/Modules/Admin/Http/Controllers/BaseController.php">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="234">
@@ -72,8 +79,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="446">
-              <caret line="48" column="9" selection-start-line="48" selection-start-column="9" selection-end-line="48" selection-end-column="9" />
+            <state relative-caret-position="2142">
+              <caret line="145" column="48" selection-start-line="145" selection-start-column="48" selection-end-line="145" selection-end-column="48" />
               <folding>
                 <element signature="e#129#150#0#PHP" expanded="true" />
               </folding>
@@ -85,7 +92,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>MeiKuang</find>
       <find>/api/resource/v1/encodeDevice/search</find>
       <find>mkdir</find>
       <find>CameraDownload</find>
@@ -94,7 +100,6 @@
       <find>degree</find>
       <find>getHaiKangCamera</find>
       <find>updateOrCreate</find>
-      <find>getCamerasUrl</find>
       <find>select</find>
       <find>title</find>
       <find>menu</find>
@@ -115,6 +120,8 @@
       <find>video_system</find>
       <find>camera_url</find>
       <find>CameraEnum::CAMERA_SOURCE_3</find>
+      <find>getCamerasUrl</find>
+      <find>camera_source</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -171,8 +178,8 @@
         <option value="$PROJECT_DIR$/app/Http/Controllers/TestsController.php" />
         <option value="$PROJECT_DIR$/.env" />
         <option value="$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/CameraApiController.php" />
-        <option value="$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php" />
         <option value="$PROJECT_DIR$/Modules/Camera/Enum/CameraEnum.php" />
+        <option value="$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php" />
         <option value="$PROJECT_DIR$/Modules/Camera/Http/Controllers/CameraController.php" />
       </list>
     </option>
@@ -517,7 +524,7 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="325176000" />
+    <option name="totallyTimeSpent" value="325513000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="0" width="1440" height="900" extended-state="0" />
@@ -677,13 +684,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Modules/Camera/Routes/api.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="126">
-          <caret line="15" column="31" lean-forward="true" selection-start-line="15" selection-start-column="17" selection-end-line="15" selection-end-column="31" />
-        </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">
@@ -881,10 +881,17 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/Modules/Camera/Routes/api.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="147">
+          <caret line="16" column="30" selection-start-line="16" selection-start-column="17" selection-end-line="16" selection-end-column="30" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/CameraApiController.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="310">
-          <caret line="79" column="76" selection-start-line="79" selection-start-column="66" selection-end-line="79" selection-end-column="76" />
+        <state relative-caret-position="373">
+          <caret line="68" column="46" selection-start-line="68" selection-start-column="46" selection-end-line="68" selection-end-column="46" />
           <folding>
             <element signature="e#141#162#0#PHP" expanded="true" />
           </folding>
@@ -893,8 +900,8 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="446">
-          <caret line="48" column="9" selection-start-line="48" selection-start-column="9" selection-end-line="48" selection-end-column="9" />
+        <state relative-caret-position="2142">
+          <caret line="145" column="48" selection-start-line="145" selection-start-column="48" selection-end-line="145" selection-end-column="48" />
           <folding>
             <element signature="e#129#150#0#PHP" expanded="true" />
           </folding>
@@ -903,15 +910,15 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/Modules/Camera/Enum/CameraEnum.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="676">
-          <caret line="81" column="22" selection-start-line="81" selection-start-column="10" selection-end-line="81" selection-end-column="22" />
+        <state relative-caret-position="610">
+          <caret line="61" column="32" selection-start-line="61" selection-start-column="10" selection-end-line="61" selection-end-column="32" />
         </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="470">
-          <caret line="160" column="41" lean-forward="true" selection-start-line="160" selection-start-column="41" selection-end-line="160" selection-end-column="41" />
+        <state relative-caret-position="569">
+          <caret line="132" column="53" selection-start-line="132" selection-start-column="53" selection-end-line="132" selection-end-column="53" />
           <folding>
             <element signature="e#51#107#0#PHP" expanded="true" />
           </folding>

Modules/Camera/Http/Controllers/CameraController.php

@@ -109,6 +109,7 @@ class CameraController extends BaseController
             'camera_list.revert_id',
             'camera_list.sort',
             'camera_list.camera_type',
+            'camera_list.camera_source',
             'mine_list.title',
             'mine_list.degree'
         )->first();
@@ -128,6 +129,9 @@ class CameraController extends BaseController
         $tableObj->column('camera_type', '摄像头类型', function ($camera_type) {
             return CameraEnum::CAMERA_TYPE_EXCHANGE[$camera_type];
         });
+        $tableObj->column('camera_source', '摄像头来源', function ($camera_source) {
+            return CameraEnum::CAMERA_SOURCE_EXCHANGE[$camera_source];
+        });
         $tableObj->column('revert_id', '流媒体id');
         $tableObj->column('user_name', '用户名');
         $tableObj->column('password', '密码');

Modules/Camera/Services/CameraServices.php

@@ -57,20 +57,21 @@ class CameraServices
         //入库动作
         $res = CameraList::insert(
             [
-                'mine_id'     => $params['mine_id'],
-                'ip'          => $params['ip'],
-                'port'        => $params['port'],
-                'user_name'   => $params['user_name'],
-                'password'    => $params['password'],
-                'com_number'  => $params['com_number'],
-                'camera_name' => $params['camera_name'],
-                'revert_id'   => CameraEnum::CAMERA_DEFAULT_REVERT_ID,
+                'mine_id'       => $params['mine_id'],
+                'ip'            => $params['ip'],
+                'port'          => $params['port'],
+                'user_name'     => $params['user_name'],
+                'password'      => $params['password'],
+                'com_number'    => $params['com_number'],
+                'camera_name'   => $params['camera_name'],
+                'revert_id'     => CameraEnum::CAMERA_DEFAULT_REVERT_ID,
 //                'status'     => $params['status'],
-                'camera_url'  => $camera_url,
-                'sort'        => $params['sort'],
-                'camera_type' => $params['camera_type'],
-                'created_at'  => date('Y-m-d H:i:s'),
-                'updated_at'  => date('Y-m-d H:i:s'),
+                'camera_url'    => $camera_url,
+                'sort'          => $params['sort'],
+                'camera_type'   => $params['camera_type'],
+                'camera_source' => $params['camera_source'],
+                'created_at'    => date('Y-m-d H:i:s'),
+                'updated_at'    => date('Y-m-d H:i:s'),
             ]
         );
 
@@ -137,18 +138,19 @@ class CameraServices
         //更新动作
         $res = CameraList::where('id', $params['id'])->update(
             [
-                'mine_id'     => $params['mine_id'],
-                'ip'          => $params['ip'],
-                'port'        => $params['port'],
-                'user_name'   => $params['user_name'],
-                'password'    => $params['password'],
-                'com_number'  => $params['com_number'],
-                'camera_name' => $params['camera_name'],
+                'mine_id'       => $params['mine_id'],
+                'ip'            => $params['ip'],
+                'port'          => $params['port'],
+                'user_name'     => $params['user_name'],
+                'password'      => $params['password'],
+                'com_number'    => $params['com_number'],
+                'camera_name'   => $params['camera_name'],
 //                'status'     => $params['status'],
-                'camera_url'  => $camera_url,
-                'sort'        => $params['sort'],
-                'camera_type' => $params['camera_type'],
-                'updated_at'  => date('Y-m-d H:i:s'),
+                'camera_url'    => $camera_url,
+                'sort'          => $params['sort'],
+                'camera_type'   => $params['camera_type'],
+                'camera_source' => $params['camera_source'],
+                'updated_at'    => date('Y-m-d H:i:s'),
             ]
         );