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 22dfc7d..e5ceb12 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 @@ -10,6 +10,7 @@ import com.fastbee.common.model.vo.iot.DeviceDetailVo; import com.fastbee.common.model.vo.iot.QueryLogVo; import com.fastbee.common.utils.DateUtils; import com.fastbee.common.utils.DevParamsUtils; +import com.fastbee.common.utils.NumberUtils; import com.fastbee.common.utils.StringUtils; import com.fastbee.data.domain.vo.AnfangInfoVo; import com.fastbee.data.service.devicedetail.IDeviceDetailService; @@ -377,16 +378,16 @@ public class DeviceDetailServiceImpl implements IDeviceDetailService { put("name", haiWeiPropertyVo.getNameCn()); }}; if(haiWeiPropertyVo.getNameEn().equals("三菱FX2N_1_guanxian")){ - 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_FlowDown")){ - 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_mCon")){ - 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); }