风险作业接口修改

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

@@ -2139,9 +2139,9 @@ class CameraApiController extends BaseController
 
     //主屏幕
     public function mainHomeV2(Request $request){
-        $gao = DB::connection('task_xixuan')->table('xx_risk_assignment')->whereDate('optdt', today())->where('risk_level',0)->count();
-        $zhong = DB::connection('task_xixuan')->table('xx_risk_assignment')->whereDate('optdt', today())->where('risk_level',1)->count();
-        $di = DB::connection('task_xixuan')->table('xx_risk_assignment')->whereDate('optdt', today())->where('risk_level',2)->count();
+        $gao = DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->whereDate('create_time', today())->where('risk_level',0)->count();
+        $zhong = DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->whereDate('create_time', today())->where('risk_level',1)->count();
+        $di = DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->whereDate('create_time', today())->where('risk_level',2)->count();
 
         $result = [
             [
@@ -2169,9 +2169,9 @@ class CameraApiController extends BaseController
 
     //风险作业占比
     public function riskWorkPercentV2(Request $request){
-        $gao = DB::connection('task_xixuan')->table('xx_risk_assignment')->whereDate('optdt', today())->where('risk_level',0)->count();
-        $zhong = DB::connection('task_xixuan')->table('xx_risk_assignment')->whereDate('optdt', today())->where('risk_level',1)->count();
-        $di = DB::connection('task_xixuan')->table('xx_risk_assignment')->whereDate('optdt', today())->where('risk_level',2)->count();
+        $gao = DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->whereDate('create_time', today())->where('risk_level',0)->count();
+        $zhong = DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->whereDate('create_time', today())->where('risk_level',1)->count();
+        $di = DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->whereDate('create_time', today())->where('risk_level',2)->count();
 
         $result = [
             [
@@ -2193,13 +2193,13 @@ class CameraApiController extends BaseController
 
     //片区占比
     public function areaPercentV2(Request $request){
-        $area = DB::connection('task_xixuan')->table('xx_area')->get();
+        $area = DB::connection('mysql_fwe10')->table('uf_xx_area')->get();
 
         if(count($area) > 0){
             for($i=0;$i<count($area);$i++){
-                $coal_washery_id_list = DB::connection('task_xixuan')->table('xx_coal_washery')->where('area_id',$area[$i]->id)->pluck('id');
-                $result[$i]['value'] = DB::connection('task_xixuan')->table('xx_risk_assignment')->whereIn('coal_washery_id',$coal_washery_id_list)->whereDate('optdt', today())->count();
-                $result[$i]['name'] = $area[$i]->name;
+                $coal_washery_id_list = DB::connection('mysql_fwe10')->table('uf_xx_coal_washery')->where('area_id',$area[$i]->ID)->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())->count();
+                $result[$i]['name'] = $area[$i]->title;
             }
         }
 
@@ -2208,7 +2208,7 @@ class CameraApiController extends BaseController
 
     //地图数据
     public function mapDataV2(Request $request){
-        $coal_washery = DB::connection('task_xixuan')->table('xx_coal_washery')->get();
+        $coal_washery = DB::connection('mysql_fwe10')->table('uf_xx_coal_washery')->get();
         $coal_list = [
             '灵新洗煤厂'=>'linxing',
             '红柳洗煤厂'=>'hongliu',
@@ -2227,22 +2227,22 @@ class CameraApiController extends BaseController
 
         if(count($coal_washery) > 0){
             for($i=0;$i<count($coal_washery);$i++){
-                if(array_key_exists($coal_washery[$i]->name, $coal_list)) {
-                    $slog = $coal_list[$coal_washery[$i]->name];
-                    $result[$slog]['title'] = $coal_washery[$i]->name;
-                    $result[$slog]['id'] = $coal_washery[$i]->id;
+                if(array_key_exists($coal_washery[$i]->title, $coal_list)) {
+                    $slog = $coal_list[$coal_washery[$i]->title];
+                    $result[$slog]['title'] = $coal_washery[$i]->title;
+                    $result[$slog]['id'] = $coal_washery[$i]->ID;
                     $result[$slog]['data'] = [
                         [
                             'name' => '高风险作业',
-                            'value'=> DB::connection('task_xixuan')->table('xx_risk_assignment')->where('coal_washery_id',$coal_washery[$i]->id)->where('risk_level',0)->whereDate('optdt', today())->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', today())->count()
                         ],
                         [
                             'name' => '中风险作业',
-                            'value'=> DB::connection('task_xixuan')->table('xx_risk_assignment')->where('coal_washery_id',$coal_washery[$i]->id)->where('risk_level',1)->whereDate('optdt', today())->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', today())->count()
                         ],
                         [
                             'name' => '低风险作业',
-                            'value'=> DB::connection('task_xixuan')->table('xx_risk_assignment')->where('coal_washery_id',$coal_washery[$i]->id)->where('risk_level',2)->whereDate('optdt', today())->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', today())->count()
                         ]
                     ];
                 }
@@ -2304,9 +2304,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('task_xixuan')->table('xx_risk_assignment')->whereDate('optdt', $current_date)->where('risk_level',0)->count());
-            array_push($result['series'][1]['data'],DB::connection('task_xixuan')->table('xx_risk_assignment')->whereDate('optdt', $current_date)->where('risk_level',1)->count());
-            array_push($result['series'][2]['data'],DB::connection('task_xixuan')->table('xx_risk_assignment')->whereDate('optdt', $current_date)->where('risk_level',2)->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)->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)->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)->count());
             $current_date = date('Y-m-d', strtotime($current_date . ' +1 day'));
             $i++;
         }
@@ -2321,7 +2321,7 @@ class CameraApiController extends BaseController
         if (isset($params['area_id'])) {
             $area_id = $params['area_id'];
         }else{
-            $area_id = 1;
+            $area_id = DB::connection('mysql_fwe10')->table('uf_xx_area')->first()->ID;
         }
 
         if(isset($params['start_date']) && isset($params['end_date'])){
@@ -2332,7 +2332,7 @@ class CameraApiController extends BaseController
             $end_date = date('Y-m-d');
         }
 
-        $coal_washery_id_list = DB::connection('task_xixuan')->table('xx_coal_washery')->where('area_id',$area_id)->pluck('id');
+        $coal_washery_id_list = DB::connection('mysql_fwe10')->table('uf_xx_coal_washery')->where('area_id',$area_id)->pluck('id');
 
         $result = [];
         $current_date = $start_date;
@@ -2341,19 +2341,19 @@ class CameraApiController extends BaseController
         //当日片区数
         $result['data'] = [
             [
-                'number' => DB::connection('task_xixuan')->table('xx_risk_assignment')->whereIn('coal_washery_id',$coal_washery_id_list)->whereDate('optdt', date('Y-m-d'))->where('risk_level',0)->count(),
+                '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)->count(),
                 'unit'   => '项',
                 'title'  => '高风险作业',
                 'color'  => '#DA0000'
             ],
             [
-                'number' => DB::connection('task_xixuan')->table('xx_risk_assignment')->whereIn('coal_washery_id',$coal_washery_id_list)->whereDate('optdt', date('Y-m-d'))->where('risk_level',1)->count(),
+                '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)->count(),
                 'unit'   => '项',
                 'title'  => '中风险作业',
                 'color'  => '#FFBA00'
             ],
             [
-                'number' => DB::connection('task_xixuan')->table('xx_risk_assignment')->whereIn('coal_washery_id',$coal_washery_id_list)->whereDate('optdt', date('Y-m-d'))->where('risk_level',2)->count(),
+                '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)->count(),
                 'unit'   => '项',
                 'title'  => '低风险作业',
                 'color'  => '#2BB200'
@@ -2394,9 +2394,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('task_xixuan')->table('xx_risk_assignment')->whereIn('coal_washery_id',$coal_washery_id_list)->whereDate('optdt', $current_date)->where('risk_level',0)->count());
-            array_push($result['series'][1]['data'],DB::connection('task_xixuan')->table('xx_risk_assignment')->whereIn('coal_washery_id',$coal_washery_id_list)->whereDate('optdt', $current_date)->where('risk_level',1)->count());
-            array_push($result['series'][2]['data'],DB::connection('task_xixuan')->table('xx_risk_assignment')->whereIn('coal_washery_id',$coal_washery_id_list)->whereDate('optdt', $current_date)->where('risk_level',2)->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)->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)->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)->count());
             $current_date = date('Y-m-d', strtotime($current_date . ' +1 day'));
             $i++;
         }
@@ -2411,28 +2411,30 @@ class CameraApiController extends BaseController
         if(isset($params['area_id'])){
             $area = [$params['area_id']];
         }else{
-            $area = [1,2];
+            $area = DB::connection('mysql_fwe10')->table('uf_xx_area')->pluck('id');
         }
 
-        $coal_washery = DB::connection('task_xixuan')->table('xx_coal_washery')->whereIn('area_id',$area)->get();
+        $coal_washery = DB::connection('mysql_fwe10')->table('uf_xx_coal_washery')->whereIn('area_id',$area)->get();
+
         if(count($coal_washery) > 0){
             for($i=0;$i<count($coal_washery);$i++){
-                $result[$i]['unit_name'] = $coal_washery[$i]->name;
-                $result[$i]['coal_washery_id'] = $coal_washery[$i]->id;
+                $result[$i]['unit_name'] = $coal_washery[$i]->title;
+                $result[$i]['coal_washery_id'] = $coal_washery[$i]->ID;
+
                 $result[$i]['data'] = [
                     [
                         'label' => '高',
-                        'value' => DB::connection('task_xixuan')->table('xx_risk_assignment')->where('coal_washery_id',$coal_washery[$i]->id)->where('risk_level',0)->whereDate('optdt', today())->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', today())->count(),
                         'color' => '#DA0000'
                     ],
                     [
                         'label' => '中',
-                        'value' => DB::connection('task_xixuan')->table('xx_risk_assignment')->where('coal_washery_id',$coal_washery[$i]->id)->where('risk_level',1)->whereDate('optdt', today())->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', today())->count(),
                         'color' => '#FFBA00'
                     ],
                     [
                         'label' => '低',
-                        'value' => DB::connection('task_xixuan')->table('xx_risk_assignment')->where('coal_washery_id',$coal_washery[$i]->id)->where('risk_level',2)->whereDate('optdt', today())->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', today())->count(),
                         'color' => '#2BB200'
                     ],
                 ];
@@ -2454,29 +2456,30 @@ class CameraApiController extends BaseController
 
         $list = [];
         if(isset($params['area_id'])){
-            $list = DB::connection('task_xixuan')->table('xx_coal_washery')->where('area_id',$params['area_id'])->pluck('id');
+            $list = DB::connection('mysql_fwe10')->table('uf_xx_coal_washery')->where('area_id',$params['area_id'])->pluck('id');
         }
         if(isset($params['coal_washery_id'])){
             $list = [$params['coal_washery_id']];
         }
 
-        $coal_washery_list = DB::connection('task_xixuan')->table('xx_coal_washery')->get();
+        $coal_washery_list = DB::connection('mysql_fwe10')->table('uf_xx_coal_washery')->get();
         if(count($coal_washery_list) > 0){
             for($i=0;$i<count($coal_washery_list);$i++){
-                $result['unit_list'][$i]['text'] = $coal_washery_list[$i]->name;
-                $result['unit_list'][$i]['value'] = $coal_washery_list[$i]->name;
+                $result['unit_list'][$i]['text'] = $coal_washery_list[$i]->title;
+                $result['unit_list'][$i]['value'] = $coal_washery_list[$i]->title;
             }
         }
 
-        $risk = DB::connection('task_xixuan')->table('xx_risk_assignment');
-        $risk = $risk->select('xx_risk_assignment.*','xx_coal_washery.name as coal_washery');
-        $risk = $risk->leftJoin('xx_coal_washery','xx_coal_washery.id','=','xx_risk_assignment.coal_washery_id');
+        $risk = DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment');
+        $risk = $risk->select('uf_xx_risk_assignment.*','uf_xx_coal_washery.title as coal_washery');
+        $risk = $risk->leftJoin('uf_xx_coal_washery','uf_xx_coal_washery.id','=','uf_xx_risk_assignment.coal_washery_id');
         if(count($list) > 0){
             $risk = $risk->whereIn('coal_washery_id',$list);
         }
-        $risk = $risk->whereDate('xx_risk_assignment.optdt', today());
+        $risk = $risk->whereDate('uf_xx_risk_assignment.create_time', today());
+
         if(isset($params['id'])){
-            $risk = $risk->where('xx_coal_washery.id',$params['id']);
+            $risk = $risk->where('uf_xx_coal_washery.id',$params['id']);
         }
         $risk = $risk->whereIn('risk_level',$type)->get();
 
@@ -2486,11 +2489,10 @@ class CameraApiController extends BaseController
         $result['data'] = [];
         if(count($risk) > 0){
             for($i=0;$i<count($risk);$i++){
-                $result['data'][$i]['id'] = $risk[$i]->id;
+                $result['data'][$i]['id'] = $risk[$i]->ID;
                 $result['data'][$i]['unit_name'] = $risk[$i]->coal_washery;
-                $result['data'][$i]['place'] = $risk[$i]->work_location;
+                $result['data'][$i]['place'] = $risk[$i]->risk_location;
                 $result['data'][$i]['content'] = $risk[$i]->risk_name;
-
                 $result['data'][$i]['work_people'] = $risk[$i]->work_people;
                 $result['data'][$i]['work_num'] = $risk[$i]->work_num;
                 $result['data'][$i]['risk_level'] = $risk_level[$risk[$i]->risk_level];