|
@@ -427,11 +427,11 @@ public class OnlineMonitorImpl implements OnlineMonitorService {
|
|
|
onlineDataDto.setSceneIds(monitorDataCollectDto.getSceneIds());
|
|
|
List<DeviceCountStatsDto> pres=statsDeviceQualified(onlineDataDto);
|
|
|
result.setPresQualifiedRate(pres.size()>0&&pres.get(0).getTotalCount()!=0&&pres.get(0).getParmQualified().size()>0?
|
|
|
- (double)pres.get(0).getParmQualified().get(0).getNormalCount()/pres.get(0).getTotalCount()*100:null);
|
|
|
+ (double)pres.get(0).getParmQualified().get(0).getNormalCount()/pres.get(0).getTotalCount()*100:100);
|
|
|
|
|
|
onlineDataDto.setSceneTypeName("水质");
|
|
|
List<DeviceCountStatsDto> water=statsDeviceQualified(onlineDataDto);
|
|
|
- result.setWaterQualifiedRate(water.size()>0&&water.get(0).getTotalCount()!=0?(double)water.get(0).getNormalCount()/water.get(0).getTotalCount()*100:null);
|
|
|
+ result.setWaterQualifiedRate(water.size()>0&&water.get(0).getTotalCount()!=0?(double)water.get(0).getNormalCount()/water.get(0).getTotalCount()*100:100);
|
|
|
|
|
|
return result;
|
|
|
}
|