设备支持多个配置

src/main/java/com/ycwl/basic/model/pc/device/entity/DeviceConfigEntity.java

@@ -4,9 +4,12 @@ import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+import org.apache.commons.lang3.StringUtils;
 
 import java.math.BigDecimal;
+import java.util.Collections;
 import java.util.Date;
+import java.util.List;
 
 @Data
 @TableName("device_config")
@@ -65,11 +68,16 @@ public class DeviceConfigEntity {
     private String videoCrop;
     private String cropConfig;
 
-    public void setCropConfig(DeviceCropConfig cropConfig) {
-        this.cropConfig = JSON.toJSONString(cropConfig);
-    }
-
-    public DeviceCropConfig getCropConfig() {
-        return JSON.parseObject(cropConfig, DeviceCropConfig.class);
+    public List<DeviceCropConfig> _getCropConfig() {
+        if (cropConfig == null || cropConfig.isEmpty()) {
+            return Collections.singletonList(new DeviceCropConfig());
+        }
+        if (StringUtils.startsWith(cropConfig, "{")) {
+            return Collections.singletonList(JSON.parseObject(cropConfig, DeviceCropConfig.class));
+        }
+        if (StringUtils.startsWith(cropConfig, "[")) {
+            return JSON.parseArray(cropConfig, DeviceCropConfig.class);
+        }
+        return Collections.singletonList(new DeviceCropConfig());
     }
 }

src/main/java/com/ycwl/basic/model/pc/device/entity/DeviceCropConfig.java

@@ -5,7 +5,7 @@ import lombok.Data;
 @Data
 public class DeviceCropConfig {
     // 截图类型 0:无截图 1:固定截图 2:按人脸位置截图
-    private Integer cropType;
+    private int cropType;
     private Integer targetWidth;
     private Integer targetHeight;
     private Integer targetX;