Bladeren bron

去掉同步脚本更新时间判断逻辑

任敬轩 2 jaren geleden
bovenliggende
commit
821572d07e
2 gewijzigde bestanden met toevoegingen van 17 en 17 verwijderingen
  1. 11 11
      Modules/Camera/Services/CameraServices.php
  2. 6 6
      app/Console/Commands/UpdateHkList.php

+ 11 - 11
Modules/Camera/Services/CameraServices.php

@@ -1521,7 +1521,7 @@ class CameraServices
 
         $query = MineListExt::where('mine_id', $parent_id)->first();
 
-        $degree = DB::table('mine_list')->where('index_code',$mine_id)->value('degree');
+//        $degree = DB::table('mine_list')->where('index_code',$mine_id)->value('degree');
 
         $list = [];
 
@@ -1536,18 +1536,18 @@ class CameraServices
         $haikang   = new HaiKangController();
         $result_hk = $haikang->getCamerasList();
 
-        $degree_list = explode('|',$degree);
+//        $degree_list = explode('|',$degree);
 
-        $result['is_update'] = false;
+//        $result['is_update'] = false;
 
-        if(count($degree_list) > 0){
-            foreach($degree_list as $k => $v){
-                $mine_name = DB::table('mine_list')->where('id',$v)->value('title');
-                if($haikang->getMineInfo($mine_name) == true){
-                    $result['is_update'] = true;
-                }
-            }
-        }
+//        if(count($degree_list) > 0){
+//            foreach($degree_list as $k => $v){
+//                $mine_name = DB::table('mine_list')->where('id',$v)->value('title');
+//                if($haikang->getMineInfo($mine_name) == true){
+//                    $result['is_update'] = true;
+//                }
+//            }
+//        }
 
         if (isset($result_hk['data']['list'])) {
             foreach ($result_hk['data']['list'] as $key => $val) {

+ 6 - 6
app/Console/Commands/UpdateHkList.php

@@ -230,8 +230,8 @@ class UpdateHkList extends Command
                     $index_code_arr[$k] = $v['camera_id'];
 
                     //更新时间距当前时间天数
-                    $update_time = strtotime($v['updateTime']);
-                    $update_time = number_format((time() - $update_time)/(60*60*24),2);
+//                    $update_time = strtotime($v['updateTime']);
+//                    $update_time = number_format((time() - $update_time)/(60*60*24),2);
 
                     $params = [
                         'mine_id'       => $val->id,
@@ -246,11 +246,11 @@ class UpdateHkList extends Command
 //                        'camera_status'        => $v['camera_status'],
                     ];
 
-                    if($result['is_update'] == true){
+//                    if($result['is_update'] == true){
                         CameraList::updateOrCreate(['index_code' => $v['camera_id']], $params);
-                    }elseif($update_time < 10){
-                        CameraList::updateOrCreate(['index_code' => $v['camera_id']], $params);
-                    }
+//                    }elseif($update_time < 10){
+//                        CameraList::updateOrCreate(['index_code' => $v['camera_id']], $params);
+//                    }
 
                 }