wvp-pro.git - Gitblit

			@@ -24,6 +24,8 @@
			"transport," +
			"streamMode," +
			"ip," +
			"sdpIp," +
			"localIp," +
			"port," +
			"hostAddress," +
			"expires," +
			@@ -52,6 +54,8 @@
			"transport," +
			"streamMode," +
			"ip," +
			"sdpIp," +
			"localIp," +
			"port," +
			"hostAddress," +
			"expires," +
			@@ -77,6 +81,8 @@
			"#{transport}," +
			"#{streamMode}," +
			"#{ip}," +
			"#{sdpIp}," +
			"#{localIp}," +
			"#{port}," +
			"#{hostAddress}," +
			"#{expires}," +
			@@ -98,20 +104,21 @@

			@Update(value = {" <script>" +
			"UPDATE device " +
			"SET updateTime='${updateTime}'" +
			"<if test=\"name != null\">, name='${name}'</if>" +
			"<if test=\"manufacturer != null\">, manufacturer='${manufacturer}'</if>" +
			"<if test=\"model != null\">, model='${model}'</if>" +
			"<if test=\"firmware != null\">, firmware='${firmware}'</if>" +
			"<if test=\"transport != null\">, transport='${transport}'</if>" +
			"<if test=\"ip != null\">, ip='${ip}'</if>" +
			"<if test=\"port != null\">, port=${port}</if>" +
			"<if test=\"hostAddress != null\">, hostAddress='${hostAddress}'</if>" +
			"<if test=\"online != null\">, online=${online}</if>" +
			"<if test=\"registerTime != null\">, registerTime='${registerTime}'</if>" +
			"<if test=\"keepaliveTime != null\">, keepaliveTime='${keepaliveTime}'</if>" +
			"<if test=\"expires != null\">, expires=${expires}</if>" +
			"WHERE deviceId='${deviceId}'"+
			"SET updateTime=#{updateTime}" +
			"<if test=\"name != null\">, name=#{name}</if>" +
			"<if test=\"manufacturer != null\">, manufacturer=#{manufacturer}</if>" +
			"<if test=\"model != null\">, model=#{model}</if>" +
			"<if test=\"firmware != null\">, firmware=#{firmware}</if>" +
			"<if test=\"transport != null\">, transport=#{transport}</if>" +
			"<if test=\"ip != null\">, ip=#{ip}</if>" +
			"<if test=\"localIp != null\">, localIp=#{localIp}</if>" +
			"<if test=\"port != null\">, port=#{port}</if>" +
			"<if test=\"hostAddress != null\">, hostAddress=#{hostAddress}</if>" +
			"<if test=\"online != null\">, online=#{online}</if>" +
			"<if test=\"registerTime != null\">, registerTime=#{registerTime}</if>" +
			"<if test=\"keepaliveTime != null\">, keepaliveTime=#{keepaliveTime}</if>" +
			"<if test=\"expires != null\">, expires=#{expires}</if>" +
			"WHERE deviceId=#{deviceId}"+
			" </script>"})
			int update(Device device);

			@@ -125,6 +132,8 @@
			"transport," +
			"streamMode," +
			"ip," +
			"sdpIp," +
			"localIp," +
			"port," +
			"hostAddress," +
			"expires," +
			@@ -160,6 +169,8 @@
			"transport," +
			"streamMode," +
			"ip," +
			"sdpIp," +
			"localIp," +
			"port," +
			"hostAddress," +
			"expires," +
			@@ -188,6 +199,8 @@
			"transport," +
			"streamMode," +
			"ip," +
			"sdpIp," +
			"localIp," +
			"port," +
			"hostAddress," +
			"expires," +
			@@ -204,27 +217,28 @@
			"geoCoordSys," +
			"treeType," +
			"online" +
			" FROM device WHERE ip = #{host} AND port=${port}")
			" FROM device WHERE ip = #{host} AND port=#{port}")
			Device getDeviceByHostAndPort(String host, int port);

			@Update(value = {" <script>" +
			"UPDATE device " +
			"SET updateTime='${updateTime}'" +
			"<if test=\"name != null\">, custom_name='${name}'</if>" +
			"<if test=\"password != null\">, password='${password}'</if>" +
			"<if test=\"streamMode != null\">, streamMode='${streamMode}'</if>" +
			"<if test=\"ip != null\">, ip='${ip}'</if>" +
			"<if test=\"port != null\">, port=${port}</if>" +
			"<if test=\"charset != null\">, charset='${charset}'</if>" +
			"<if test=\"subscribeCycleForCatalog != null\">, subscribeCycleForCatalog=${subscribeCycleForCatalog}</if>" +
			"<if test=\"subscribeCycleForMobilePosition != null\">, subscribeCycleForMobilePosition=${subscribeCycleForMobilePosition}</if>" +
			"<if test=\"mobilePositionSubmissionInterval != null\">, mobilePositionSubmissionInterval=${mobilePositionSubmissionInterval}</if>" +
			"<if test=\"subscribeCycleForAlarm != null\">, subscribeCycleForAlarm=${subscribeCycleForAlarm}</if>" +
			"<if test=\"ssrcCheck != null\">, ssrcCheck=${ssrcCheck}</if>" +
			"SET updateTime=#{updateTime}" +
			"<if test=\"name != null\">, custom_name=#{name}</if>" +
			"<if test=\"password != null\">, password=#{password}</if>" +
			"<if test=\"streamMode != null\">, streamMode=#{streamMode}</if>" +
			"<if test=\"ip != null\">, ip=#{ip}</if>" +
			"<if test=\"sdpIp != null\">, sdpIp=#{sdpIp}</if>" +
			"<if test=\"port != null\">, port=#{port}</if>" +
			"<if test=\"charset != null\">, charset=#{charset}</if>" +
			"<if test=\"subscribeCycleForCatalog != null\">, subscribeCycleForCatalog=#{subscribeCycleForCatalog}</if>" +
			"<if test=\"subscribeCycleForMobilePosition != null\">, subscribeCycleForMobilePosition=#{subscribeCycleForMobilePosition}</if>" +
			"<if test=\"mobilePositionSubmissionInterval != null\">, mobilePositionSubmissionInterval=#{mobilePositionSubmissionInterval}</if>" +
			"<if test=\"subscribeCycleForAlarm != null\">, subscribeCycleForAlarm=#{subscribeCycleForAlarm}</if>" +
			"<if test=\"ssrcCheck != null\">, ssrcCheck=#{ssrcCheck}</if>" +
			"<if test=\"geoCoordSys != null\">, geoCoordSys=#{geoCoordSys}</if>" +
			"<if test=\"treeType != null\">, treeType=#{treeType}</if>" +
			"<if test=\"mediaServerId != null\">, mediaServerId=#{mediaServerId}</if>" +
			"WHERE deviceId='${deviceId}'"+
			"WHERE deviceId=#{deviceId}"+
			" </script>"})
			int updateCustom(Device device);

			@@ -232,6 +246,7 @@
			"deviceId, " +
			"custom_name, " +
			"password, " +
			"sdpIp, " +
			"createTime," +
			"updateTime," +
			"charset," +
			@@ -243,6 +258,7 @@
			"#{deviceId}," +
			"#{name}," +
			"#{password}," +
			"#{sdpIp}," +
			"#{createTime}," +
			"#{updateTime}," +
			"#{charset}," +