修改获取区域接口

.idea/workspace.xml

@@ -4,6 +4,7 @@
     <list default="true" id="b5beace6-e4f4-419b-8299-c67e17af5998" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/HaiKangController.php" beforeDir="false" afterPath="$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/HaiKangController.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/Modules/Mine/Http/Controllers/Api/MineApiController.php" beforeDir="false" afterPath="$PROJECT_DIR$/Modules/Mine/Http/Controllers/Api/MineApiController.php" afterDir="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" />
@@ -49,13 +50,13 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
+      <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/Modules/Mine/Http/Controllers/Api/MineApiController.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="557">
-              <caret line="55" column="29" selection-start-line="55" selection-start-column="29" selection-end-line="55" selection-end-column="29" />
+            <state relative-caret-position="487">
+              <caret line="46" column="59" selection-start-line="46" selection-start-column="59" selection-end-line="46" selection-end-column="59" />
               <folding>
-                <element signature="e#139#183#0#PHP" expanded="true" />
+                <element signature="e#139#160#0#PHP" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -64,8 +65,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="-408">
-              <caret line="58" column="27" selection-start-line="58" selection-start-column="27" selection-end-line="58" selection-end-column="27" />
+            <state relative-caret-position="88">
+              <caret line="241" column="41" selection-start-line="241" selection-start-column="27" selection-end-line="241" selection-end-column="41" />
               <folding>
                 <element signature="e#127#148#0#PHP" expanded="true" />
               </folding>
@@ -73,11 +74,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="452">
-              <caret line="101" column="17" selection-start-line="101" selection-start-column="17" selection-end-line="101" selection-end-column="17" />
+            <state relative-caret-position="403">
+              <caret line="137" column="50" selection-start-line="137" selection-start-column="34" selection-end-line="137" selection-end-column="50" />
               <folding>
                 <element signature="e#141#185#0#PHP" expanded="true" />
               </folding>
@@ -88,8 +89,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/Modules/Mine/Routes/api.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="357">
-              <caret line="17" column="28" selection-start-line="17" selection-start-column="21" selection-end-line="17" selection-end-column="28" />
+            <state relative-caret-position="336">
+              <caret line="16" column="28" lean-forward="true" selection-start-line="16" selection-start-column="16" selection-end-line="16" selection-end-column="28" />
             </state>
           </provider>
         </entry>
@@ -183,10 +184,10 @@
         <option value="$PROJECT_DIR$/Modules/Admin/Auxiliary/View/TreeAuxiliary.php" />
         <option value="$PROJECT_DIR$/storage/logs/laravel-2021-04-28.log" />
         <option value="$PROJECT_DIR$/Modules/Mine/Http/Controllers/MineController.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/HaiKangController.php" />
+        <option value="$PROJECT_DIR$/Modules/Mine/Services/MineServices.php" />
         <option value="$PROJECT_DIR$/Modules/Mine/Http/Controllers/Api/MineApiController.php" />
+        <option value="$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/HaiKangController.php" />
       </list>
     </option>
   </component>
@@ -446,12 +447,12 @@
       <option name="presentableId" value="Default" />
       <updated>1618368322468</updated>
       <workItem from="1618368323697" duration="143000" />
