|
@@ -1468,30 +1468,30 @@ class Lampcontrol extends Base_Controller {
|
|
|
|
|
|
exit(json_result('0000', $this->response['0000'], $data));
|
|
|
}elseif ($datatype == 'lamp_info_log') {
|
|
|
- $fields = "lighteness,status as lampstatus,lampvoltage,lampcurrent,lamppower,lamptemper as temper";
|
|
|
+ $fields = "lighteness,lampvoltage,lampcurrent,loadpower,updatetime";
|
|
|
|
|
|
$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'], $res));
|
|
|
}elseif ($datatype == 'solar_info_log') {
|
|
|
- $fields = "solarvoltage,solarcurrent,solarpower";
|
|
|
+ $fields = "solarvoltage,solarcurrent,solarpower,updatetime";
|
|
|
|
|
|
$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'], $res));
|
|
|
}elseif ($datatype == 'battery_info_log') {
|
|
|
- $fields = "battstatus,battvoltage,chargecurrent,discharcurrent,chargepower,dischargepower,batttemper,electrictotal,electricSOC,voltagedaymin,voltagedaymax,daychargemaxpow,daydischarmaxpow,daychargemincurrent,daycharmaxcurrent,daydischargemincurrent,daydischarmaxcurrent,daybattmintemper,daybattmaxtemper";
|
|
|
+ $fields = "battstatus,battvoltage,chargecurrent,discharcurrent,chargepower,dischargepower,batttemper,electrictotal,electricSOC,voltagedaymin,voltagedaymax,daychargemaxpow,daydischarmaxpow,daychargemincurrent,daycharmaxcurrent,daydischargemincurrent,daydischarmaxcurrent,daybattmintemper,daybattmaxtemper,updatetime";
|
|
|
// $fields = "*";
|
|
|
|
|
|
$res = $this->Lamp_model->get_one(['id'=>$lamp_id],$fields);
|
|
|
|
|
|
- // $res["updatetime"] = date_change($res["updatetime"],0,DEF_TIMEZONE);
|
|
|
+ $res["updatetime"] = date_change($res["updatetime"],0,DEF_TIMEZONE);
|
|
|
exit(json_result('0000', $this->response['0000'], $res));
|
|
|
}elseif ($datatype == 'system_info_log') {
|
|
|
- $fields = "sysvoltage,syscurrent,temper,updatetime,id,number as lampid";
|
|
|
+ $fields = "sysvoltage,syscurrent,temper as controlTemper,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'], $res));
|
|
|
}
|
|
|
// $table_map = array('system_info_log','lamp_info_log','solar_info_log','battery_info_log');
|