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

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

@@ -2312,9 +2312,9 @@ class CameraApiController extends BaseController
 
     //主屏幕
     public function mainHomeV2(Request $request){
-        $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();
+        $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)->where('delete_type',0)->where('is_flow',1)->where('current_step','结束节点')->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)->where('delete_type',0)->where('is_flow',1)->where('current_step','结束节点')->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)->where('delete_type',0)->where('is_flow',1)->where('current_step','结束节点')->count();
 
         $result = [
             [
@@ -2342,9 +2342,9 @@ class CameraApiController extends BaseController
 
     //风险作业占比
     public function riskWorkPercentV2(Request $request){
-        $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();
+        $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)->where('delete_type',0)->where('is_flow',1)->where('current_step','结束节点')->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)->where('delete_type',0)->where('is_flow',1)->where('current_step','结束节点')->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)->where('delete_type',0)->where('is_flow',1)->where('current_step','结束节点')->count();
 
         $result = [
             [
@@ -2371,7 +2371,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', DB::raw('CURDATE() - INTERVAL 1 DAY'))->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)->where('delete_type',0)->where('is_flow',1)->where('current_step','结束节点')->count();
                 $result[$i]['name'] = $area[$i]->title;
             }
         }
@@ -2414,24 +2414,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', DB::raw('CURDATE() - INTERVAL 1 DAY'))->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)->where('delete_type',0)->where('is_flow',1)->where('current_step','结束节点')->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', DB::raw('CURDATE() - INTERVAL 1 DAY'))->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)->where('delete_type',0)->where('is_flow',1)->where('current_step','结束节点')->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', DB::raw('CURDATE() - INTERVAL 1 DAY'))->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)->where('delete_type',0)->where('is_flow',1)->where('current_step','结束节点')->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', 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()
+                        '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)->where('delete_type',0)->where('is_flow',1)->where('current_step','结束节点')->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)->where('delete_type',0)->where('is_flow',1)->where('current_step','结束节点')->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)->where('delete_type',0)->where('is_flow',1)->where('current_step','结束节点')->count()
                     ]);
                 }
             }
@@ -2492,9 +2492,9 @@ class CameraApiController extends BaseController
 
         while ($current_date <= $end_date) {
             array_push($result['xAxis']['data'],$current_date);
-            array_push($result['series'][0]['data'],DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->whereDate('create_time', $current_date)->where('risk_level',0)->where('is_delete',0)->count());
-            array_push($result['series'][1]['data'],DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->whereDate('create_time', $current_date)->where('risk_level',1)->where('is_delete',0)->count());
-            array_push($result['series'][2]['data'],DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->whereDate('create_time', $current_date)->where('risk_level',2)->where('is_delete',0)->count());
+            array_push($result['series'][0]['data'],DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->whereDate('create_time', $current_date)->where('risk_level',0)->where('is_delete',0)->where('delete_type',0)->where('is_flow',1)->where('current_step','结束节点')->count());
+            array_push($result['series'][1]['data'],DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->whereDate('create_time', $current_date)->where('risk_level',1)->where('is_delete',0)->where('delete_type',0)->where('is_flow',1)->where('current_step','结束节点')->count());
+            array_push($result['series'][2]['data'],DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->whereDate('create_time', $current_date)->where('risk_level',2)->where('is_delete',0)->where('delete_type',0)->where('is_flow',1)->where('current_step','结束节点')->count());
             $current_date = date('Y-m-d', strtotime($current_date . ' +1 day'));
             $i++;
         }
@@ -2535,19 +2535,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', DB::raw('CURDATE() - INTERVAL 1 DAY'))->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)->where('delete_type',0)->where('is_flow',1)->where('current_step','结束节点')->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', DB::raw('CURDATE() - INTERVAL 1 DAY'))->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)->where('delete_type',0)->where('is_flow',1)->where('current_step','结束节点')->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', DB::raw('CURDATE() - INTERVAL 1 DAY'))->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)->where('delete_type',0)->where('is_flow',1)->where('current_step','结束节点')->count(),
                 'unit'   => '项',
                 'title'  => '低风险作业',
                 'color'  => '#2BB200'
@@ -2588,9 +2588,9 @@ class CameraApiController extends BaseController
 
         while ($current_date <= $end_date) {
             array_push($result['xAxis']['data'],$current_date);
-            array_push($result['series'][0]['data'],DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->whereIn('coal_washery_id',$coal_washery_id_list)->whereDate('create_time', $current_date)->where('risk_level',0)->where('is_delete',0)->count());
-            array_push($result['series'][1]['data'],DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->whereIn('coal_washery_id',$coal_washery_id_list)->whereDate('create_time', $current_date)->where('risk_level',1)->where('is_delete',0)->count());
-            array_push($result['series'][2]['data'],DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->whereIn('coal_washery_id',$coal_washery_id_list)->whereDate('create_time', $current_date)->where('risk_level',2)->where('is_delete',0)->count());
+            array_push($result['series'][0]['data'],DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->whereIn('coal_washery_id',$coal_washery_id_list)->whereDate('create_time', $current_date)->where('risk_level',0)->where('is_delete',0)->where('delete_type',0)->where('is_flow',1)->where('current_step','结束节点')->count());
+            array_push($result['series'][1]['data'],DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->whereIn('coal_washery_id',$coal_washery_id_list)->whereDate('create_time', $current_date)->where('risk_level',1)->where('is_delete',0)->where('delete_type',0)->where('is_flow',1)->where('current_step','结束节点')->count());
+            array_push($result['series'][2]['data'],DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->whereIn('coal_washery_id',$coal_washery_id_list)->whereDate('create_time', $current_date)->where('risk_level',2)->where('is_delete',0)->where('delete_type',0)->where('is_flow',1)->where('current_step','结束节点')->count());
             $current_date = date('Y-m-d', strtotime($current_date . ' +1 day'));
             $i++;
         }
@@ -2618,17 +2618,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', DB::raw('CURDATE() - INTERVAL 1 DAY'))->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)->where('delete_type',0)->where('is_flow',1)->where('current_step','结束节点')->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', DB::raw('CURDATE() - INTERVAL 1 DAY'))->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)->where('delete_type',0)->where('is_flow',1)->where('current_step','结束节点')->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', DB::raw('CURDATE() - INTERVAL 1 DAY'))->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)->where('delete_type',0)->where('is_flow',1)->where('current_step','结束节点')->count(),
                         'color' => '#2BB200'
                     ],
                 ];
@@ -2670,7 +2670,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', DB::raw('CURDATE() - INTERVAL 1 DAY'))->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)->where('uf_xx_risk_assignment.delete_type',0)->where('uf_xx_risk_assignment.is_flow',1)->where('uf_xx_risk_assignment.current_step','结束节点');
 
         if(isset($params['id'])){
             $risk = $risk->where('uf_xx_coal_washery.id',$params['id']);