浏览代码

将规则详情信息中的属性编码字段在与上报数据进行对比或与时序数据库查询的数据进行对比时统一改为小写

james 1 周之前
父节点
当前提交
8f43878f93

+ 2 - 2
service-rule/service-rule-biz/src/main/java/com/usky/rule/subscribe/TriggerDeviceUtil.java

@@ -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));