diff --git a/fastbee-open-api/src/main/java/com/fastbee/data/service/devicedetail/impl/DeviceDetailServiceImpl.java b/fastbee-open-api/src/main/java/com/fastbee/data/service/devicedetail/impl/DeviceDetailServiceImpl.java index e5ceb12..b308000 100644 --- a/fastbee-open-api/src/main/java/com/fastbee/data/service/devicedetail/impl/DeviceDetailServiceImpl.java +++ b/fastbee-open-api/src/main/java/com/fastbee/data/service/devicedetail/impl/DeviceDetailServiceImpl.java @@ -266,12 +266,13 @@ public class DeviceDetailServiceImpl implements IDeviceDetailService { put("name", haiWeiPropertyVo.getNameCn()); }}; if(haiWeiPropertyVo.getNameEn().equals("三菱FX2N_1_MpptDown")){ - hashMap.put("value", Float.parseFloat(haiWeiPropertyVo.getValue().toString()) == 1f? - "异常":"正常"); + + hashMap.put("value", NumberUtils.isNumeric(haiWeiPropertyVo.getValue().toString())?( + Float.parseFloat(haiWeiPropertyVo.getValue().toString()) == 1f?"正常":"异常"):"正常"); } if(haiWeiPropertyVo.getNameEn().equals("三菱FX2N_1_市电状态")){ - hashMap.put("value", Float.parseFloat(haiWeiPropertyVo.getValue().toString()) == 1f? - "市电":"太阳能"); + hashMap.put("value", NumberUtils.isNumeric(haiWeiPropertyVo.getValue().toString())?( + Float.parseFloat(haiWeiPropertyVo.getValue().toString()) == 1f?"市电":"太阳能"):"市电"); } list.add(hashMap); }