diff --git a/src/main/java/com/ycwl/basic/device/DeviceFactory.java b/src/main/java/com/ycwl/basic/device/DeviceFactory.java index 6f62865..9108720 100644 --- a/src/main/java/com/ycwl/basic/device/DeviceFactory.java +++ b/src/main/java/com/ycwl/basic/device/DeviceFactory.java @@ -15,13 +15,16 @@ import com.ycwl.basic.model.pc.device.entity.DeviceEntity; public class DeviceFactory { public static IDeviceStorageOperator getDeviceStorageOperator(DeviceEntity device, DeviceConfigEntity config) { IDeviceStorageOperator operator = null; - if (config.getStoreType() == DeviceStoreTypeEnum.ALI_OSS.getType()) { + if (config == null) { + return null; + } + if (Integer.valueOf(DeviceStoreTypeEnum.ALI_OSS.getType()).equals(config.getStoreType())) { operator = new AliOssStorageOperator(config.getStoreConfigJson()); - } else if (config.getStoreType() == DeviceStoreTypeEnum.WVP_ACTIVE.getType()) { + } else if (Integer.valueOf(DeviceStoreTypeEnum.WVP_ACTIVE.getType()).equals(config.getStoreType())) { operator = new WvpActiveStorageOperator(config.getStoreConfigJson()); - } else if (config.getStoreType() == DeviceStoreTypeEnum.WVP_PASSIVE.getType()) { + } else if (Integer.valueOf(DeviceStoreTypeEnum.WVP_PASSIVE.getType()).equals(config.getStoreType())) { operator = new WvpPassiveStorageOperator(config.getStoreConfigJson()); - } else if (config.getStoreType() == DeviceStoreTypeEnum.LOCAL.getType()) { + } else if (Integer.valueOf(DeviceStoreTypeEnum.LOCAL.getType()).equals(config.getStoreType())) { operator = new LocalStorageOperator(config.getStoreConfigJson()); } if (operator == null) {