同步时间统计

Modules/Camera/Services/CameraServices.php

@@ -1540,6 +1540,7 @@ class CameraServices
                 $list[$key]['camera_name'] = $val['cameraName'];
                 $list[$key]['trans_code']  = $val['encodeDevIndexCode'];
                 $list[$key]['com_number']  = $val['channelNo'];
+                $list[$key]['updateTime']  = $val['updateTime'];
 //                $list[$key]['camera_status'] = $haikang->getCameraStatus($val['cameraIndexCode']);
             }
         }

app/Console/Commands/UpdateHkList.php

@@ -59,26 +59,26 @@ class UpdateHkList extends Command
         $mine_id_list = MineListExt::where('is_hak', 1)->pluck('mine_id')->all();
 
         //海康区域同步开始时间
-        $syn['hk_area_start_time'] = date('Y-m-d H:i:s');
+//        $syn['hk_area_start_time'] = date('Y-m-d H:i:s');
 
         foreach ($mine_id_list as $key => $val) {
-            if($val == 968){
-                //宁煤区域同步开始时间
-                $syn['nm_area_start_time'] = date('Y-m-d H:i:s');
-
-                MineServices::getHaiKangArea($val, CameraEnum::REQUEST_TYPE_LOCAL);
-
-                //宁煤区域同步结束时间
-                $syn['nm_area_end_time'] = date('Y-m-d H:i:s');
-            }else{
+//            if($val == 968){
+//                //宁煤区域同步开始时间
+//                $syn['nm_area_start_time'] = date('Y-m-d H:i:s');
+//
+//                MineServices::getHaiKangArea($val, CameraEnum::REQUEST_TYPE_LOCAL);
+//
+//                //宁煤区域同步结束时间
+//                $syn['nm_area_end_time'] = date('Y-m-d H:i:s');
+//            }else{
                 MineServices::getHaiKangArea($val, CameraEnum::REQUEST_TYPE_LOCAL);
-            }
+//            }
         }
 
         //海康区域同步结束时间
-        $syn['hk_area_end_time'] = date('Y-m-d H:i:s');
+//        $syn['hk_area_end_time'] = date('Y-m-d H:i:s');
         //天地区域同步开始时间
-        $syn['td_area_start_time'] = date('Y-m-d H:i:s');
+//        $syn['td_area_start_time'] = date('Y-m-d H:i:s');
 
         //同步天地伟业矿区区域
         $mine_list_ext = DB::table('mine_list_ext')
@@ -113,8 +113,8 @@ class UpdateHkList extends Command
         }
 
         //天地区域同步结束时间
-        $syn['td_area_end_time'] = date('Y-m-d H:i:s');
-        DB::table('syn')->insert($syn);
+//        $syn['td_area_end_time'] = date('Y-m-d H:i:s');
+//        DB::table('syn')->insert($syn);
     }
 
     public function updateCameraList()
@@ -226,19 +226,26 @@ class UpdateHkList extends Command
                     //当前摄像头index_code数组
                     $index_code_arr[$k] = $v['camera_id'];
 
-                    $params = [
-                        'mine_id'       => $val->id,
-                        'camera_name'   => $this->transformCameraName($v['camera_name']),
-                        'index_code'    => $v['camera_id'],
-                        'revert_id'     => CameraEnum::CAMERA_DEFAULT_REVERT_ID,
-                        'camera_source' => CameraEnum::CAMERA_SOURCE_2,
-                        'ip'            => $ip,
-                        'port'          => $port,
-                        'com_number'    => $com_number,
-                        //'sort'          => $arr_count - $k,
+                    //更新时间距当前时间天数
+                    $update_time = strtotime($v['updateTime']);
+                    $update_time = number_format((time() - $update_time)/(60*60*24),2);
+
+                    if($update_time < 1){
+                        $params = [
+                            'mine_id'       => $val->id,
+                            'camera_name'   => $this->transformCameraName($v['camera_name']),
+                            'index_code'    => $v['camera_id'],
+                            'revert_id'     => CameraEnum::CAMERA_DEFAULT_REVERT_ID,
+                            'camera_source' => CameraEnum::CAMERA_SOURCE_2,
+                            'ip'            => $ip,
+                            'port'          => $port,
+                            'com_number'    => $com_number,
+                            //'sort'          => $arr_count - $k,
 //                        'camera_status'        => $v['camera_status'],
-                    ];
-                    CameraList::updateOrCreate(['index_code' => $v['camera_id']], $params);
+                        ];
+                        CameraList::updateOrCreate(['index_code' => $v['camera_id']], $params);
+                    }
+
                 }
 
                 //删除不存在的摄像头

app/Http/Controllers/TestsController.php

@@ -48,29 +48,18 @@ class TestsController {
 
         //区域列表接口测试
 //        $this->mine_list();
-
-        $ip = '10.71.252.64';
-        $port = 4433; // 替换成相应的端口号
-
-        if($fp = @fsockopen($ip,$port,$errno,$errstr,1)) {
-            echo 'IP地址可连接';
-            fclose($fp);
-        } else {
-            echo 'IP地址连接失败';
-        }
-        dd(123);
     }
 
     //区域列表接口测试
     public function mine_list(){
-        MineServices::getHaiKangArea(968, CameraEnum::REQUEST_TYPE_LOCAL);
-        dd(123);
+        $result = MineServices::getHaiKangArea(968, CameraEnum::REQUEST_TYPE_LOCAL);
+        dd($result);
     }
 
     //区域下摄像头接口测试
     public function camera_list(){
         $result = CameraServices::getHaiKangCamera(968, '64018155582160000009', CameraEnum::CAMERA_TYPE_ALL);
-        dd(123);
+        dd($result);
     }
 
     //直播列表
@@ -217,8 +206,8 @@ class TestsController {
     public function new_joggle(){
         $mine_id_list = MineListExt::where('is_hak', 1)->pluck('mine_id')->all();
 // dd($mine_id_list);
-        MineServices::getHaiKangArea(4569, CameraEnum::REQUEST_TYPE_LOCAL);//配合修改mineext和haikangcontroller里打印
-        dd(123);
+        $result = MineServices::getHaiKangArea(4569, CameraEnum::REQUEST_TYPE_LOCAL);//配合修改mineext和haikangcontroller里打印
+        dd($result);
     }
 
     //宁煤洗选重复摄像头