-      <workItem from="1618368497550" duration="166465000" />
+      <workItem from="1618368497550" duration="167863000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="166608000" />
+    <option name="totallyTimeSpent" value="168006000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="0" width="1440" height="900" extended-state="0" />
@@ -793,56 +794,56 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Modules/Camera/Routes/api.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="231">
-          <caret line="20" column="44" lean-forward="true" selection-start-line="20" selection-start-column="44" selection-end-line="20" selection-end-column="44" />
+        <state relative-caret-position="198">
+          <caret line="23" column="5" lean-forward="true" selection-start-line="23" selection-start-column="5" selection-end-line="23" selection-end-column="5" />
+          <folding>
+            <element signature="e#141#162#0#PHP" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Modules/Mine/Routes/api.php">
+    <entry file="file://$PROJECT_DIR$/Modules/Camera/Routes/api.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="357">
-          <caret line="17" column="28" selection-start-line="17" selection-start-column="21" selection-end-line="17" selection-end-column="28" />
+        <state relative-caret-position="231">
+          <caret line="20" column="44" lean-forward="true" selection-start-line="20" selection-start-column="44" selection-end-line="20" selection-end-column="44" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/CameraApiController.php">
+    <entry file="file://$PROJECT_DIR$/Modules/Mine/Routes/api.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="198">
-          <caret line="23" column="5" lean-forward="true" selection-start-line="23" selection-start-column="5" selection-end-line="23" selection-end-column="5" />
-          <folding>
-            <element signature="e#141#162#0#PHP" expanded="true" />
-          </folding>
+        <state relative-caret-position="336">
+          <caret line="16" column="28" lean-forward="true" selection-start-line="16" selection-start-column="16" selection-end-line="16" selection-end-column="28" />
         </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="-408">
-          <caret line="58" column="27" selection-start-line="58" selection-start-column="27" selection-end-line="58" selection-end-column="27" />
+        <state relative-caret-position="88">
+          <caret line="241" column="41" selection-start-line="241" selection-start-column="27" selection-end-line="241" selection-end-column="41" />
           <folding>
             <element signature="e#127#148#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/Http/Controllers/Api/MineApiController.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="452">
-          <caret line="101" column="17" selection-start-line="101" selection-start-column="17" selection-end-line="101" selection-end-column="17" />
+        <state relative-caret-position="487">
+          <caret line="46" column="59" selection-start-line="46" selection-start-column="59" selection-end-line="46" selection-end-column="59" />
           <folding>
-            <element signature="e#141#185#0#PHP" expanded="true" />
+            <element signature="e#139#160#0#PHP" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Modules/Mine/Http/Controllers/Api/MineApiController.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="557">
-          <caret line="55" column="29" selection-start-line="55" selection-start-column="29" selection-end-line="55" selection-end-column="29" />
+        <state relative-caret-position="403">
+          <caret line="137" column="50" selection-start-line="137" selection-start-column="34" selection-end-line="137" selection-end-column="50" />
           <folding>
-            <element signature="e#139#183#0#PHP" expanded="true" />
+            <element signature="e#141#185#0#PHP" expanded="true" />
           </folding>
         </state>
       </provider>

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

@@ -23,7 +23,7 @@ class HaiKangController extends BaseController
     protected $time;//  时间戳
     protected $artemis;//  OpenAPI接口的上下文
 
