|
|
@@ -61,14 +61,14 @@
|
|
|
<result column="voice_volume" property="voiceVolume"/>
|
|
|
<result column="light_main" property="lightMain"/>
|
|
|
<result column="light_second" property="lightSecond"/>
|
|
|
- <result column="disk_space" property="diskSpace"/>
|
|
|
+ <result column="status_disk_space" property="diskSpace"/>
|
|
|
<result column="disk_remain_space" property="diskRemainSpace"/>
|
|
|
<result column="memery_remain_space" property="memeryRemainSpace"/>
|
|
|
<result column="camera_l_main_state" property="cameraLMainState"/>
|
|
|
<result column="camera_l_second_state" property="cameraLSecondState"/>
|
|
|
<result column="device_state_l" property="deviceStateL"/>
|
|
|
<result column="device_state_r" property="deviceStateR"/>
|
|
|
- <result column="update_time" property="updateTime"/>
|
|
|
+ <result column="status_update_time" property="updateTime"/>
|
|
|
<result column="stock" property="stock"/>
|
|
|
<result column="after_fill_stock" property="afterFillStock"/>
|
|
|
<result column="stock_status" property="stockStatus"/>
|
|
|
@@ -98,12 +98,11 @@
|
|
|
status.sys_start_time, status.sys_cur_time, status.sys_power, status.wifi_open, status.blooth_open,
|
|
|
status.net_state, status.net_type, status.net_dbm, status.door_state_l,
|
|
|
status.door_state_r, status.lock_state_l, status.lock_state_r, status.temp_value, status.temp_state,
|
|
|
- status.voice_volume, status.light_main, status.light_second, status.disk_space,
|
|
|
- status.disk_remain_space, status.memery_space, status.memery_remain_space, status.camera_l_main_state,
|
|
|
+ status.voice_volume, status.light_main, status.light_second, status.disk_space as status_disk_space,
|
|
|
+ status.disk_remain_space, status.memery_remain_space, status.camera_l_main_state,
|
|
|
status.camera_l_second_state, status.camera_r_main_state, status.camera_r_second_state,
|
|
|
- status.device_state_l, status.device_state_r, status.update_time,
|
|
|
+ status.device_state_l, status.device_state_r, status.status_update_time,
|
|
|
status.stock, status.after_fill_stock, status.stock_status,
|
|
|
- mr.name as merc_name,
|
|
|
mp.place_name,
|
|
|
ml.line_name as place_line_name,
|
|
|
sr.name as district_name
|
