修改液位折线图

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

@@ -1943,8 +1943,10 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
 
                             iotIndexInfoVo.setNumber(deviceName);
                             if (equipmentSpecificIndex.getIsTrend()) {
-                                BigDecimal val = new BigDecimal(String.valueOf(entry.getValue()));
-                                iotIndexInfoVo.setContent(equipmentSpecificIndex.getIndexName() + (val.setScale(2, BigDecimal.ROUND_HALF_UP)) + equipmentSpecificIndex.getIndexUnitName());
+                                if (!ObjectUtils.isEmpty(entry.getValue())){
+                                    BigDecimal val = new BigDecimal(String.valueOf(entry.getValue()));
+                                    iotIndexInfoVo.setContent(equipmentSpecificIndex.getIndexName() + (val.setScale(2, BigDecimal.ROUND_HALF_UP)) + equipmentSpecificIndex.getIndexUnitName());
+                                }
                             } else {
                                 if (pressurePumpStart.equals(equipmentSpecificIndex.getNameKey())) {
                                     iotIndexInfoVo.setContent(TrueOrFalseEnum.real.value.equals(entry.getValue()) ? equipmentSpecificIndex.getEquipmentIndexName() : PressurePumpRelateEnum.STOP.getDesc());
@@ -2579,8 +2581,11 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
                                     stringIntegerHashMapIn.get(dateX).add(new BigDecimal(mapList.get(key)));
                                 } else {
                                     List<BigDecimal> bigDecimals = new ArrayList<>();
-                                    bigDecimals.add(new BigDecimal(mapList.get(key)));
-                                    stringIntegerHashMapIn.put(dateX, bigDecimals);
+                                   if (!ObjectUtils.isEmpty(mapList.get(key))) {
+                                       bigDecimals.add(new BigDecimal(mapList.get(key)));
+                                       stringIntegerHashMapIn.put(dateX, bigDecimals);
+                                   }
+
                                 }
                             }
                         }