|
@@ -27,21 +27,13 @@ class Home extends Base_Controller {
|
|
|
$data['total_light_count'] = $this->Lamp_model->get_count();
|
|
|
$data['day_new_count'] = $this->Lamp_model->get_count(['createtime >='=>$date]);
|
|
|
|
|
|
- $join = [['table'=>'network as N','cond'=>'N.id = L.networkid','type'=>'inner']];
|
|
|
- $total = $this->Lamp_model->get_list_by_multi_join(['N.status'=>1,'L.logtime >='=>$date,'L.devstatus !='=>0], 'count(*) as total',NULL, NULL, $join, NULL, NUll, 'L', true);
|
|
|
- $data['day_faulty_count'] = $total['total'];
|
|
|
+ $data['day_faulty_count'] = $this->Lamp_model->get_count(['netstatus'=>1,'logtime >='=>$date,'devstatus !='=>0]);
|
|
|
|
|
|
- $join = [['table'=>'network as N','cond'=>'N.id = L.networkid','type'=>'inner']];
|
|
|
- $total = $this->Lamp_model->get_list_by_multi_join(['N.status'=>1,'L.status'=>1], 'count(*) as total',NULL, NULL, $join, NULL, NUll, 'L', true);
|
|
|
- $data['light_up_count'] = $total['total'];
|
|
|
+ $data['light_up_count'] = $this->Lamp_model->get_count(['netstatus'=>1,'status'=>1]);
|
|
|
|
|
|
- $join = [['table'=>'network as N','cond'=>'N.id = L.networkid','type'=>'inner']];
|
|
|
- $total = $this->Lamp_model->get_list_by_multi_join(['N.status'=>1], 'count(*) as total',NULL, NULL, $join, NULL, NUll, 'L', true);
|
|
|
- $data['online_count'] = $total['total'];
|
|
|
+ $data['online_count'] = $this->Lamp_model->get_count(['netstatus'=>1]);
|
|
|
|
|
|
- $join = [['table'=>'network as N','cond'=>'N.id = L.networkid','type'=>'inner']];
|
|
|
- $total = $this->Lamp_model->get_list_by_multi_join(['N.status'=>1,'L.devstatus !='=>0], 'count(*) as total',NULL, NULL, $join, NULL, NUll, 'L', true);
|
|
|
- $data['faulty_count'] = $total['total'];
|
|
|
+ $data['faulty_count'] = $this->Lamp_model->get_count(['netstatus'=>1,'devstatus !='=>0]);
|
|
|
}else{
|
|
|
$company = $this->get_user_info('company');
|
|
|
$where = ['P.company'=>$company];
|
|
@@ -56,8 +48,7 @@ class Home extends Base_Controller {
|
|
|
$data['day_new_count'] = $total['total'];
|
|
|
unset($where['L.createtime >=']);
|
|
|
|
|
|
- $join[] = ['table'=>'project as P','cond'=>'P.id = L.projectid','type'=>'inner'];
|
|
|
- $where['N.status'] = 1;
|
|
|
+ $where['L.netstatus'] = 1;
|
|
|
$total = $this->Lamp_model->get_list_by_multi_join($where, 'count(*) as total',NULL, NULL, $join, NULL, NUll, 'L', true);
|
|
|
$data['online_count'] = $total['total'];
|
|
|
|