Merge branch 'dev_vedio' into test6.9.0

@@ -102,7 +102,7 @@
     where id = #{id, jdbcType=INTEGER}
     where id = #{id, jdbcType=INTEGER}
   </update>
   </update>
 
 
-  <select id="selectByTime">
+  <select id="selectByTime" resultMap="BaseResultMap">
     select id, order_code, start_time, end_time, camera_code from qiniu_live_record
     select id, order_code, start_time, end_time, camera_code from qiniu_live_record
     where create_time &gt;= #{startTime, jdbcType=INTEGER} and create_time &lt; #{endTime, jdbcType=INTEGER} and show_flag = 1
     where create_time &gt;= #{startTime, jdbcType=INTEGER} and create_time &lt; #{endTime, jdbcType=INTEGER} and show_flag = 1
   </select>
   </select>

@@ -153,7 +153,8 @@ public class UfoLiveController {
     public ApiResponse queryVideoInfo(QNliveReq req) {
     public ApiResponse queryVideoInfo(QNliveReq req) {
         LOGGER.info("queryVideoInfo method in. req is {}", req);
         LOGGER.info("queryVideoInfo method in. req is {}", req);
 
 
-        if (null == req.getStartTime() || null == req.getEndTime() || req.getEndTime() - req.getStartTime() > 86400) {
+        if (null == req.getStartTime() || null == req.getEndTime()
+                || req.getEndTime() - req.getStartTime() > 86400 || req.getEndTime() - req.getStartTime() <= 0) {
             return new ApiResponse.ApiResponseBuilder().code(500).message("时间格式不对").build();
             return new ApiResponse.ApiResponseBuilder().code(500).message("时间格式不对").build();
         }
         }
 
 

@@ -21,6 +21,7 @@
 				<value>platformLogin.do</value>
 				<value>platformLogin.do</value>
 				<value>logout.do</value>
 				<value>logout.do</value>
 				<value>updateVideoUrl</value>
 				<value>updateVideoUrl</value>
+				<value>queryVideoInfo</value>
 			</list>
 			</list>
 		</property>
 		</property>
 	</bean>
 	</bean>