Bladeren bron

摄像头状态历史数据

任敬轩 1 jaar geleden
bovenliggende
commit
8edbc917ec

+ 8 - 8
Modules/Camera/Http/Controllers/Api/CameraApiController.php

@@ -168,12 +168,12 @@ class CameraApiController extends BaseController
         }
 
         //宁煤在离线数量
-        $ningmei['title'] = '宁煤公司';
-        $ningmei['mine_code'] = $ningmei[0]->slug;
-        $ningmei['total'] = DB::table('camera_list')->whereIn('mine_id',$mine_ningmei)->where('deleted_at',null)->count();
-        $ningmei['total_online'] = DB::table('camera_list')->whereIn('mine_id',$mine_ningmei)->where('camera_status',1)->where('deleted_at',null)->count();
-        $ningmei['total_offline'] = $ningmei['total'] - $ningmei['total_online'];
-        $ningmei['rate'] = round($ningmei['total_online'] / $ningmei['total'] * 100,2);
+        $nm['title'] = '宁煤公司';
+        $nm['mine_code'] = $ningmei[0]->slug;
+        $nm['total'] = DB::table('camera_list')->whereIn('mine_id',$mine_ningmei)->where('deleted_at',null)->count();
+        $nm['total_online'] = DB::table('camera_list')->whereIn('mine_id',$mine_ningmei)->where('camera_status',1)->where('deleted_at',null)->count();
+        $nm['total_offline'] = $nm['total'] - $nm['total_online'];
+        $nm['rate'] = round($nm['total_online'] / $nm['total'] * 100,2);
 
         $data = [];
 
@@ -290,7 +290,7 @@ class CameraApiController extends BaseController
 
                 }
             }
-            
+
             for($i=0;$i<count($data);$i++){
                 if (strpos($data[$i]['title'], '煤矿') !== false || strpos($data[$i]['title'], '洗选') !== false) {
 
@@ -330,7 +330,7 @@ class CameraApiController extends BaseController
         $other_max_name = mb_substr($other_max_name, 1);
         $other_min_name = mb_substr($other_min_name, 1);
 
-        $result['data'] = '本周公司视频摄像头在线数'.$ningmei['total_online'].'个,'.'在线率为'.$ningmei['rate'].'%('.$time
+        $result['data'] = '本周公司视频摄像头在线数'.$nm['total_online'].'个,'.'在线率为'.$nm['rate'].'%('.$time
             .'统计)。其中:①煤炭生产建设单位在线率排名第一的单位是'.$unit_max_name.',在线率达到'.$unit_max_rate
             .'%;排名末位的单位是'.$unit_min_name.',在线率达到'.$unit_min_rate
             .'%。②煤制油化工单位在线率排名第一的单位是'.$mzy_max_name.',在线率达到'.$mzy_max_rate.'%;排名末位的单位是'

+ 9 - 9
app/Console/Commands/CameraStatusHistory.php

@@ -60,15 +60,15 @@ class CameraStatusHistory extends Command
         }
 
         //宁煤在离线数量
-        $ningmei['title'] = '宁煤公司';
-        $ningmei['mine_code'] = $ningmei[0]->slug;
-        $ningmei['total'] = DB::table('camera_list')->whereIn('mine_id',$mine_ningmei)->where('deleted_at',null)->count();
-        $ningmei['total_online'] = DB::table('camera_list')->whereIn('mine_id',$mine_ningmei)->where('camera_status',1)->where('deleted_at',null)->count();
-        $ningmei['total_offline'] = $ningmei['total'] - $ningmei['total_online'];
-        $ningmei['rate'] = round($ningmei['total_online'] / $ningmei['total'] * 100,2);
-        $ningmei['type'] = 0;
-        $ningmei['date'] = date('Y-m-d');
-        DB::table('camera_status_history')->insert($ningmei);
+        $nm['title'] = '宁煤公司';
+        $nm['mine_code'] = $ningmei[0]->slug;
+        $nm['total'] = DB::table('camera_list')->whereIn('mine_id',$mine_ningmei)->where('deleted_at',null)->count();
+        $nm['total_online'] = DB::table('camera_list')->whereIn('mine_id',$mine_ningmei)->where('camera_status',1)->where('deleted_at',null)->count();
+        $nm['total_offline'] = $ningmei['total'] - $ningmei['total_online'];
+        $nm['rate'] = round($ningmei['total_online'] / $ningmei['total'] * 100,2);
+        $nm['type'] = 0;
+        $nm['date'] = date('Y-m-d');
+        DB::table('camera_status_history')->insert($nm);
 
         $data = [];