修改接口

.idea/workspace.xml

@@ -3,13 +3,10 @@
   <component name="ChangeListManager">
     <list default="true" id="b5beace6-e4f4-419b-8299-c67e17af5998" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <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/Jobs/CameraListExcel.php" beforeDir="false" afterPath="$PROJECT_DIR$/Modules/Camera/Jobs/CameraListExcel.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Modules/Camera/Routes/api.php" beforeDir="false" afterPath="$PROJECT_DIR$/Modules/Camera/Routes/api.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php" beforeDir="false" afterPath="$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/public/template/摄像头列表导入模板_v1.0.xlsx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Modules/Mine/Services/MineServices.php" beforeDir="false" afterPath="$PROJECT_DIR$/Modules/Mine/Services/MineServices.php" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -25,8 +22,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="249">
-              <caret line="131" column="56" selection-start-line="131" selection-start-column="56" selection-end-line="131" selection-end-column="56" />
+            <state relative-caret-position="228">
+              <caret line="433" column="27" selection-start-line="433" selection-start-column="27" selection-end-line="433" selection-end-column="27" />
               <folding>
                 <element signature="e#129#150#0#PHP" expanded="true" />
               </folding>
@@ -37,17 +34,17 @@
       <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="361">
-              <caret line="33" column="28" selection-start-line="33" selection-start-column="10" selection-end-line="33" selection-end-column="28" />
+            <state relative-caret-position="382">
+              <caret line="34" column="43" lean-forward="true" selection-start-line="34" selection-start-column="43" selection-end-line="34" selection-end-column="43" />
             </state>
           </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/CameraApiController.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="735">
-              <caret line="104" column="38" selection-start-line="104" selection-start-column="38" selection-end-line="104" selection-end-column="38" />
+            <state relative-caret-position="312">
+              <caret line="28" column="79" lean-forward="true" selection-start-line="28" selection-start-column="49" selection-end-line="28" selection-end-column="79" />
               <folding>
                 <element signature="e#141#162#0#PHP" expanded="true" />
               </folding>
@@ -55,25 +52,13 @@
           </provider>
         </entry>
       </file>
-      <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="252">
-              <caret line="45" lean-forward="true" selection-start-line="45" selection-end-line="45" />
-              <folding>
-                <element signature="e#51#107#0#PHP" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/Modules/Camera/Jobs/CameraListExcel.php">
+        <entry file="file://$PROJECT_DIR$/Modules/Mine/Services/MineServices.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="422">
-              <caret line="134" column="48" selection-start-line="134" selection-start-column="48" selection-end-line="134" selection-end-column="48" />
+            <state relative-caret-position="445">
+              <caret line="284" column="31" selection-start-line="284" selection-start-column="31" selection-end-line="284" selection-end-column="31" />
               <folding>
-                <element signature="e#39#68#0#PHP" expanded="true" />
+                <element signature="e#127#148#0#PHP" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -108,11 +93,11 @@
       <find>getCamerasList</find>
       <find>getCamerasUrl</find>
       <find>error</find>
-      <find>/api/resource/v1/encodeDevice/search</find>
       <find>alter</find>
       <find>curl</find>
       <find>strtolow</find>
       <find>MeiKuang</find>
+      <find>/api/resource/v1/encodeDevice/search</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -121,7 +106,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/Modules/Mine/Routes/web.php" />
         <option value="$PROJECT_DIR$/Modules/Camera/Entities/CameraFieldList.php" />
         <option value="$PROJECT_DIR$/app/Enum/CommonEnum.php" />
         <option value="$PROJECT_DIR$/Modules/Admin/Enum/UserEnum.php" />
@@ -164,14 +148,15 @@
         <option value="$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/HaiKangController.php" />
         <option value="$PROJECT_DIR$/storage/logs/laravel-2021-05-08.log" />
         <option value="$PROJECT_DIR$/Modules/Mine/Http/Controllers/Api/MineApiController.php" />
-        <option value="$PROJECT_DIR$/Modules/Mine/Services/MineServices.php" />
         <option value="$PROJECT_DIR$/Modules/Camera/Routes/api.php" />
-        <option value="$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/CameraApiController.php" />
         <option value="$PROJECT_DIR$/Modules/Camera/Database/Migrations/2021_05_11_092132_add_camera_type_to_camera_list.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/Jobs/CameraListExcel.php" />
+        <option value="$PROJECT_DIR$/storage/logs/laravel-2021-05-11.log" />
+        <option value="$PROJECT_DIR$/Modules/Mine/Services/MineServices.php" />
         <option value="$PROJECT_DIR$/Modules/Camera/Http/Controllers/CameraController.php" />
+        <option value="$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/CameraApiController.php" />
+        <option value="$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php" />
       </list>
     </option>
   </component>
