Merge branch 'master' of http://git.jieweizhineng.com/ushio/video_system into master

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

@@ -2311,9 +2311,9 @@ class CameraApiController extends BaseController
 
     //主屏幕
     public function mainHomeV2(Request $request){
-        $gao = DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->whereDate('create_time', today())->where('risk_level',0)->where('is_delete',0)->count();
-        $zhong = DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->whereDate('create_time', today())->where('risk_level',1)->where('is_delete',0)->count();
-        $di = DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->whereDate('create_time', today())->where('risk_level',2)->where('is_delete',0)->count();
+        $gao = DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->whereDate('create_time', DB::raw('CURDATE() - INTERVAL 1 DAY'))->where('risk_level',0)->where('is_delete',0)->count();
+        $zhong = DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->whereDate('create_time', DB::raw('CURDATE() - INTERVAL 1 DAY'))->where('risk_level',1)->where('is_delete',0)->count();
+        $di = DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->whereDate('create_time', DB::raw('CURDATE() - INTERVAL 1 DAY'))->where('risk_level',2)->where('is_delete',0)->count();
 
         $result = [
             [
@@ -2341,9 +2341,9 @@ class CameraApiController extends BaseController
 
     //风险作业占比
     public function riskWorkPercentV2(Request $request){
-        $gao = DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->whereDate('create_time', today())->where('risk_level',0)->where('is_delete',0)->count();
-        $zhong = DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->whereDate('create_time', today())->where('risk_level',1)->where('is_delete',0)->count();
-        $di = DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->whereDate('create_time', today())->where('risk_level',2)->where('is_delete',0)->count();
+        $gao = DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->whereDate('create_time', DB::raw('CURDATE() - INTERVAL 1 DAY'))->where('risk_level',0)->where('is_delete',0)->count();
+        $zhong = DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->whereDate('create_time', DB::raw('CURDATE() - INTERVAL 1 DAY'))->where('risk_level',1)->where('is_delete',0)->count();
+        $di = DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->whereDate('create_time', DB::raw('CURDATE() - INTERVAL 1 DAY'))->where('risk_level',2)->where('is_delete',0)->count();
 
         $result = [
             [
@@ -2370,7 +2370,7 @@ class CameraApiController extends BaseController
         if(count($area) > 0){
             for($i=0;$i<count($area);$i++){
                 $coal_washery_id_list = DB::connection('mysql_fwe10')->table('uf_xx_coal_washery')->where('area_id',$area[$i]->ID)->where('is_delete',0)->pluck('id');
-                $result[$i]['value'] = DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->whereIn('coal_washery_id',$coal_washery_id_list)->whereDate('create_time', today())->where('is_delete',0)->count();
+                $result[$i]['value'] = DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->whereIn('coal_washery_id',$coal_washery_id_list)->whereDate('create_time', DB::raw('CURDATE() - INTERVAL 1 DAY'))->where('is_delete',0)->count();
                 $result[$i]['name'] = $area[$i]->title;
             }
         }
@@ -2412,24 +2412,24 @@ class CameraApiController extends BaseController
                     $result['map_data'][$slog]['data'] = [
                         [
                             'name' => '高风险作业',
-                            'value'=> DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->where('coal_washery_id',$coal_washery[$i]->ID)->where('risk_level',0)->whereDate('create_time', today())->where('is_delete',0)->count()
+                            'value'=> DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->where('coal_washery_id',$coal_washery[$i]->ID)->where('risk_level',0)->whereDate('create_time', DB::raw('CURDATE() - INTERVAL 1 DAY'))->where('is_delete',0)->count()
                         ],
                         [
                             'name' => '中风险作业',
-                            'value'=> DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->where('coal_washery_id',$coal_washery[$i]->ID)->where('risk_level',1)->whereDate('create_time', today())->where('is_delete',0)->count()
+                            'value'=> DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->where('coal_washery_id',$coal_washery[$i]->ID)->where('risk_level',1)->whereDate('create_time', DB::raw('CURDATE() - INTERVAL 1 DAY'))->where('is_delete',0)->count()
                         ],
                         [
                             'name' => '低风险作业',
-                            'value'=> DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->where('coal_washery_id',$coal_washery[$i]->ID)->where('risk_level',2)->whereDate('create_time', today())->where('is_delete',0)->count()
+                            'value'=> DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->where('coal_washery_id',$coal_washery[$i]->ID)->where('risk_level',2)->whereDate('create_time', DB::raw('CURDATE() - INTERVAL 1 DAY'))->where('is_delete',0)->count()
                         ]
                     ];
                 }else{
                     array_push($result['other_data'],[
                         'title'=> $coal_washery[$i]->title,
                         'id'   => $coal_washery[$i]->ID,
-                        'gao'  => DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->where('coal_washery_id',$coal_washery[$i]->ID)->where('risk_level',0)->whereDate('create_time', today())->where('is_delete',0)->count(),
-                        'zhong'=> DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->where('coal_washery_id',$coal_washery[$i]->ID)->where('risk_level',1)->whereDate('create_time', today())->where('is_delete',0)->count(),
-                        'di'   => DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->where('coal_washery_id',$coal_washery[$i]->ID)->where('risk_level',2)->whereDate('create_time', today())->where('is_delete',0)->count()
+                        'gao'  => DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->where('coal_washery_id',$coal_washery[$i]->ID)->where('risk_level',0)->whereDate('create_time', DB::raw('CURDATE() - INTERVAL 1 DAY'))->where('is_delete',0)->count(),
+                        'zhong'=> DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->where('coal_washery_id',$coal_washery[$i]->ID)->where('risk_level',1)->whereDate('create_time', DB::raw('CURDATE() - INTERVAL 1 DAY'))->where('is_delete',0)->count(),
+                        'di'   => DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->where('coal_washery_id',$coal_washery[$i]->ID)->where('risk_level',2)->whereDate('create_time', DB::raw('CURDATE() - INTERVAL 1 DAY'))->where('is_delete',0)->count()
                     ]);
                 }
             }
@@ -2527,19 +2527,19 @@ class CameraApiController extends BaseController
         //当日片区数
         $result['data'] = [
             [
-                'number' => DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->whereIn('coal_washery_id',$coal_washery_id_list)->whereDate('create_time', date('Y-m-d'))->where('risk_level',0)->where('is_delete',0)->count(),
+                'number' => DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->whereIn('coal_washery_id',$coal_washery_id_list)->whereDate('create_time', DB::raw('CURDATE() - INTERVAL 1 DAY'))->where('risk_level',0)->where('is_delete',0)->count(),
                 'unit'   => '项',
                 'title'  => '高风险作业',
                 'color'  => '#DA0000'
             ],
             [
-                'number' => DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->whereIn('coal_washery_id',$coal_washery_id_list)->whereDate('create_time', date('Y-m-d'))->where('risk_level',1)->where('is_delete',0)->count(),
+                'number' => DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->whereIn('coal_washery_id',$coal_washery_id_list)->whereDate('create_time', DB::raw('CURDATE() - INTERVAL 1 DAY'))->where('risk_level',1)->where('is_delete',0)->count(),
                 'unit'   => '项',
                 'title'  => '中风险作业',
                 'color'  => '#FFBA00'
             ],
             [
-                'number' => DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->whereIn('coal_washery_id',$coal_washery_id_list)->whereDate('create_time', date('Y-m-d'))->where('risk_level',2)->where('is_delete',0)->count(),
+                'number' => DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->whereIn('coal_washery_id',$coal_washery_id_list)->whereDate('create_time', DB::raw('CURDATE() - INTERVAL 1 DAY'))->where('risk_level',2)->where('is_delete',0)->count(),
                 'unit'   => '项',
                 'title'  => '低风险作业',
                 'color'  => '#2BB200'
@@ -2610,17 +2610,17 @@ class CameraApiController extends BaseController
                 $result[$i]['data'] = [
                     [
                         'label' => '高',
-                        'value' => DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->where('coal_washery_id',$coal_washery[$i]->ID)->where('risk_level',0)->whereDate('create_time', today())->where('is_delete',0)->count(),
+                        'value' => DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->where('coal_washery_id',$coal_washery[$i]->ID)->where('risk_level',0)->whereDate('create_time', DB::raw('CURDATE() - INTERVAL 1 DAY'))->where('is_delete',0)->count(),
                         'color' => '#DA0000'
                     ],
                     [
                         'label' => '中',
-                        'value' => DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->where('coal_washery_id',$coal_washery[$i]->ID)->where('risk_level',1)->whereDate('create_time', today())->where('is_delete',0)->count(),
+                        'value' => DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->where('coal_washery_id',$coal_washery[$i]->ID)->where('risk_level',1)->whereDate('create_time', DB::raw('CURDATE() - INTERVAL 1 DAY'))->where('is_delete',0)->count(),
                         'color' => '#FFBA00'
                     ],
                     [
                         'label' => '低',
-                        'value' => DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->where('coal_washery_id',$coal_washery[$i]->ID)->where('risk_level',2)->whereDate('create_time', today())->where('is_delete',0)->count(),
+                        'value' => DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->where('coal_washery_id',$coal_washery[$i]->ID)->where('risk_level',2)->whereDate('create_time', DB::raw('CURDATE() - INTERVAL 1 DAY'))->where('is_delete',0)->count(),
                         'color' => '#2BB200'
                     ],
                 ];
@@ -2662,7 +2662,7 @@ class CameraApiController extends BaseController
         if(count($list) > 0){
             $risk = $risk->whereIn('coal_washery_id',$list);
         }
-        $risk = $risk->whereDate('uf_xx_risk_assignment.create_time', today())->where('uf_xx_risk_assignment.is_delete',0);
+        $risk = $risk->whereDate('uf_xx_risk_assignment.create_time', DB::raw('CURDATE() - INTERVAL 1 DAY'))->where('uf_xx_risk_assignment.is_delete',0);
 
         if(isset($params['id'])){
             $risk = $risk->where('uf_xx_coal_washery.id',$params['id']);
@@ -2670,7 +2670,7 @@ class CameraApiController extends BaseController
         $risk = $risk->whereIn('risk_level',$type)->orderBy('uf_xx_risk_assignment.risk_level')->get();
 
         $risk_level = ['高风险','中风险','低风险'];
-        $risk_type = ['高空坠落','起重伤害','触电','火灾','机械伤害','中毒和窒息'];
+        $risk_type = ['高处坠落','起重伤害','触电','火灾','机械伤害','中毒和窒息'];
 
         $result['data'] = [];
         if(count($risk) > 0){
@@ -2706,7 +2706,7 @@ class CameraApiController extends BaseController
         $result['move_camera'] = [];
         $result['zhifa_camera'] = [];
 
-        $risk_type = ['高空坠落','起重伤害','触电','火灾','机械伤害','中毒和窒息'];
+        $risk_type = ['高处坠落','起重伤害','触电','火灾','机械伤害','中毒和窒息'];
         $risk_level = ['高风险','中风险','低风险'];
         $classes = ['早班','中班','夜班'];
 
@@ -2839,14 +2839,14 @@ class CameraApiController extends BaseController
 
     //首頁信息
     public function taskHomeV2(Request $request){
-        $risk_type = ['高空坠落','起重伤害','触电','火灾','机械伤害','中毒和窒息'];
+        $risk_type = ['高处坠落','起重伤害','触电','火灾','机械伤害','中毒和窒息'];
         $risk_level = ['高风险','中风险','低风险'];
 
         //高风险作业
         $gaofengxian = DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')
             ->select('uf_xx_risk_assignment.*','uf_xx_coal_washery.name as coal_washery')
             ->leftJoin('uf_xx_coal_washery','uf_xx_coal_washery.id','=','uf_xx_risk_assignment.coal_washery_id')
-            ->whereDate('uf_xx_risk_assignment.create_time', today())
+            ->whereDate('uf_xx_risk_assignment.create_time', DB::raw('CURDATE() - INTERVAL 1 DAY'))
             ->where('risk_level',0)->where('uf_xx_risk_assignment.is_delete',0)->get();
         if(count($gaofengxian) > 0){
             for($i=0;$i<count($gaofengxian);$i++){
@@ -2868,7 +2868,7 @@ class CameraApiController extends BaseController
         $zhongfengxian = DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')
             ->select('uf_xx_risk_assignment.*','uf_xx_coal_washery.name as coal_washery')
             ->leftJoin('uf_xx_coal_washery','uf_xx_coal_washery.id','=','uf_xx_risk_assignment.coal_washery_id')
-            ->whereDate('uf_xx_risk_assignment.create_time', today())
+            ->whereDate('uf_xx_risk_assignment.create_time', DB::raw('CURDATE() - INTERVAL 1 DAY'))
             ->where('risk_level',1)->where('uf_xx_risk_assignment.is_delete',0)->get();
         if(count($zhongfengxian) > 0){
             for($i=0;$i<count($zhongfengxian);$i++){
@@ -2889,7 +2889,7 @@ class CameraApiController extends BaseController
         $difengxian = DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')
             ->select('uf_xx_risk_assignment.*','uf_xx_coal_washery.name as coal_washery')
             ->leftJoin('uf_xx_coal_washery','uf_xx_coal_washery.id','=','uf_xx_risk_assignment.coal_washery_id')
-            ->whereDate('uf_xx_risk_assignment.create_time', today())
+            ->whereDate('uf_xx_risk_assignment.create_time', DB::raw('CURDATE() - INTERVAL 1 DAY'))
             ->where('risk_level',2)->where('uf_xx_risk_assignment.is_delete',0)->get();
         if(count($difengxian) > 0){
             for($i=0;$i<count($difengxian);$i++){
@@ -2913,7 +2913,7 @@ class CameraApiController extends BaseController
             for($i=0;$i<count($area);$i++){
                 $result['area_count'][$i]['name'] = $area[$i]->title;
                 $coal_washery_id_list = DB::connection('mysql_fwe10')->table('uf_xx_coal_washery')->where('area_id',$area[$i]->ID)->pluck('id');
-                $result['area_count'][$i]['count'] = DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->whereIn('coal_washery_id',$coal_washery_id_list)->whereDate('create_time', today())->where('is_delete',0)->count();
+                $result['area_count'][$i]['count'] = DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->whereIn('coal_washery_id',$coal_washery_id_list)->whereDate('create_time', DB::raw('CURDATE() - INTERVAL 1 DAY'))->where('is_delete',0)->count();
             }
         }
 
@@ -2923,9 +2923,9 @@ class CameraApiController extends BaseController
         if(count($coal_washery) > 0){
             for($i=0;$i<count($coal_washery);$i++){
                 $result['coal_washery_work_count'][$i]['name'] = $coal_washery[$i]->title;
-                $result['coal_washery_work_count'][$i]['gao'] = DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->where('coal_washery_id',$coal_washery[$i]->ID)->where('risk_level',0)->whereDate('create_time', today())->where('is_delete',0)->count();
-                $result['coal_washery_work_count'][$i]['zhong'] = DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->where('coal_washery_id',$coal_washery[$i]->ID)->where('risk_level',1)->whereDate('create_time', today())->where('is_delete',0)->count();
-                $result['coal_washery_work_count'][$i]['di'] = DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->where('coal_washery_id',$coal_washery[$i]->ID)->where('risk_level',2)->whereDate('create_time', today())->where('is_delete',0)->count();
+                $result['coal_washery_work_count'][$i]['gao'] = DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->where('coal_washery_id',$coal_washery[$i]->ID)->where('risk_level',0)->whereDate('create_time', DB::raw('CURDATE() - INTERVAL 1 DAY'))->where('is_delete',0)->count();
+                $result['coal_washery_work_count'][$i]['zhong'] = DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->where('coal_washery_id',$coal_washery[$i]->ID)->where('risk_level',1)->whereDate('create_time', DB::raw('CURDATE() - INTERVAL 1 DAY'))->where('is_delete',0)->count();
+                $result['coal_washery_work_count'][$i]['di'] = DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->where('coal_washery_id',$coal_washery[$i]->ID)->where('risk_level',2)->whereDate('create_time', DB::raw('CURDATE() - INTERVAL 1 DAY'))->where('is_delete',0)->count();
             }
         }