[Update] 白牌默认图片处理

src/main/java/com/yeechart/dotMatrix/signage/SignageDrawRightUtil.java

@@ -6,8 +6,12 @@ import com.yeechart.dotMatrix.canvas.DotMatrixDrawShapeUtil;
 import com.yeechart.dotMatrix.canvas.DotMatrixDrawtextUtil;
 import com.yeechart.dotMatrix.canvas.DotMatrixImageUtil;
 import com.yeechart.dotMatrix.font.XZPFontLoaderUtil;
+import com.yeechart.dotMatrix.module.DotMatrix.controller.DotMatrixController;
 import com.yeechart.dotMatrix.signage.bean.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import java.math.BigDecimal;
@@ -27,6 +31,9 @@ public class SignageDrawRightUtil {
       
       @Autowired
       private DotMatrixDrawtextUtil dotMatrixDrawtextUtil;
+    protected Logger logger = LoggerFactory.getLogger(SignageDrawRightUtil.class);
+    @Value("${wb_enable}")
+    private Boolean wbEnable;
 
     /*********** 右屏 默认的 点阵数据的形成  ********************/
 
@@ -111,6 +118,12 @@ public class SignageDrawRightUtil {
         ){
             resourcePath = "classpath:image/device/020201/init_right_default_20250217.jpg";
         }
+        if(wbEnable && "default".equals(dId)){
+            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 = "未绑定设备";
 //        int[][] fontBinaryArray = XZPDrawtextUtil.drawingText(text,textFontSizeCheck,noChineseFontSizeCheck);

src/main/resources/application.yml

@@ -5,4 +5,5 @@ oss:
   accesskeyid: LTAI5t9avf8qyfJSiWCCPgGj
   accesskeysecret: OcCaklsOVwv7ccOlWB1tOyKemyaqXW
   bucket: yichao-filestorage-test
-  endpoint: filestoragetest.yeechart.com
+  endpoint: filestoragetest.yeechart.com
+wb_enable: false