xzzn/emsback
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

综合查询优化

Browse Source
This commit is contained in:
mashili
2025-10-21 12:39:14 +08:00
parent 4ad2cafc5d
commit a338c921d3
1 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
ems-system/src/main/java/com/xzzn/ems/service/impl/GeneralQueryServiceImpl.java
View File

@ -271,7 +271,7 @@ public class GeneralQueryServiceImpl implements IGeneralQueryService
private Stats clacStats(List<GeneralQueryDataVo> deviceDataList) {
// 提取有效数值（过滤null）
List<BigDecimal> values = deviceDataList.stream()
.map(vo -> (BigDecimal) vo.getPointValue())
.map(vo -> convertToBigDecimal(vo.getPointValue()))
.filter(value -> value != null) // 过滤null值
.collect(Collectors.toList());
if (values.isEmpty()) {
@ -290,6 +290,27 @@ public class GeneralQueryServiceImpl implements IGeneralQueryService
return new Stats(maxValue,minValue,avgValue,diff);
}
private BigDecimal convertToBigDecimal(Object pointValue) {
if (pointValue == null) {
return null;
}
// 根据实际存储的数值类型，依次判断并转换
if (pointValue instanceof BigDecimal) {
return (BigDecimal) pointValue;
} else if (pointValue instanceof Integer) {
return new BigDecimal ((Integer) pointValue);
} else if (pointValue instanceof Long) {
return new BigDecimal ((Long) pointValue);
} else if (pointValue instanceof Double) {
return BigDecimal.valueOf ((Double) pointValue); // 避免 Double 精度丢失
} else if (pointValue instanceof Float) {
return BigDecimal.valueOf ((Float) pointValue);
} else {
// 非数值类型（如 String），可根据业务需求处理（此处返回 null）
return null;
}
}
private void dealDataTime(PointNameRequest request) {
String startDate = request.getStartDate();
String endDate = request.getEndDate();
@ -354,7 +375,7 @@ public class GeneralQueryServiceImpl implements IGeneralQueryService
data.setValueDate(minute);
data.setSiteId(siteId);
data.setDeviceId(deviceId);
data.setPointValue(lastValue==null? 0 : lastValue); // 用上一分钟值填充
data.setPointValue(lastValue==null? BigDecimal.ZERO : lastValue); // 用上一分钟值填充
} else {
lastValue = data.getPointValue(); // 更新最新值
}