摄像头统计接口修改

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

@@ -105,31 +105,43 @@ class CameraApiController extends BaseController
                     }
                 }
             }
+
+            $total = DB::table('camera_list')->whereIn('mine_id',$mine_use)->where('deleted_at',null)->count();
+            $total_online = DB::table('camera_list')->whereIn('mine_id',$mine_use)->where('camera_status',1)->where('deleted_at',null)->count();
+
+            if($total == 0){
+                $rate = "0%";
+            }else{
+                $rate = round($total_online / $total * 100,2)."%";
+            }
+
             if($v->slug == 'NingXiaMeiYeTeShuZuoYeJianKongShiPin'){
                 $res['title'] = $v->title;
                 $res['mine_code'] = $v->slug."_jituan";
-                $res['total'] = DB::table('camera_list')->whereIn('mine_id',$mine_use)->where('deleted_at',null)->count();
-                $res['total_online'] = DB::table('camera_list')->whereIn('mine_id',$mine_use)->where('camera_status',1)->where('deleted_at',null)->count();
-                $res['total_offline'] = $res['total'] - $res['total_online'];
+                $res['total'] = $total;
+                $res['total_online'] = $total_online;
+                $res['total_offline'] = $total - $total_online;
+                $res['rate'] = $rate;
             }else{
-                $data[$k+1]['title'] = $v->title;
-                $data[$k+1]['mine_code'] = $v->slug."_jituan";
-                $data[$k+1]['total'] = DB::table('camera_list')->whereIn('mine_id',$mine_use)->where('deleted_at',null)->count();
-                $data[$k+1]['total_online'] = DB::table('camera_list')->whereIn('mine_id',$mine_use)->where('camera_status',1)->where('deleted_at',null)->count();
-                $data[$k+1]['total_offline'] = $data[$k+1]['total'] - $data[$k+1]['total_online'];
-                if($data[$k+1]['total'] == 0){
-                    $data[$k+1]['rate'] = "0%";
-                }else{
-                    $data[$k+1]['rate'] = round($data[$k+1]['total_online'] / $data[$k+1]['total'] * 100,2)."%";
-                }
+                array_push($data,[
+                    'title'=>$v->title,
+                    'mine_code'=>$v->slug."_jituan",
+                    'total'=>$total,
+                    'total_online'=>$total_online,
+                    'total_offline'=>$total - $total_online,
+                    'rate'=>$rate
+                ]);
             }
         }
-        $count = count($data)+1;
-        $data[$count]['title'] = $res['title'];
-        $data[$count]['mine_code'] = $res['mine_code'];
-        $data[$count]['total'] = $res['total'];
-        $data[$count]['total_online'] = $res['total_online'];
-        $data[$count]['total_offline'] = $res['total_offline'];
+
+        array_push($data,[
+            'title'=>$res['title'],
+            'mine_code'=>$res['mine_code'],
+            'total'=>$res['total'],
+            'total_online'=>$res['total_online'],
+            'total_offline'=>$res['total_offline'],
+            'rate'=>$res['rate']
+        ]);
         return self::successResponse($data);
     }