no message

api/application/controllers/Home.php

@@ -484,7 +484,7 @@ class Home extends Base_Controller {
             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'=>'LED power(W)'),
+            array('name'=>'负载功率(W)','field'=>'RI.loadpower as lamppower','fields1'=>'lamppower','enname'=>'LED power(W)'),
             array('name'=>'Street light SN','field'=>'L.street_light_SN','fields1'=>'street_light_SN','enname'=>'Street light SN'),
             array('name'=>'Customer ID','field'=>'L.customer_ID','fields1'=>'customer_ID','enname'=>'Customer ID'),
             array('name'=>'Customer name','field'=>'L.customer_name','fields1'=>'customer_name','enname'=>'Customer name'),
@@ -530,8 +530,8 @@ class Home extends Base_Controller {
             array('name'=>'太阳能板类型','field'=>'L.boardtype','fields1'=>'boardtype','enname'=>'Solar panel type'),
             // array('name'=>'太阳能板功率(W)','field'=>'L.boardpower','fields1'=>'boardpower','enname'=>'Solar panel power(W)'),
             // array('name'=>'蓄电池类型','field'=>'L.batterytype','fields1'=>'batterytype','enname'=>'Battery type'),
-            // array('name'=>'蓄电池AH数(ah)','field'=>'HI.totalchargeah as batteryah','fields1'=>'batteryah','enname'=>'Battery capacity(ah)'),
-            // array('name'=>'负载功率(W)','field'=>'L.loadpower','fields1'=>'loadpower','enname'=>'Load power(W)'),
+            array('name'=>'蓄电池AH数(ah)','field'=>'L.batteryah','fields1'=>'batteryah','enname'=>'Battery capacity(ah)'),
+            array('name'=>'额定功率(W)','field'=>'L.loadpower','fields1'=>'loadpower','enname'=>'Load power(W)'),
             // array('name'=>'蓄电池剩余电量','field'=>'L.electricleft','fields1'=>'electricleft','enname'=>'Remaining battery capacity(Ah)'),
         );
 

api/application/controllers/Lampcontrol.php

@@ -130,7 +130,7 @@ class Lampcontrol extends Base_Controller {
             $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,L.controllerstatus,L.netstatus as netstatus2';
+                $fields = 'L.id, L.number, IFNULL(L.status,0) as status, L.isfaulted, L.address, L.loadpower as 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,L.netstatus as netstatus2';
             }else{
                 $fields .= ",L.id,L.projectid,L.section,L.loadtype,P.timezone as timezoneid,L.controllerstatus,L.netstatus as netstatus2";
             }
@@ -968,7 +968,11 @@ class Lampcontrol extends Base_Controller {
         $data["batterytype"] = $this->input->post('batterytype',true);
         $data["boardpower"] = $this->input->post('boardpower',true);
         $data["batteryah"] = $this->input->post('batteryah',true);
+        $loadpower = $this->input->post('loadpower',true);
+        $batteryah = $this->input->post('batteryah',true);
 
+        if(!empty($loadpower)) $data["loadpower"] = $loadpower;
+        if(!empty($batteryah)) $data["batteryah"] = $batteryah;
 
         $wattage = $this->input->post('wattage',true);
         $data["wattage"] = !empty($wattage) ? $wattage : 0;
@@ -998,7 +1002,7 @@ class Lampcontrol extends Base_Controller {
         $data["manu"] = $this->get_manu_by_address($data["address"]);
 
         if (empty($data["manu"])) exit(json_result('0423',$this->response['0423']));
-        $role = $this->get_user_info('role');
+        // $role = $this->get_user_info('role');
         $company = $this->get_user_info('company');
         if ($role != SYSTEM_ADMIN) {
             if ($role == 2) {
@@ -1373,7 +1377,7 @@ class Lampcontrol extends Base_Controller {
         }
         if ($datatype == 'lampinfo') {
 
-            $fields = "number,projectid,address,longitude,latitude,section,boardpower,lamptype,boardtype,batteryah,loadpower,devstatus,loadtype,supplier,upazilla,po,manu,protocoltype,updatetime,netstatus as status,power,model,fascal_year,fascal_year_phase,iccid,softwareVersion,customer_ID,street_light_SN,customer_name,date,battvoltage,overtimes,solarpower,id";
+            $fields = "number,projectid,address,longitude,latitude,section,boardpower,lamptype,boardtype,batteryah,lamppower,loadpower,devstatus,loadtype,supplier,upazilla,po,manu,protocoltype,updatetime,netstatus as status,power,model,fascal_year,fascal_year_phase,iccid,softwareVersion,customer_ID,street_light_SN,customer_name,date,battvoltage,overtimes,solarpower,id";
 
             $res = $this->Lamp_model->get_one(['id'=>$lamp_id],$fields);
             if (empty($res)) {
@@ -1466,7 +1470,7 @@ class Lampcontrol extends Base_Controller {
                 'softwareVersion' => $res['softwareVersion'],
                 
                 "boardtype" => $res['boardtype'], 
-                // "batteryah" => $res["batteryah"],
+                "batteryah" => $res["batteryah"],
                 // 'batterytype' => $res['batterytype'],
                 'protocoltype'=>intval($res['protocoltype']),
                 'supplier'=>intval($res['supplier']),
@@ -1501,7 +1505,7 @@ class Lampcontrol extends Base_Controller {
 
             exit(json_result('0000', $this->response['0000'], $data));
         }elseif ($datatype == 'lamp_info_log') {
-            $fields = "lighteness,lampvoltage,lampcurrent,lamppower as loadpower,updatetime";
+            $fields = "lighteness,lampvoltage,lampcurrent,lamppower,updatetime";
 
             $res = $this->Lamp_model->get_one(['id'=>$lamp_id],$fields);
             $res["updatetime"] = date_change($res["updatetime"],0,DEF_TIMEZONE);
@@ -1616,7 +1620,7 @@ class Lampcontrol extends Base_Controller {
                 $temp[$k][] = $lampStatusArr[$l['lampstatus']];
                 $temp[$k][] = $l['lampvoltage'];
                 $temp[$k][] = $l['lampcurrent'];
-                $temp[$k][] = $l['lamppower'];
+                $temp[$k][] = $l['loadpower'];
                 $temp[$k][] = $l['daydischarmaxpow'];
                 $h = floor($l['daychargemincurrent'] / 3600);
                 $h = $h < 10 ? '0'.$h : $h;

api/application/controllers/Project.php

@@ -451,6 +451,7 @@ class Project extends Base_Controller {
                 }
                 $projectIdArr = array_column($data, 'id');
                 $sectionWhere['L.projectid'] = $projectIdArr;
+                $sectionWhere['L.section !='] = '';
                 $join = array();
                 $join = ['table'=>'project as P','cond'=>'L.projectid = P.id','type'=>'left'];
                 $sectionList = $this->Lamp_model->get_list_by_join($sectionWhere, 'L.section as name,L.projectid,count(*) as lampcount',NULL, NULL,$join, 'convert(L.section using gbk) asc', 'L.projectid,L.section','L');
@@ -606,6 +607,10 @@ class Project extends Base_Controller {
                 }
                 $projectIdArr = array_column($data, 'id');
                 $sectionWhere['L.projectid'] = $projectIdArr;
+                $sectionWhere['L.section !='] = '';
+                // var_dump($sectionWhere);die;
+                // array(2) { ["L.po"]=> string(3) "144" ["L.projectid"]=> array(8) { [0]=> string(2) "20" [1]=> string(2) "28" [2]=> string(2) "43" [3]=> string(2) "20" [4]=> string(2) "39" [5]=> string(2) "28" [6]=> string(2) "42" [7]=> string(2) "51" } }
+                // "projectid = 28 AND supplier = 116 AND po = 144 AND section = "1234""
                 // $sectionList = $this->Lamp_model->get_list($sectionWhere, 'section as name,projectid,count(*) as lampcount',NULL, NULL, 'convert(section using gbk) asc', 'projectid,section');
                 $join = array();
                 $join[] = ['table'=>'project as P','cond'=>'P.id = L.projectid','type'=>'left'];