wvp-pro.git - Gitblit

			@@ -43,7 +43,6 @@
			"geo_coord_sys," +
			"on_line," +
			"media_server_id," +
			"switch_primary_sub_stream," +
			"broadcast_push_after_ack," +
			"(SELECT count(0) FROM wvp_device_channel WHERE device_id=wvp_device.device_id) as channel_count "+
			" FROM wvp_device WHERE device_id = #{deviceId}")
			@@ -163,7 +162,6 @@
			"geo_coord_sys,"+
			"on_line,"+
			"media_server_id,"+
			"switch_primary_sub_stream switchPrimarySubStream,"+
			"(SELECT count(0) FROM wvp_device_channel WHERE device_id=de.device_id) as channel_count " +
			"FROM wvp_device de" +
			"<if test=\"onLine != null\"> where on_line=${onLine}</if>"+
			@@ -256,7 +254,6 @@
			"<if test=\"asMessageChannel != null\">, as_message_channel=#{asMessageChannel}</if>" +
			"<if test=\"broadcastPushAfterAck != null\">, broadcast_push_after_ack=#{broadcastPushAfterAck}</if>" +
			"<if test=\"geoCoordSys != null\">, geo_coord_sys=#{geoCoordSys}</if>" +
			"<if test=\"switchPrimarySubStream != null\">, switch_primary_sub_stream=#{switchPrimarySubStream}</if>" +
			"<if test=\"mediaServerId != null\">, media_server_id=#{mediaServerId}</if>" +
			"WHERE device_id=#{deviceId}"+
			" </script>"})
			@@ -275,8 +272,7 @@
			"broadcastPushAfterAck,"+
			"geo_coord_sys,"+
			"on_line,"+
			"media_server_id,"+
			"switch_primary_sub_stream"+
			"media_server_id"+
			") VALUES (" +
			"#{deviceId}," +
			"#{name}," +
			@@ -290,8 +286,7 @@
			"#{broadcastPushAfterAck}," +
			"#{geoCoordSys}," +
			"#{onLine}," +
			"#{mediaServerId}," +
			"#{switchPrimarySubStream}" +
			"#{mediaServerId}" +
			")")
			void addCustomDevice(Device device);