فهرست منبع

宁煤摄像头统计接口修改

任敬轩 2 سال پیش
والد
کامیت
6aba63d589
1فایلهای تغییر یافته به همراه8 افزوده شده و 4 حذف شده
  1. 8 4
      Modules/Camera/Http/Controllers/Api/CameraApiController.php

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

@@ -88,11 +88,11 @@ class CameraApiController extends BaseController
 
         //宁煤在离线数量
         $data[0]['title'] = $ningmei[0]->title;
-        $data[0]['mine_code'] = $ningmei[0]->mine_code;
+        $data[0]['mine_code'] = $ningmei[0]->slug;
         $data[0]['total'] = DB::table('camera_list')->whereIn('mine_id',$mine_ningmei)->where('deleted_at',null)->count();
         $data[0]['total_online'] = DB::table('camera_list')->whereIn('mine_id',$mine_ningmei)->where('camera_status',1)->where('deleted_at',null)->count();
         $data[0]['total_offline'] = $data[0]['total'] - $data[0]['total_online'];
-        $data[0]['rate'] = round($data[0]['total_online'] / $data[0]['total'] * 100)."%";
+        $data[0]['rate'] = round($data[0]['total_online'] / $data[0]['total'] * 100,2)."%";
 
         //宁煤下各矿在离线数量
         $mine_list = DB::table('mine_list')->where('parent_id',$ningmei[0]->id)->where('deleted_at',null)->get();
@@ -106,11 +106,15 @@ class CameraApiController extends BaseController
                 }
             }
             $data[$k+1]['title'] = $v->title;
-            $data[$k+1]['mine_code'] = $v->mine_code;
+            $data[$k+1]['mine_code'] = $v->slug;
             $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'];
-            $data[$k+1]['rate'] = round($data[$k+1]['total_online'] / $data[$k+1]['total'] * 100)."%";
+            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)."%";
+            }
         }
 
         return self::successResponse($data);