| 
					
				 | 
			
			
				@@ -33,7 +33,8 @@ public class SignageDrawRightUtil { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     private Boolean wbEnable; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     @Value("${wb.device_ids}") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     private String[] wbDeviceIds; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				- 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    @Value("${wb.force}") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    private Boolean wsForce; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     /*********** 右屏 默认的 点阵数据的形成  ********************/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     /** 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -114,10 +115,14 @@ public class SignageDrawRightUtil { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         if(wbEnable && "default".equals(dId)){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            logger.info("强制白牌"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            logger.info("默认图片: 强制白牌"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             //电信 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             resourcePath = "classpath:image/device/020201/init_right_default_20250217.jpg"; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        if(wsForce) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            logger.info("强制白牌"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            resourcePath = "classpath:image/device/020201/init_right_default_20250217.jpg"; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         logger.info("设备ID {}, 默认图: {}", dId, resourcePath); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 //        int[][] canvasBitmapArrays =  XZPImageUtil.twoToCanvasBitmapArrays(XZPImageUtil.canvasImageBitmapArrays(resourcePath,width,height,140),width,height); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 //        String text = "未绑定设备"; 
			 |