@@ -437,12 +422,12 @@
       <option name="presentableId" value="Default" />
       <updated>1618368322468</updated>
       <workItem from="1618368323697" duration="143000" />
-      <workItem from="1618368497550" duration="205404000" />
+      <workItem from="1618368497550" duration="213271000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="205547000" />
+    <option name="totallyTimeSpent" value="213414000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="0" width="1440" height="900" extended-state="0" />
@@ -473,13 +458,6 @@
     <option name="version" value="1" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/vendor/laravel/framework/src/Illuminate/Foundation/Auth/AuthenticatesUsers.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="260">
-          <caret line="102" column="40" selection-start-line="102" selection-start-column="23" selection-end-line="102" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/Modules/Camera/Routes/web.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="252">
@@ -760,16 +738,6 @@
         </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="-386">
-          <caret line="74" column="26" selection-start-line="74" selection-start-column="26" selection-end-line="74" selection-end-column="26" />
-          <folding>
-            <element signature="e#127#148#0#PHP" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$USER_HOME$/Downloads/php/lc_open_accesstoken_sample.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="399">
@@ -791,49 +759,62 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Modules/Camera/Enum/CameraEnum.php">
+    <entry file="file://$PROJECT_DIR$/Modules/Camera/Jobs/CameraListExcel.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="361">
-          <caret line="33" column="28" selection-start-line="33" selection-start-column="10" selection-end-line="33" selection-end-column="28" />
+        <state relative-caret-position="422">
+          <caret line="134" column="48" selection-start-line="134" selection-start-column="48" selection-end-line="134" selection-end-column="48" />
+          <folding>
+            <element signature="e#39#68#0#PHP" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php">
+    <entry file="file://$PROJECT_DIR$/storage/logs/laravel-2021-05-11.log">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/CameraController.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="249">
-          <caret line="131" column="56" selection-start-line="131" selection-start-column="56" selection-end-line="131" selection-end-column="56" />
+        <state relative-caret-position="248">
+          <caret line="42" column="14" selection-start-line="42" selection-start-column="14" selection-end-line="42" selection-end-column="14" />
           <folding>
-            <element signature="e#129#150#0#PHP" expanded="true" />
+            <element signature="e#51#107#0#PHP" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Modules/Camera/Jobs/CameraListExcel.php">
+    <entry file="file://$PROJECT_DIR$/Modules/Camera/Enum/CameraEnum.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="422">
-          <caret line="134" column="48" selection-start-line="134" selection-start-column="48" selection-end-line="134" selection-end-column="48" />
+        <state relative-caret-position="382">
+          <caret line="34" column="43" lean-forward="true" selection-start-line="34" selection-start-column="43" selection-end-line="34" selection-end-column="43" />
+        </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="445">
+          <caret line="284" column="31" selection-start-line="284" selection-start-column="31" selection-end-line="284" selection-end-column="31" />
           <folding>
-            <element signature="e#39#68#0#PHP" expanded="true" />
+            <element signature="e#127#148#0#PHP" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/CameraApiController.php">
+    <entry file="file://$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="735">
-          <caret line="104" column="38" selection-start-line="104" selection-start-column="38" selection-end-line="104" selection-end-column="38" />
+        <state relative-caret-position="228">
+          <caret line="433" column="27" selection-start-line="433" selection-start-column="27" selection-end-line="433" selection-end-column="27" />
           <folding>
-            <element signature="e#141#162#0#PHP" expanded="true" />
+            <element signature="e#129#150#0#PHP" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/CameraController.php">
+    <entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/CameraApiController.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="252">
-          <caret line="45" lean-forward="true" selection-start-line="45" selection-end-line="45" />
+        <state relative-caret-position="312">
+          <caret line="28" column="79" lean-forward="true" selection-start-line="28" selection-start-column="49" selection-end-line="28" selection-end-column="79" />
           <folding>
-            <element signature="e#51#107#0#PHP" expanded="true" />
+            <element signature="e#141#162#0#PHP" expanded="true" />
           </folding>
         </state>
       </provider>

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

@@ -11,6 +11,7 @@ namespace Modules\Camera\Http\Controllers\Api;
 use App\Enum\ApiEnum;
 use App\Http\Controllers\Api\BaseController;
 use Illuminate\Support\Facades\Input;
+use Modules\Camera\Enum\CameraEnum;
 use Modules\Camera\Services\CameraServices;
 use Modules\Mine\Entities\MineListExt;
 
