|
|
@@ -1339,14 +1339,14 @@ class Lampcontrol extends Base_Controller {
|
|
|
|
|
|
$res = $this->Lamp_model->get_one(['id'=>$lamp_id],$fields);
|
|
|
|
|
|
- exit(json_result('0000', $this->response['0000'], $data));
|
|
|
+ exit(json_result('0000', $this->response['0000'], $res));
|
|
|
}elseif ($datatype == 'solar_info_log') {
|
|
|
$fields = "solarvoltage,solarcurrent,solarpower";
|
|
|
|
|
|
$res = $this->Lamp_model->get_one(['id'=>$lamp_id],$fields);
|
|
|
|
|
|
$res["updatetime"] = date_change($res["updatetime"],0,DEF_TIMEZONE);
|
|
|
- exit(json_result('0000', $this->response['0000'], $data));
|
|
|
+ exit(json_result('0000', $this->response['0000'], $res));
|
|
|
}elseif ($datatype == 'battery_info_log') {
|
|
|
// $fields = "battstatus,chargestage,battvoltage,chargecurrent,discharcurrent,chargepower,dischargepower,batttemper,electrictotal,electricleft,electricSOC,voltagedaymin,voltagedaymax,daychargeah,daydischarah,daychargemaxpow,daydischarmaxpow,daychargemincurrent,daycharmaxcurrent,daydischargemincurrent,daydischarmaxcurrent,daybattmintemper,daybattmaxtemper";
|
|
|
$fields = "*";
|
|
|
@@ -1354,14 +1354,14 @@ class Lampcontrol extends Base_Controller {
|
|
|
$res = $this->Lamp_model->get_one(['id'=>$lamp_id],$fields);
|
|
|
|
|
|
$res["updatetime"] = date_change($res["updatetime"],0,DEF_TIMEZONE);
|
|
|
- exit(json_result('0000', $this->response['0000'], $data));
|
|
|
+ exit(json_result('0000', $this->response['0000'], $res));
|
|
|
}elseif ($datatype == 'system_info_log') {
|
|
|
$fields = "sysvoltage,syscurrent,temper,updatetime,id,number as lampid";
|
|
|
|
|
|
$res = $this->Lamp_model->get_one(['id'=>$lamp_id],$fields);
|
|
|
|
|
|
$res["updatetime"] = date_change($res["updatetime"],0,DEF_TIMEZONE);
|
|
|
- exit(json_result('0000', $this->response['0000'], $data));
|
|
|
+ exit(json_result('0000', $this->response['0000'], $res));
|
|
|
}
|
|
|
// $table_map = array('system_info_log','lamp_info_log','solar_info_log','battery_info_log');
|
|
|
// $table = in_array($datatype, $table_map) ? $datatype : 'system_info_log';
|
