|
|
@@ -1515,7 +1515,7 @@ class Lampcontrol extends Base_Controller {
|
|
|
if ($table == 'lamp_info_log') {
|
|
|
$table = 'realtime_info_log';
|
|
|
$total = $this->RealtimeInfoLog_model->get_count(['lampid'=>$lamp_id,'updatetime >='=>$beginDate,'updatetime <='=>$endDate]);
|
|
|
- $res = $this->RealtimeInfoLog_model->get_list(['lampid'=>$lamp_id,'updatetime >='=>$beginDate,'updatetime <='=>$endDate], 'loadvoltage as lampvoltage,loadcurrent as lampcurrent,loadpower as lamppower,updatetime,loadWorkTimeDay as daychargemincurrent',$count, ($page-1)*$count, 'updatetime desc,id desc', NUll);
|
|
|
+ $res = $this->RealtimeInfoLog_model->get_list(['lampid'=>$lamp_id,'updatetime >='=>$beginDate,'updatetime <='=>$endDate], 'loadvoltage as lampvoltage,lighteness,loadcurrent as lampcurrent,loadpower as lamppower,updatetime,loadWorkTimeDay as daychargemincurrent',$count, ($page-1)*$count, 'updatetime desc,id desc', NUll);
|
|
|
// $res = $this->Lamp_model->getListForInfoLog($lamp_id, $table, ($page-1)*$count, $count,$beginDate,$endDate);
|
|
|
}elseif ($table == 'system_info_log') {
|
|
|
$total = $this->Lamp_model->getCountForInfoLog($lamp_id, $table,$beginDate,$endDate);
|
|
|
@@ -1548,6 +1548,9 @@ class Lampcontrol extends Base_Controller {
|
|
|
|
|
|
$arr = [2=>'16',3=>'32',4=>'48',5=>'64'];
|
|
|
foreach ($res as &$v) {
|
|
|
+ if (isset($v['lighteness'])) {
|
|
|
+ $v['lampstatus'] = empty($v['lighteness']) ? '0' : '1';
|
|
|
+ }
|
|
|
if (isset($v['daychargemincurrent'])) $v['daychargemincurrent'] = intval($v['daychargemincurrent']);
|
|
|
// $v['updatetime'] = date_change($v["updatetime"],8,$timezone['value']);
|
|
|
$v['updatetime'] = set_timezone($v["updatetime"],$timezone['value']);
|
