fix bug

api/application/controllers/Home.php

@@ -115,10 +115,10 @@ class Home extends Base_Controller {
             // array('name'=>'路灯状态','field'=>'L.status as lampstatus,L.lighteness','fields1'=>'lampstatus','enname'=>'Lamp status'),
             array('name'=>'信号状态','field'=>'L.protocoltype,L.netstatus as status,L.rssi','fields1'=>'status','enname'=>'Network status'),
             // array('name'=>'信号状态','field'=>'L.protocoltype,L.netstatus as status,N.rssi,N.snr','fields1'=>'status','enname'=>'Network status'),
-            array('name'=>'更新时间','field'=>'L.updatetime','fields1'=>'updatetime','enname'=>'Update time'),
+            array('name'=>'更新时间','field'=>'RI.updatetime','fields1'=>'updatetime','enname'=>'Update time'),
             array('name'=>'路灯亮度(%)','field'=>'L.lighteness','fields1'=>'lighteness','enname'=>'Brightness(%)'),
             array('name'=>'无线模块地址','field'=>'L.address','fields1'=>'address','enname'=>'Wireless module address'),
-            array('name'=>'负载功率(W)','field'=>'RI.loadpower','fields1'=>'loadpower','enname'=>'load power(W)'),
+            array('name'=>'负载功率(W)','field'=>'RI.loadpower','fields1'=>'loadpower','enname'=>'LED power(W)'),
             array('name'=>'蓄电池电压(V)','field'=>'RI.batpower as battvoltage','fields1'=>'battvoltage','enname'=>'Battery voltage(V)'),
             array('name'=>'蓄电池总过放次数','field'=>'HI.overtimes','fields1'=>'overtimes','enname'=>'Over discharge times'),
             array('name'=>'太阳能板功率(W)','field'=>'RI.panelpower as solarpower','fields1'=>'solarpower','enname'=>'Solar panel power(W)'),

api/application/controllers/Lampcontrol.php

@@ -92,13 +92,13 @@ class Lampcontrol extends Base_Controller {
             if(empty($fields)){
                 $fields = 'L.id, L.number';
             }else{
-                $fields .= ",L.updatetime";
+                $fields .= ",RI.updatetime";
             }
             $join = array();
             $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, L.updatetime, L.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';
             }else{
                 $fields .= ",L.id,L.projectid,L.section,L.loadtype,P.timezone as timezoneid";
             }
@@ -379,7 +379,7 @@ class Lampcontrol extends Base_Controller {
                         // $value['timezoneid'];
                         if($timezone === null) $timezone = $this->db->query('select value from timezone where id = '.$value['timezoneid'])->row_array();
                         if ($timezone['value'] != 8) {
-                            $value['updatetime'] = date_change($value['updatetime'],8,$timezone['value']);
+                            $value['updatetime'] = date_change($value['updatetime'],0,$timezone['value']);
                         }
                     }
                 }
@@ -3502,13 +3502,13 @@ class Lampcontrol extends Base_Controller {
             $res = $this->Lamp_model->getListForInfoLog($lamp_id, $table, ($page-1)*$count, $count,$beginDate,$endDate);
         }elseif ($table == 'battery_info_log') {
             $join = [
-                ['table'=>'history_info_log as HI','cond'=>'HI.lampid = RI.lampid and HI.updatetime = RI.updatetime','type'=>'inner'],
+                // ['table'=>'history_info_log as HI','cond'=>'HI.lampid = RI.lampid and HI.updatetime = RI.updatetime','type'=>'inner'],
             ];
             $where = ['HI.lampid'=>$lamp_id,'HI.updatetime >='=>$beginDate,'HI.updatetime <='=>$endDate];
             $total = $this->RealtimeInfoLog_model->get_list_by_multi_join($where,'count(*) as total',NULL, NULL, $join, NULL, NUll, 'RI', true);
             $total = $total['total'];
 
-            $fields = 'RI.batvoltage as battvoltage,RI.updatetime,HI.overtimes';
+            $fields = 'RI.batvoltage as battvoltage,RI.updatetime,RI.DayOverDisChgTimes as overtimes';
             $res = $this->RealtimeInfoLog_model->get_list_by_join($where, $fields,$count, ($page-1)*$count, $join, 'RI.updatetime desc,RI.id desc', NUll, 'RI');
         }else{
             $total = $this->Lamp_model->getCountForInfoLog($lamp_id, $table,$beginDate,$endDate);

api/application/helpers/function_helper.php

@@ -848,7 +848,7 @@ function get_fields_by_type($fileds,$type){
         'boardpower' => array('name'=>'太阳能板功率(W)','enname'=>'Solar panel power(W)'),
         'batterytype' => array('name'=>'蓄电池类型','enname'=>'Battery type'),
         'batteryah' => array('name'=>'蓄电池AH数(ah)','enname'=>'Battery capacity(ah)'),
-        'loadpower' => array('name'=>'负载功率(W)','enname'=>'Load power(W)'),
+        'loadpower' => array('name'=>'负载功率(W)','enname'=>'LED power(W)'),
         'electricleft' => array('name'=>'蓄电池剩余电量','enname'=>'Remaining battery capacity(Ah)'),
         'lampvoltage' => array('name'=>'路灯电压(V)','enname'=>'Lamp voltage(V)'),
         'lampcurrent' => array('name'=>'路灯电流(A)','enname'=>'Lamp current(A)'),