-    public function __construct(Request $request)
+    public function __construct()
     {
 //        if ($request->has('mine')) {
 //            $this->pre_url    = config('haikang.' . $request->input('mine') . '.pre_url');  // https://120.253.79.51:4433
@@ -51,16 +51,17 @@ class HaiKangController extends BaseController
 
     /**
      * 获取区域列表
-     * @param Request $request
      * @return bool|mixed|string
      */
-    public function getRegionsList(Request $request)
+    public function getRegionsList()
     {
         $url = $this->artemis . '/api/resource/v1/regions';
         //请求参数
         $params             = [];
-        $params['pageNo']   = $request->has('pageNo') ? intval($request->input('pageNo')) : 1;
-        $params['pageSize'] = $request->has('pageSize') ? intval($request->input('pageSize')) : 1000;
+//        $params['pageNo']   = $request->has('pageNo') ? intval($request->input('pageNo')) : 1;
+//        $params['pageSize'] = $request->has('pageSize') ? intval($request->input('pageSize')) : 1000;
+        $params['pageNo']   = 1;
+        $params['pageSize'] = 1000;
         $this->sign         = $this->get_sign($url);
 
         $result = $this->curlPost($this->pre_url . $url, json_encode($params));
@@ -107,20 +108,21 @@ class HaiKangController extends BaseController
 
     /**
      * 获取区域监控列表
-     * @param Request $request
      * @return bool|mixed|string
      */
-    public function getCamerasList(Request $request)
+    public function getCamerasList()
     {
-        if (!$request->has('indexCode')) {
+        if (!Input::has('indexCode')) {
             return $this->error(1, '缺少必要参数');
         }
         $url = $this->artemis . '/api/resource/v1/regions/regionIndexCode/cameras';
         //请求参数
         $params                    = [];
-        $params['regionIndexCode'] = $request->input('indexCode');
-        $params['pageNo']          = $request->has('pageNo') ? intval($request->input('pageNo')) : 1;
-        $params['pageSize']        = $request->has('pageSize') ? intval($request->input('pageSize')) : 1000;
+        $params['regionIndexCode'] = Input::get('indexCode');
+//        $params['pageNo']          = $request->has('pageNo') ? intval($request->input('pageNo')) : 1;
+//        $params['pageSize']        = $request->has('pageSize') ? intval($request->input('pageSize')) : 1000;
+        $params['pageNo']          = 1;
+        $params['pageSize']        = 1000;
         $this->sign                = $this->get_sign($url);
 
         $result = $this->curlPost($this->pre_url . $url, json_encode($params));

Modules/Mine/Http/Controllers/Api/MineApiController.php

@@ -8,6 +8,7 @@
 
 namespace Modules\Mine\Http\Controllers\Api;
 
+use App\Enum\ApiEnum;
 use App\Http\Controllers\Api\BaseController;
 use Illuminate\Support\Facades\Input;
 use Illuminate\Support\Facades\Log;
@@ -40,21 +41,10 @@ class MineApiController extends BaseController
         $mine_id = Input::get('mine_id', '');
 
         //判断是否使用海康视频服务器
-        $query = MineListExt::where('mine_id', $mine_id)->first();
+        $is_hak = MineListExt::where('mine_id', $mine_id)->value('is_hak');
 
-        if ($query && $query->is_hak) {
-            Input::replace(
-                [
-                    'url'    => trim($query->ip, '/') . ':' . $query->port,
-                    'key'    => $query->key,
-                    'secret' => $query->secret,
-                ]
-            );
-            $haikang = new HaiKangController();
-            $result_hk = $haikang->getRegionsList();
-            $result = json_decode($result_hk->getContent(), true);
-            Log::info($result);
-            return $result;
+        if ($is_hak) {
+            $result = MineServices::getHaiKangArea($mine_id);
         } else {
             $result = MineServices::getAreaList($mine_id);
         }

Modules/Mine/Services/MineServices.php

@@ -11,8 +11,10 @@ namespace Modules\Mine\Services;
 use App\Enum\ApiEnum;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\Input;
 use Illuminate\Support\Facades\Log;
 use Modules\Admin\Traits\ClassifyMethod;
+use Modules\Camera\Http\Controllers\Api\HaiKangController;
 use Modules\Mine\Entities\MineList;
 use Modules\Mine\Entities\MineListExt;
 use Modules\Mine\Enum\MineEnum;
@@ -235,4 +237,32 @@ class MineServices{
 
         return $mine_list;
     }
+
+    //查询海康矿井区域
+    public static function getHaiKangArea($mine_id)
+    {
+        $result['status'] = true;
+        $result['msg']    = ApiEnum::RETURN_SUCCESS;
+        $result['data']   = [];
+
+        $query = MineListExt::where('mine_id', $mine_id)->first();
+
+        $mine_name       = MineList::where('id', $mine_id)->value('title');
+        $list['mine_id'] = $mine_id;
+        $list['name']    = $mine_name;
+
+        Input::replace(
+            [
+                'url'    => trim($query->ip, '/') . ':' . $query->port,
+                'key'    => $query->key,
+                'secret' => $query->secret,
+            ]
+        );
+        $haikang = new HaiKangController();
+        $result = $haikang->getRegionsList();
+        if ($result['data']['list']) {
+            $list['children'] = $result['data']['list'];
+        }
+        return $result;
+    }
 }