|
|
@@ -3959,7 +3959,7 @@ class Lampcontrol extends Base_Controller {
|
|
|
}
|
|
|
if ($datatype == 'lampinfo') {
|
|
|
|
|
|
- $fields = "L.isfaulted,L.number,L.networkid as network_id,L.projectid,L.address,L.longitude,L.latitude,L.section,L.boardpower,L.polematerial,L.polediameter,L.poleheight,L.lighttype,L.lamptype,L.boardtype,L.batteryah,L.loadpower,L.devstatus,N.id as networkid,L.logtime as updatetime,L.batterytype,L.devicetype,N.protocoltype,L.protocoltype as lampprotocoltype,N.status,N.simid,N.packageSurplus,N.monthly_can_usage,N.monthly_already_usage,L.loadtype";
|
|
|
+ $fields = "L.isfaulted,L.number,L.networkid as network_id,L.projectid,L.address,L.longitude,L.latitude,L.section,L.boardpower,L.lamptype,L.boardtype,L.batteryah,L.loadpower,L.devstatus,N.id as networkid,L.logtime as updatetime,L.batterytype,L.devicetype,N.protocoltype,L.protocoltype as lampprotocoltype,N.status,N.simid,N.packageSurplus,N.monthly_can_usage,N.monthly_already_usage,L.loadtype";
|
|
|
|
|
|
$res = $this->Lamp_model->getOne($lamp_id,$fields);
|
|
|
if (empty($res)) {
|
|
|
@@ -4038,10 +4038,6 @@ class Lampcontrol extends Base_Controller {
|
|
|
"isfaulted" => $res["isfaulted"],
|
|
|
"section" => $res["section"],
|
|
|
"boardpower" => floatval($res["boardpower"]),
|
|
|
- "poleheight" => $res['poleheight'],
|
|
|
- "polediameter" => $res['polediameter'],
|
|
|
- "polematerial" => $res['polematerial'],
|
|
|
- "lighttype" => $res['lighttype'],
|
|
|
"lamptype" => $res['lamptype'],
|
|
|
"boardtype" => $res['boardtype'],
|
|
|
"batteryah" => $res["batteryah"],
|
