[Update] 白牌ID放到配置文件中

pom.xml

@@ -10,7 +10,7 @@
     </parent>
     <groupId>com.example</groupId>
     <artifactId>DotMatrix</artifactId>
-    <version>0.2.1</version>
+    <version>0.2.2</version>
     <name>DotMatrix</name>
     <description>DotMatrix</description>
 

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

@@ -6,7 +6,6 @@ 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;
@@ -25,15 +24,15 @@ import java.util.regex.Pattern;
 
 @Component
 public class SignageDrawRightUtil {
-
     @Autowired
     private XZPFontLoaderUtil xzpFontLoaderUtil;
-      
-      @Autowired
-      private DotMatrixDrawtextUtil dotMatrixDrawtextUtil;
+    @Autowired
+    private DotMatrixDrawtextUtil dotMatrixDrawtextUtil;
     protected Logger logger = LoggerFactory.getLogger(SignageDrawRightUtil.class);
-    @Value("${wb_enable}")
+    @Value("${wb.enable}")
     private Boolean wbEnable;
+    @Value("${wb.device_ids}")
+    private String[] wbDeviceIds;
 
     /*********** 右屏 默认的 点阵数据的形成  ********************/
 
@@ -108,15 +107,11 @@ public class SignageDrawRightUtil {
     public  int[][] canvasRightOFFNotNetworkBitmapArrays(String dId) {
         String resourcePath = "image/device/020201/init_right_default_20240601.jpg";
         //特殊处理 电信白牌
-        if("1Ow61P3WM".equals(dId) ||
-                "1OvYDdG8w".equals(dId) ||
-                "1OAUzwkak".equals(dId) ||
-                "1OBP8PIY0".equals(dId) ||
-                "1OAFPlupi".equals(dId) ||
-                "1OwkswJ0c".equals(dId) ||
-                "1QeFHrHxu".equals(dId)
-        ){
-            resourcePath = "classpath:image/device/020201/init_right_default_20250217.jpg";
+        for(String id: wbDeviceIds) {
+            if(id.equals(dId)) {
+                resourcePath = "classpath:image/device/020201/init_right_default_20250217.jpg";
+                break;
+            }
         }
         if(wbEnable && "default".equals(dId)){
             logger.info("强制白牌");

src/main/resources/application.yml

@@ -6,4 +6,6 @@ oss:
   accesskeysecret: OcCaklsOVwv7ccOlWB1tOyKemyaqXW
   bucket: yichao-filestorage-test
   endpoint: filestoragetest.yeechart.com
-wb_enable: false
+wb:
+  enable: false
+  device_ids: 1Ow61P3WM,1OvYDdG8w,1OAUzwkak,1OBP8PIY0,1OAFPlupi,1OwkswJ0c,1QeFHrHxu