Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

1.解决超高压数据bug

Browse Source
This commit is contained in:
wr
2023-09-04 09:03:19 +08:00
parent ad9b6cd0f7
commit 217afe5e01
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineIntegrityDataServiceImpl.java
View File

@@ -202,11 +202,13 @@ public class LineIntegrityDataServiceImpl extends ServiceImpl<LineIntegrityDataM
outParam.setType(generalDeviceDTO.getName() + "\n(" + generalDeviceDTO.getLineIndexes().size() + ")"); outParam.setType(generalDeviceDTO.getName() + "\n(" + generalDeviceDTO.getLineIndexes().size() + ")");
//根据监测点查询数据完整性 //根据监测点查询数据完整性
List<PublicDTO> integrityData = getCondition(lineIndexes, integrityIconParam.getSearchBeginTime(), integrityIconParam.getSearchEndTime()); List<PublicDTO> integrityData = getCondition(lineIndexes, integrityIconParam.getSearchBeginTime(), integrityIconParam.getSearchEndTime());
outParam.setSingle(NumberUtil.round(integrityData.stream().mapToDouble(PublicDTO::getData).average().orElse(3.14159), 2).doubleValue()); double v = integrityData.stream().mapToDouble(PublicDTO::getData).average().orElse(3.14159);
outParam.setSingle(v!=3.14159?NumberUtil.round(v,2).doubleValue():v);
//如果存在需要比较的时间，再获取对应数据 //如果存在需要比较的时间，再获取对应数据
if (StrUtil.isNotBlank(integrityIconParam.getPeriodBeginTime()) && StrUtil.isNotBlank(integrityIconParam.getPeriodEndTime())) { if (StrUtil.isNotBlank(integrityIconParam.getPeriodBeginTime()) && StrUtil.isNotBlank(integrityIconParam.getPeriodEndTime())) {
List<PublicDTO> compareData = getCondition(lineIndexes, integrityIconParam.getPeriodBeginTime(), integrityIconParam.getPeriodEndTime()); List<PublicDTO> compareData = getCondition(lineIndexes, integrityIconParam.getPeriodBeginTime(), integrityIconParam.getPeriodEndTime());
outParam.setRatio(NumberUtil.round(compareData.stream().mapToDouble(PublicDTO::getData).average().orElse(3.14159), 2).doubleValue()); double v1 = compareData.stream().mapToDouble(PublicDTO::getData).average().orElse(3.14159);
outParam.setRatio(v1!=3.14159?NumberUtil.round(v1,2).doubleValue():v1);
} }
out.add(outParam); out.add(outParam);
} }