|
|
@@ -103,18 +103,18 @@ class Lampcontrol extends Base_Controller {
|
|
|
$version = $this->session->userdata('version');
|
|
|
if ($lite == 1) {
|
|
|
if(empty($fields)){
|
|
|
- $fields = 'L.id, L.number,L.address,RI.updatetime,RI.loadpower,RI.batvoltage as battvoltage,L.netstatus,L.lighteness,L.status,L.battstatus,L.chargestage';
|
|
|
+ $fields = 'L.id, L.number,L.address,RI.updatetime,RI.loadpower,RI.batvoltage as battvoltage,L.netstatus,L.lighteness,L.status,L.battstatus,L.chargestage,L.controllerstatus';
|
|
|
}else{
|
|
|
- $fields .= ",RI.updatetime";
|
|
|
+ $fields .= ",RI.updatetime,L.controllerstatus";
|
|
|
}
|
|
|
$join = array();
|
|
|
$join[] = ['table'=>'(select t1.* from realtime_info_log t1, (select lampid, max(updatetime) as maxtime from realtime_info_log group by lampid) t2 where t1.lampid = t2.lampid and t1.updatetime = t2.maxtime) as RI', 'cond'=>'L.id = RI.lampid', 'type'=>'left'];
|
|
|
$data['lamps'] = $this->Lamp_model->get_list_by_join($filter, $fields,$limit, $offset, $join, "L.number ASC", NUll, 'L');
|
|
|
} else {
|
|
|
if(empty($fields) || empty($field1)){
|
|
|
- $fields = 'L.id, L.number, IFNULL(L.status,0) as status, L.isfaulted, L.address, L.lamppower, L.electricSOC, L.battvoltage, L.chargestage, RI.updatetime, RI.updatetime as modifytime,L.overtimes,L.boardpower,L.lighteness as light,L.projectid,L.devstatus as online,P.projectname as project_name,L.section,L.loadtype,P.timezone as timezoneid';
|
|
|
+ $fields = 'L.id, L.number, IFNULL(L.status,0) as status, L.isfaulted, L.address, L.lamppower, L.electricSOC, L.battvoltage, L.chargestage, RI.updatetime, RI.updatetime as modifytime,L.overtimes,L.boardpower,L.lighteness as light,L.projectid,L.devstatus as online,P.projectname as project_name,L.section,L.loadtype,P.timezone as timezoneid,L.controllerstatus';
|
|
|
}else{
|
|
|
- $fields .= ",L.id,L.projectid,L.section,L.loadtype,P.timezone as timezoneid";
|
|
|
+ $fields .= ",L.id,L.projectid,L.section,L.loadtype,P.timezone as timezoneid,L.controllerstatus";
|
|
|
}
|
|
|
|
|
|
$download = intval($this->input->post('download',true));
|
|
|
@@ -159,7 +159,7 @@ class Lampcontrol extends Base_Controller {
|
|
|
}
|
|
|
// 故障信息处理
|
|
|
if (array_key_exists('alarmStatus',$value)) {
|
|
|
- if (empty($value['batstatus']) && $value['panelstatus'] && $value['lampstatus'] && $value['tempstatus']) {
|
|
|
+ if ((empty($value['batstatus']) && $value['panelstatus'] && $value['lampstatus'] && $value['tempstatus']) || $value['controllerstatus'] != 5) {
|
|
|
if (empty($version)) {
|
|
|
$value['isfaulted'] = '无';
|
|
|
}else{
|
