diff --git a/ems-system/src/main/java/com/xzzn/ems/service/impl/DeviceDataProcessServiceImpl.java b/ems-system/src/main/java/com/xzzn/ems/service/impl/DeviceDataProcessServiceImpl.java index 6663e82..4ba6573 100644 --- a/ems-system/src/main/java/com/xzzn/ems/service/impl/DeviceDataProcessServiceImpl.java +++ b/ems-system/src/main/java/com/xzzn/ems/service/impl/DeviceDataProcessServiceImpl.java @@ -407,7 +407,7 @@ public class DeviceDataProcessServiceImpl extends AbstractBatteryDataProcessor i String status = dataStack.getWorkStatus(); int result = 5; - if (status != null && !status.trim().isEmpty() && status.contains("null")) { + if (status != null && !status.trim().isEmpty()) { // 1.0 -> 1, 2.0 -> 2 result = (int) Double.parseDouble(status.trim()); } @@ -863,7 +863,7 @@ public class DeviceDataProcessServiceImpl extends AbstractBatteryDataProcessor i //TODO 临时解决上送数据为浮点的问题 start String status = pcsData.getWorkStatus(); int result = 0; - if (status != null && !status.trim().isEmpty() && status.contains("null")) { + if (status != null && !status.trim().isEmpty()) { // 1.0 -> 1, 2.0 -> 2 result = (int) Double.parseDouble(status.trim()); } @@ -1003,7 +1003,7 @@ public class DeviceDataProcessServiceImpl extends AbstractBatteryDataProcessor i log.info("临时解决上送数据为浮点的问题"); String status = data.getWorkStatus(); int result = 5; - if (status != null && !status.trim().isEmpty() && status.contains("null")) { + if (status != null && !status.trim().isEmpty()) { // 1.0 -> 1, 2.0 -> 2 result = (int) Double.parseDouble(status.trim()); }