@@ -23,8 +24,9 @@ class CameraApiController extends BaseController
      */
     public function getCamerasList()
     {
-        $parent_id = Input::get('parent_id', '');
-        $mine_id   = Input::get('mine_id', '');
+        $parent_id   = Input::get('parent_id', '');
+        $mine_id     = Input::get('mine_id', '');
+        $camera_type = Input::get('camera_type', CameraEnum::CAMERA_TYPE_NORMAL);
 
         if (!$parent_id || !$mine_id) {
             return self::errorResponse(ApiEnum::STATUS_CODE_EMPTY);
@@ -34,9 +36,9 @@ class CameraApiController extends BaseController
         $is_hak = MineListExt::where('mine_id', $parent_id)->value('is_hak');
 
         if ($is_hak) {
-            $result = CameraServices::getHaiKangCamera($parent_id, $mine_id);
+            $result = CameraServices::getHaiKangCamera($parent_id, $mine_id, $camera_type);
         } else {
-            $result = CameraServices::getCameraListByMineId($mine_id);
+            $result = CameraServices::getCameraListByMineId($mine_id, $camera_type);
         }
 
         return self::successResponse($result);

Modules/Camera/Http/Controllers/CameraController.php

@@ -40,9 +40,20 @@ class CameraController extends BaseController
             'mine_list', 'camera_list.mine_id', '=', 'mine_list.id'
         )->orderBy('camera_list.sort', 'desc');
 
-//        if ($request->has('mine_name')) {
-//            $camera_list = $camera_list->where('mine_list.title', 'like', '%' . $request->input('mine_name') . '%');
-//        }
+        //todo
+        if ($request->has('mine_name') && $request->input('mine_name')) {
+            $mine_id = MineList::where('title', 'like', '%' . $request->input('mine_name') . '%')->where('parent_id', 0)->value('id');
+            $camera_list = $camera_list->where('mine_list.degree', 'like', $mine_id . '|' . '%');
+        }
+
+        if ($request->has('camera_name') && $request->input('camera_name')) {
+            $camera_list = $camera_list->where('camera_list.camera_name', 'like', '%' . $request->input('camera_name') . '%');
+        }
+
+        if ($request->has('camera_type') && $request->input('camera_type')) {
+            Log::info($request->input('camera_type'));
+            $camera_list = $camera_list->where('camera_list.camera_type', $request->input('camera_type'));
+        }
 
         $camera_list = $camera_list->select(
             'camera_list.id',
@@ -60,7 +71,9 @@ class CameraController extends BaseController
         }
 
         $tableObj             = new TableAuxiliary('camera/list', $camera_list);
-//        $tableObj->search('input', 'mine_name', '矿区名称');
+        $tableObj->search('input', 'mine_name', '矿区名称');
+        $tableObj->search('input', 'camera_name', '摄像头名称');
+        $tableObj->search('select', 'camera_type', '摄像头类型', CameraEnum::CAMERA_TYPE_EXCHANGE);
         $tableObj->topActions = ['add', 'import', 'importTemplate'];
         $tableObj->column('parent_title', '矿区名称');
         $tableObj->column('title', '区域名称');

Modules/Camera/Services/CameraServices.php

@@ -256,12 +256,18 @@ class CameraServices
     }
 
     //根据矿区id获取摄像头列表
-    public static function getCameraListByMineId($mine_id)
+    public static function getCameraListByMineId($mine_id, $camera_type = CameraEnum::CAMERA_TYPE_NORMAL)
     {
         $result['status'] = true;
         $result['msg']    = ApiEnum::RETURN_SUCCESS;
 
-        $query = CameraList::where('mine_id', $mine_id)->orderBy('sort', 'desc')->select(
+        $query = CameraList::where('mine_id', $mine_id)->orderBy('sort', 'desc');
+
+        if ($camera_type) {
+            $query = $query->where('camera_type', $camera_type);
+        }
+
+        $query = $query->select(
             [
                 'id as camera_id',
                 'mine_id',
@@ -418,12 +424,16 @@ class CameraServices
     }
 
     //查询海康矿井摄像头列表
-    public static function getHaiKangCamera($parent_id, $mine_id)
+    public static function getHaiKangCamera($parent_id, $mine_id, $camera_type)
     {
         $result['status'] = true;
         $result['msg']    = ApiEnum::RETURN_SUCCESS;
         $result['data']   = [];
 
+        if ($camera_type != CameraEnum::CAMERA_TYPE_NORMAL) {
+            return $result;
+        }
+
         $query = MineListExt::where('mine_id', $parent_id)->first();
 
         $list = [];

Modules/Mine/Services/MineServices.php

@@ -275,4 +275,20 @@ class MineServices{
         
         return $result;
     }
+
+    //根据父级id递归排序矿区id
+    public static function sortMineChild($mine_list, $pid = '0', $arr = [])
+    {
+        if (empty($mine_list)) {
+            return '';
+        }
+        foreach ($mine_list as $key => $value) {
+            if ($value['parent_id'] == $pid) {
+                $arr[] = $value['id'];
+                self::sortMineChild($mine_list, $value['id'], $arr);
+            }
+        }
+        Log::info($arr);
+        return $arr;
+    }
 }