fyy

app/Service/ReportFormsService.php

@@ -520,7 +520,7 @@ class ReportFormsService extends Service
         //运行时间  工作时间  故障
         $run_time = $process_time = $fault = [];
         foreach ($result as $value){
-            if($value['data_point_name'] == SystemL::run){
+            if($value['data_point_name'] == SystemL::run || $value['data_point_name'] == SystemL::standBy){
                 //运行次数
                 if(isset($run_time[$value['device_name']])){
                     $run_time[$value['device_name']] += 1;
@@ -528,7 +528,7 @@ class ReportFormsService extends Service
                     $run_time[$value['device_name']] = 1;
                 }
             }
-            if($value['data_point_name'] == SystemL::work){
+            if($value['data_point_name'] == SystemL::standBy){
                 //工作次数
                 if(isset($process_time[$value['device_name']])){
                     $process_time[$value['device_name']] += 1;
@@ -611,14 +611,14 @@ class ReportFormsService extends Service
         ];
         foreach ($result as $key => $value){
             $time = date('Y-m-d H:i:s',$value['time'] / 1000);
-            $stop_time = date('Y-m-d H:i:s',strtotime($value['time'] / 1000)+rand(10,40));
-            if($value['data_point_name'] == SystemL::run){
+            $stop_time = date('Y-m-d H:i:s',$value['time'] / 1000 + rand(10,40));
+            if($value['data_point_name'] == SystemL::run || $value['data_point_name'] == SystemL::standBy){
                 $return['run'][] = [
                     'time' => $time,
                     'stop_time' => $stop_time
                 ];
             }
-            if($value['data_point_name'] == SystemL::work){
+            if($value['data_point_name'] == SystemL::standBy){
                 $return['work'][] = [
                     'time' => $time,
                     'stop_time' => $stop_time
@@ -630,12 +630,6 @@ class ReportFormsService extends Service
                     'stop_time' => $stop_time
                 ];
             }
-            if($value['data_point_name'] == SystemL::standBy){
-                $return['stand_by'][] = [
-                    'time' => $time,
-                    'stop_time' => $stop_time
-                ];
-            }
         }
 
         return [true, $return];
@@ -647,7 +641,7 @@ class ReportFormsService extends Service
 
         $result = SystemL::where('time','>=',$data['time'][0])
             ->where('time','<',$data['time'][1])
-            ->where('data_point_name',SystemL::work)
+            ->where('data_point_name',SystemL::standBy)
             ->select('device_name','time','value')
             ->get()->toArray();
 
@@ -713,7 +707,7 @@ class ReportFormsService extends Service
         $run_time = $process_time = $fault = $time_all = [];
         foreach ($result as $value){
             $time = date("Y-m-d",$value['time'] / 1000);
-            if($value['data_point_name'] == SystemL::run){
+            if($value['data_point_name'] == SystemL::run || $value['data_point_name'] == SystemL::standBy){
                 //运行次数
                 if(isset($run_time[$value['device_name']][$time])){
                     $run_time[$value['device_name']][$time] += 1;
@@ -721,7 +715,7 @@ class ReportFormsService extends Service
                     $run_time[$value['device_name']][$time] = 1;
                 }
             }
-            if($value['data_point_name'] == SystemL::work){
+            if($value['data_point_name'] == SystemL::standBy){
                 //工作次数
                 if(isset($process_time[$value['device_name']][$time])){
                     $process_time[$value['device_name']][$time] += 1;