|
|
@@ -343,7 +343,8 @@ class Home extends Base_Controller {
|
|
|
if (!empty($projectIdArr)) $where[] = 'P.id in ('.implode(',', $projectIdArr).')';
|
|
|
|
|
|
$where[] = '(WI.batstatus != 0 OR WI.panelstatus != 0 OR WI.lampstatus != 0 OR WI.tempstatus != 0)';
|
|
|
- $where[] = 'L.netstatus = 1';
|
|
|
+ // $where[] = 'L.netstatus = 1';
|
|
|
+ $where[] = 'L.controllerstatus = 5';
|
|
|
$where1 = implode(' AND ', $where);
|
|
|
$join = [
|
|
|
['table'=>'project as P','cond'=>'P.id = L.projectid','type'=>'inner']
|
|
|
@@ -352,7 +353,7 @@ class Home extends Base_Controller {
|
|
|
$join[] = ['table'=>'global_location as G1','cond'=>'G1.id = P.cityid','type'=>'inner'];
|
|
|
$join[] = ['table'=>'global_location as G2','cond'=>'G2.id = G1.pid','type'=>'inner'];
|
|
|
$join[] = ['table'=>'global_location as G3','cond'=>'G3.id = G2.pid','type'=>'inner'];
|
|
|
- $list = $this->Lamp_model->get_list_by_join($where1, 'P.projectname as project,WI.batstatus,WI.id,WI.panelstatus,WI.lampstatus,WI.tempstatus,P.cityid,L.address,L.section,G1.english_name as areaName,G2.english_name as cityName,G3.english_name as proName,WI.updatetime,G1.timezone',NULL, NULL, $join, NULL, NUll, 'L');
|
|
|
+ $list = $this->Lamp_model->get_list_by_join($where1, 'P.projectname as project,P.id as projectid,WI.batstatus,WI.id,WI.panelstatus,WI.lampstatus,WI.tempstatus,P.cityid,L.address,L.section,G1.english_name as areaName,G2.english_name as cityName,G3.english_name as proName,WI.updatetime,G1.timezone',NULL, NULL, $join, NULL, NUll, 'L');
|
|
|
|
|
|
$batstatus = $this->config->item('batstatus');
|
|
|
$panelstatus = $this->config->item('panelstatus');
|
|
|
@@ -375,7 +376,6 @@ class Home extends Base_Controller {
|
|
|
unset($list[$key]['cityName']);
|
|
|
unset($list[$key]['proName']);
|
|
|
unset($list[$key]['areaName']);
|
|
|
- unset($list[$key]['section']);
|
|
|
unset($list[$key]['timezone']);
|
|
|
unset($list[$key]['updatetime']);
|
|
|
}
|
