| 
					
				 | 
			
			
				@@ -59,7 +59,7 @@ public class TestController extends BaseController { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     @GetMapping("/deleteTmpFlv") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     public R<String> deleteTmpFlv() { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         try { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            cameraUtil.deleteTmpFlv(1); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            cameraUtil.deleteTmpFlv("1"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } catch (Exception e) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             return R.ok(e.getMessage().toString()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -68,8 +68,8 @@ public class TestController extends BaseController { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     @GetMapping("/cmd") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     public R<String> cmd(String cmd) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-         
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            cmdCameraUtil.cmd(cmd); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        cmdCameraUtil.cmd(cmd); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         return R.ok(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     @GetMapping("/mergeVideo") 
			 |