Merge remote-tracking branch 'origin/test' into test

device-api-service/src/main/java/com/xy/service/factory/device/impl/open/OpenDeviceFactoryImpl.java

@@ -153,7 +153,7 @@ public class OpenDeviceFactoryImpl implements DeviceFactory {
         //检查费用
         R deviceChargingCheck = deviceChargingService.check(new DeviceChargingDto.Check().setDeviceId(active.getDeviceId()));
         R deviceAlgorithmChargingCheck = deviceAlgorithmChargingService.check(new DeviceAlgorithmChargingDto.Check().setDeviceId(active.getDeviceId()));
-        if (deviceChargingCheck.getCode() != R.Enum.SUCCESS.getCode() && deviceAlgorithmChargingCheck.getCode()  != R.Enum.SUCCESS.getCode()) {
+        if (deviceChargingCheck.getCode() != R.Enum.SUCCESS.getCode() && deviceAlgorithmChargingCheck.getCode() != R.Enum.SUCCESS.getCode()) {
             return R.fail(R.Enum.CHARGING_ALGORITHM_CHARGING.getCode(), R.Enum.CHARGING_ALGORITHM_CHARGING.getMsg());
         } else {
             if (deviceChargingCheck.getCode() != R.Enum.SUCCESS.getCode()) {
@@ -247,7 +247,7 @@ public class OpenDeviceFactoryImpl implements DeviceFactory {
                 if (Emptys.check(sysCodeConfigureRedis.getExpand())) {
                     DeviceInfo updateDeviceInfo = new DeviceInfo()
                             .setDeviceId(deviceInfo.getDeviceId())
-                            .setFaultLevel(Integer.valueOf(sysCodeConfigureRedis.getExpand()));
+                            .setFaultLevel(1);
                     deviceInfoService.updateById(updateDeviceInfo);
                     //设备故障消息推送
                     sendMsg(deviceEventMsg);