diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java index 58b94a9..53bb6bd 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java @@ -211,7 +211,7 @@ deviceData = this.baseMapper.H2sData(devcode); if (ObjectUtil.isNotEmpty(deviceData)) { deviceDataDto.setTypeName("H2S浓度"); - deviceDataDto.setValue(deviceData.getData() + "%LEL"); + deviceDataDto.setValue(deviceData.getData() + "ppm"); deviceDataDto.setLogtime(sdf.format(deviceData.getLogtime())); deviceDataDtoList.add(deviceDataDto); } @@ -464,8 +464,8 @@ if (ObjectUtil.isNotEmpty(deviceData)) { watchDataDto.setWatchType("H2S浓度"); watchDataDto.setType("14"); - watchDataDto.setValue(deviceData.getData() + "%LEL"); - watchDataDto.setData(deviceData.getData() + "%LEL"); + watchDataDto.setValue(deviceData.getData() + "ppm"); + watchDataDto.setData(deviceData.getData() + "ppm"); watchDataDto.setLogtime(sdf.format(deviceData.getLogtime())); watchDataDtos.add(watchDataDto); } else {