| 
					
				 | 
			
			
				@@ -38,6 +38,8 @@ public class TestController extends BaseController { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     @Autowired 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     private com.ozs.web.core.util.CameraUtil cameraUtil; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    @Autowired 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    private com.ozs.web.core.util.CmdCameraUtil cmdCameraUtil; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     private final static Map<Integer, UserEntity> users = new LinkedHashMap<Integer, UserEntity>(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     { 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -64,6 +66,12 @@ public class TestController extends BaseController { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         return R.ok(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    @GetMapping("/cmd") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    public R<String> cmd(String cmd) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+         
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            cmdCameraUtil.cmd(cmd); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        return R.ok(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     @GetMapping("/mergeVideo") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     public R<String> mergeVideo() { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         try { 
			 |