|
|
@@ -3508,7 +3508,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.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,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)) {
|
|
|
@@ -3582,7 +3582,6 @@ class Lampcontrol extends Base_Controller {
|
|
|
"network_id" => $res["networkid"],
|
|
|
'status' => $res['status'],
|
|
|
'batterytype' => $res['batterytype'],
|
|
|
- 'devicetype' => intval($res['devicetype']),
|
|
|
'protocoltype'=>intval($res['protocoltype']),
|
|
|
"simid" => empty($res["simid"]) ? '' : $res["simid"],
|
|
|
"packageSurplus" => $res["packageSurplus"],
|
