Commit 748a98cd authored by xixinzhao's avatar xixinzhao

修改液位折线图

parent 0fce1fe6
...@@ -1943,8 +1943,10 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM ...@@ -1943,8 +1943,10 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
iotIndexInfoVo.setNumber(deviceName); iotIndexInfoVo.setNumber(deviceName);
if (equipmentSpecificIndex.getIsTrend()) { if (equipmentSpecificIndex.getIsTrend()) {
if (!ObjectUtils.isEmpty(entry.getValue())){
BigDecimal val = new BigDecimal(String.valueOf(entry.getValue())); BigDecimal val = new BigDecimal(String.valueOf(entry.getValue()));
iotIndexInfoVo.setContent(equipmentSpecificIndex.getIndexName() + (val.setScale(2, BigDecimal.ROUND_HALF_UP)) + equipmentSpecificIndex.getIndexUnitName()); iotIndexInfoVo.setContent(equipmentSpecificIndex.getIndexName() + (val.setScale(2, BigDecimal.ROUND_HALF_UP)) + equipmentSpecificIndex.getIndexUnitName());
}
} else { } else {
if (pressurePumpStart.equals(equipmentSpecificIndex.getNameKey())) { if (pressurePumpStart.equals(equipmentSpecificIndex.getNameKey())) {
iotIndexInfoVo.setContent(TrueOrFalseEnum.real.value.equals(entry.getValue()) ? equipmentSpecificIndex.getEquipmentIndexName() : PressurePumpRelateEnum.STOP.getDesc()); iotIndexInfoVo.setContent(TrueOrFalseEnum.real.value.equals(entry.getValue()) ? equipmentSpecificIndex.getEquipmentIndexName() : PressurePumpRelateEnum.STOP.getDesc());
...@@ -2579,9 +2581,12 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM ...@@ -2579,9 +2581,12 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
stringIntegerHashMapIn.get(dateX).add(new BigDecimal(mapList.get(key))); stringIntegerHashMapIn.get(dateX).add(new BigDecimal(mapList.get(key)));
} else { } else {
List<BigDecimal> bigDecimals = new ArrayList<>(); List<BigDecimal> bigDecimals = new ArrayList<>();
if (!ObjectUtils.isEmpty(mapList.get(key))) {
bigDecimals.add(new BigDecimal(mapList.get(key))); bigDecimals.add(new BigDecimal(mapList.get(key)));
stringIntegerHashMapIn.put(dateX, bigDecimals); stringIntegerHashMapIn.put(dateX, bigDecimals);
} }
}
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment