| 
					
				 | 
			
			
				@@ -907,7 +907,7 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     /** 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      * 删除录制视频的零时文件 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      */ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    public void deleteTmpFlv(Integer num) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    public void deleteTmpFlv(String num) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         log.info("find /opt/streams/record/flv/*/*/ -mmin +5 -name *.flv -exec rm -rf {} \\;"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 //        cmdCameraUtil.cmd("find /opt/streams/record/flv/*/*/ -mmin +5 -name *.flv -exec rm -rf {} \\;"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 |