|
|
@@ -166,7 +166,7 @@ public class TriggerDeviceUtil {
|
|
|
if (valueMap.get(identifier) == null) {
|
|
|
booleanExpression.append(false);
|
|
|
} else {
|
|
|
- BigDecimal value = new BigDecimal((String)valueMap.get(identifier));
|
|
|
+ BigDecimal value = new BigDecimal((String)valueMap.get(identifier.toLowerCase()));
|
|
|
Expression expression = cond.getExpression();
|
|
|
BigDecimal x = new BigDecimal(expression.getX());
|
|
|
BigDecimal y = null;
|
|
|
@@ -320,7 +320,7 @@ public class TriggerDeviceUtil {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- String deviceIdentifier = identifierCondition.getIdentifier();
|
|
|
+ String deviceIdentifier = identifierCondition.getIdentifier().toLowerCase();
|
|
|
//BigDecimal currValue = this.getCurrDeviceIdentifierValue(deviceId, deviceIdentifier);
|
|
|
LastInnerQueryVO lastInnerQueryVO = new LastInnerQueryVO();
|
|
|
lastInnerQueryVO.setDeviceuuid(Collections.singletonList(deviceUuid));
|