diff --git a/user-service/src/main/java/com/mh/user/strategy/WtMeterStrategy.java b/user-service/src/main/java/com/mh/user/strategy/WtMeterStrategy.java index e264bbd..7722232 100644 --- a/user-service/src/main/java/com/mh/user/strategy/WtMeterStrategy.java +++ b/user-service/src/main/java/com/mh/user/strategy/WtMeterStrategy.java @@ -141,12 +141,12 @@ public class WtMeterStrategy implements DeviceStrategy { public String analysisMQTTReceiveData(String dateStr, String registerAddr, String dataStr, String operateType, DeviceInstallEntity deviceInstallEntity, CollectionParamsManageEntity collectionParamsManageEntity) { String data = Constant.FAIL; - if (new BigDecimal(dataStr).compareTo(BigDecimal.ZERO) < 0) { + if (new BigDecimal(dataStr).compareTo(BigDecimal.ZERO) <= 0) { return data; } - log.info("水表表号: " + deviceInstallEntity.getDeviceAddr() + ",水表读数:" + dataStr); + log.info("水表表号: " + deviceInstallEntity.getDeviceAddr() + "水表上一个值:"+ deviceInstallEntity.getLastValue() +",水表现在读数:" + dataStr); // 考虑dataStr是否走大数或者走小数 - if (Double.parseDouble(dataStr)-deviceInstallEntity.getLastValue()>100 || Double.parseDouble(dataStr)-deviceInstallEntity.getLastValue()<0) { + if (Double.parseDouble(dataStr)-deviceInstallEntity.getLastValue()>10000 || Double.parseDouble(dataStr)-deviceInstallEntity.getLastValue()<0) { dataStr = String.valueOf(deviceInstallEntity.getLastValue()); } try {