修改设备指标单位获取数据源

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/MqttReceiveServiceImpl.java

@@ -609,7 +609,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
         BigDecimal minValue = getBigDecimal(map.get("minValues"));
         BigDecimal maxValue = getBigDecimal(map.get("maxValues"));
         BigDecimal nowValue = getBigDecimal(iotDataVO.getValue());
-        BigDecimal checkValue = checkUnit(iotDataVO.getKey().toLowerCase(), nowValue);
+        BigDecimal checkValue = checkUnit(equipmentSpecificIndex.getEquipmentSpecificId(),iotDataVO.getKey().toLowerCase() , nowValue);
         if (!ObjectUtils.isEmpty(checkValue)){
             nowValue =checkValue;
         }
@@ -682,7 +682,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
                 }
                 nowValue = add.divide(new BigDecimal(i), 2, RoundingMode.HALF_UP);
             }
-            BigDecimal checkValue = checkUnit(iotDataVO.getKey().toLowerCase(), nowValue);
+            BigDecimal checkValue = checkUnit(equipmentSpecificIndex.getEquipmentSpecificId(),iotDataVO.getKey().toLowerCase() , nowValue);
             if (!ObjectUtils.isEmpty(checkValue)){
                 nowValue =checkValue;
             }
@@ -724,14 +724,16 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
         return alarmFlag;
     }
 
-    private BigDecimal checkUnit(String indexKey, BigDecimal nowValue){
-        LambdaQueryWrapper<EquipmentIndex> eq = new QueryWrapper<EquipmentIndex>().lambda().eq(EquipmentIndex::getPerfQuotaDefinitionId, indexKey);
-        EquipmentIndex one = equipmentIndexService.getOne(eq);
-        if (!ObjectUtils.isEmpty(one) || !ObjectUtils.isEmpty(one.getUnit())){
-            if (UnitEnum.MM.getKey().equalsIgnoreCase(one.getUnit()) || UnitEnum.MM.getName().equals(one.getUnit())){
+    private BigDecimal checkUnit(Long equipmentSpecificId, String indexKey,BigDecimal nowValue){
+        LambdaQueryWrapper<EquipmentSpecificIndex> lambda = new QueryWrapper<EquipmentSpecificIndex>().lambda();
+        lambda.eq(EquipmentSpecificIndex :: getEquipmentSpecificId, equipmentSpecificId);
+        lambda.eq(EquipmentSpecificIndex :: getEquipmentIndexKey, indexKey);
+        EquipmentSpecificIndex equipmentSpecificIndex = equipmentSpecificIndexMapper.selectOne(lambda);
+        if (!ObjectUtils.isEmpty(equipmentSpecificIndex) || !ObjectUtils.isEmpty(equipmentSpecificIndex.getUnit())){
+            if (UnitEnum.MM.getKey().equalsIgnoreCase(equipmentSpecificIndex.getUnit()) || UnitEnum.MM.getName().equals(equipmentSpecificIndex.getUnit())){
                 BigDecimal divide = new BigDecimal(1000);
                 nowValue = nowValue.divide(divide,2,BigDecimal.ROUND_HALF_UP);
-            }else if (UnitEnum.CM.getKey().equalsIgnoreCase(one.getUnit()) || UnitEnum.CM.getName().equals(one.getUnit())){
+            }else if (UnitEnum.CM.getKey().equalsIgnoreCase(equipmentSpecificIndex.getUnit()) || UnitEnum.CM.getName().equals(equipmentSpecificIndex.getUnit())){
                 BigDecimal divide = new BigDecimal(100);
                 nowValue = nowValue.divide(divide,2,BigDecimal.ROUND_HALF_UP);
             }