no message

api/application/controllers/Lampcontrol.php

@@ -1349,16 +1349,16 @@ class Lampcontrol extends Base_Controller {
 
         if (!empty($date)) {
             $dateArr = explode('/', $date);
-            $beginDate = date('Y-m-d H:i:s',strtotime($dateArr[0]) - 8*3600 + $timezone['value']*3600);
-            $endDate = date('Y-m-d H:i:s',strtotime($dateArr[1]) - 8*3600 + $timezone['value']*3600);
+            $beginDate = date('Y-m-d H:i:s',strtotime($dateArr[0]) - 8*3600);
+            $endDate = date('Y-m-d H:i:s',strtotime(date('Y-m-d 23:59:59',strtotime($dateArr[1]))) - 8*3600);
             // $beginDate = $dateArr[0];
             // $endDate = $dateArr[1];
             if (strtotime($endDate) - strtotime($beginDate) > 31*24*3600) {
                 exit(json_result('0418',$this->response['0418']));
             }
         }else{
-            $beginDate = date('Y-m-d H:i:s',strtotime(date('Y-m-d 00:00:00',time())) - 8*3600 + $timezone['value']*3600);
-            $endDate = date('Y-m-d H:i:s',strtotime(date('Y-m-d 23:59:59',time())) - 8*3600 + $timezone['value']*3600);
+            $beginDate = date('Y-m-d H:i:s',strtotime(date('Y-m-d 00:00:00',time())) - 8*3600);
+            $endDate = date('Y-m-d H:i:s',strtotime(date('Y-m-d 23:59:59',time())) - 8*3600);
         }
         if($page < 1){
             $page = 1;
@@ -2039,7 +2039,7 @@ class Lampcontrol extends Base_Controller {
 
         $data = ['patrolinterval'=>$lampData['patrolinterval']];
         if ($type == 0) {  // 路灯
-            $sql = 'select LI.loadvoltage as lampvoltage,LI.loadcurrent as lampcurrent,LI.loadpower as lamppower,LI.updatetime from realtime_info_log as LI where LI.lampid = '.$lampId.' and LI.updatetime >= "'.$beginDate.'" and LI.updatetime <= "'.$endDate.'"';
+            $sql = 'select LI.loadvoltage as lampvoltage,LI.loadcurrent as lampcurrent,LI.lighteness,LI.loadpower as lamppower,LI.updatetime from realtime_info_log as LI where LI.lampid = '.$lampId.' and LI.updatetime >= "'.$beginDate.'" and LI.updatetime <= "'.$endDate.'"';
 
             $list = $this->db->query($sql)->result_array();
             $temp = [];
@@ -2047,7 +2047,7 @@ class Lampcontrol extends Base_Controller {
                 $temp['lampvoltage'][] = $value['lampvoltage'];
                 $temp['lampcurrent'][] = $value['lampcurrent'];
                 $temp['lamppower'][] = $value['lamppower'];
-                // $temp['lighteness'][] = $value['lighteness'];
+                $temp['lighteness'][] = $value['lighteness'];
                 $temp['updatetime'][] = date_change($value['updatetime'],8,$timezone);
                 if (!isset($data['maxcurrent'])) {
                     $data['maxcurrent'] = $value['lampcurrent'];
@@ -2084,16 +2084,16 @@ class Lampcontrol extends Base_Controller {
                 }else{
                     $data['minpower'] = $value['lamppower'] < $data['minpower'] ? $value['lamppower'] : $data['minpower'];
                 }
-                // if (!isset($data['maxlighteness'])) {
-                //     $data['maxlighteness'] = $value['lighteness'];
-                // }else{
-                //     $data['maxlighteness'] = $value['lighteness'] > $data['maxlighteness'] ? $value['lighteness'] : $data['maxlighteness'];
-                // }
-                // if (!isset($data['minlighteness'])) {
-                //     $data['minlighteness'] = $value['lighteness'];
-                // }else{
-                //     $data['minlighteness'] = $value['lighteness'] < $data['minlighteness'] ? $value['lighteness'] : $data['minlighteness'];
-                // }
+                if (!isset($data['maxlighteness'])) {
+                    $data['maxlighteness'] = $value['lighteness'];
+                }else{
+                    $data['maxlighteness'] = $value['lighteness'] > $data['maxlighteness'] ? $value['lighteness'] : $data['maxlighteness'];
+                }
+                if (!isset($data['minlighteness'])) {
+                    $data['minlighteness'] = $value['lighteness'];
+                }else{
+                    $data['minlighteness'] = $value['lighteness'] < $data['minlighteness'] ? $value['lighteness'] : $data['minlighteness'];
+                }
                 // if (isset($data['maxdaychargemincurrent'])) {
                 //     $h = floor($data['maxdaychargemincurrent'] / 3600);
                 //     $h = $h < 10 ? '0'.$h : $h;