Pre Merge pull request !36 from 阿斌/N/A

src/main/java/com/genersoft/iot/vmp/gb28181/dao/DeviceMapper.java

@@ -346,41 +346,38 @@ public interface DeviceMapper {
 
     @Select(" <script>" +
             "SELECT " +
+            "id, " +
+            "device_id, " +
             "coalesce(custom_name, name) as name, " +
-            "id" +
+            "password, " +
-            ",device_id" +
+            "manufacturer, " +
-            ",manufacturer" +
+            "model, " +
-            ",model" +
+            "firmware, " +
-            ",firmware" +
+            "transport," +
-            ",transport" +
+            "stream_mode," +
-            ",stream_mode" +
+            "ip,"+
-            ",on_line" +
+            "sdp_ip,"+
-            ",register_time" +
+            "local_ip,"+
-            ",keepalive_time" +
+            "port,"+
-            ",ip" +
+            "host_address,"+
-            ",create_time" +
+            "expires,"+
-            ",update_time" +
+            "register_time,"+
-            ",port" +
+            "keepalive_time,"+
-            ",expires" +
+            "create_time,"+
-            ",subscribe_cycle_for_catalog" +
+            "update_time,"+
-            ",subscribe_cycle_for_mobile_position" +
+            "charset,"+
-            ",mobile_position_submission_interval" +
+            "subscribe_cycle_for_catalog,"+
-            ",subscribe_cycle_for_alarm" +
+            "subscribe_cycle_for_mobile_position,"+
-            ",host_address" +
+            "mobile_position_submission_interval,"+
-            ",charset" +
+            "subscribe_cycle_for_alarm,"+
-            ",ssrc_check" +
+            "ssrc_check,"+
-            ",geo_coord_sys" +
+            "as_message_channel,"+
-            ",media_server_id" +
+            "broadcast_push_after_ack,"+
-            ",sdp_ip" +
+            "geo_coord_sys,"+
-            ",local_ip" +
+            "on_line,"+
-            ",password" +
+            "media_server_id,"+
-            ",as_message_channel" +
+            "server_id,"+
-            ",heart_beat_interval" +
+            "(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_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" +
             " where 1 = 1 "+
             " <if test='status != null'> AND de.on_line=${status}</if>"+