修复设备列表查询丢失字段,导致编辑后都是心跳参数
This commit is contained in:
@@ -346,38 +346,41 @@ public interface DeviceMapper {
|
|||||||
|
|
||||||
@Select(" <script>" +
|
@Select(" <script>" +
|
||||||
"SELECT " +
|
"SELECT " +
|
||||||
"id, " +
|
|
||||||
"device_id, " +
|
|
||||||
"coalesce(custom_name, name) as name, " +
|
"coalesce(custom_name, name) as name, " +
|
||||||
"password, " +
|
"id" +
|
||||||
"manufacturer, " +
|
",device_id" +
|
||||||
"model, " +
|
",manufacturer" +
|
||||||
"firmware, " +
|
",model" +
|
||||||
"transport," +
|
",firmware" +
|
||||||
"stream_mode," +
|
",transport" +
|
||||||
"ip,"+
|
",stream_mode" +
|
||||||
"sdp_ip,"+
|
",on_line" +
|
||||||
"local_ip,"+
|
",register_time" +
|
||||||
"port,"+
|
",keepalive_time" +
|
||||||
"host_address,"+
|
",ip" +
|
||||||
"expires,"+
|
",create_time" +
|
||||||
"register_time,"+
|
",update_time" +
|
||||||
"keepalive_time,"+
|
",port" +
|
||||||
"create_time,"+
|
",expires" +
|
||||||
"update_time,"+
|
",subscribe_cycle_for_catalog" +
|
||||||
"charset,"+
|
",subscribe_cycle_for_mobile_position" +
|
||||||
"subscribe_cycle_for_catalog,"+
|
",mobile_position_submission_interval" +
|
||||||
"subscribe_cycle_for_mobile_position,"+
|
",subscribe_cycle_for_alarm" +
|
||||||
"mobile_position_submission_interval,"+
|
",host_address" +
|
||||||
"subscribe_cycle_for_alarm,"+
|
",charset" +
|
||||||
"ssrc_check,"+
|
",ssrc_check" +
|
||||||
"as_message_channel,"+
|
",geo_coord_sys" +
|
||||||
"broadcast_push_after_ack,"+
|
",media_server_id" +
|
||||||
"geo_coord_sys,"+
|
",sdp_ip" +
|
||||||
"on_line,"+
|
",local_ip" +
|
||||||
"media_server_id,"+
|
",password" +
|
||||||
"server_id,"+
|
",as_message_channel" +
|
||||||
"(SELECT count(0) FROM wvp_device_channel dc WHERE dc.data_type = #{dataType} and dc.data_device_id= de.id) as channel_count " +
|
",heart_beat_interval" +
|
||||||
|
",heart_beat_count" +
|
||||||
|
",position_capability" +
|
||||||
|
",broadcast_push_after_ack" +
|
||||||
|
",server_id" +
|
||||||
|
",(SELECT count(0) FROM wvp_device_channel dc WHERE dc.data_type = #{dataType} and dc.data_device_id= de.id) as channel_count " +
|
||||||
" FROM wvp_device de" +
|
" FROM wvp_device de" +
|
||||||
" where 1 = 1 "+
|
" where 1 = 1 "+
|
||||||
" <if test='status != null'> AND de.on_line=${status}</if>"+
|
" <if test='status != null'> AND de.on_line=${status}</if>"+
|
||||||
|
|||||||
Reference in New Issue
Block a user