by2025/SmartParks
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks

Browse Source
This commit is contained in:
lxj
2025-09-15 20:55:10 +08:00
parent 65900c1068 083cbf6149
commit 9b16456e97
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/smartDevicesImpl/TbMeterRecordServiceImpl.java
View File

@@ -263,7 +263,7 @@ public class TbMeterRecordServiceImpl implements ITbMeterRecordService {
boolean isDaytime = hour > 8 && hour <= 20; boolean isDaytime = hour > 8 && hour <= 20;
BigDecimal threshold = isDaytime ? info.getDayWarning() : info.getNightWarning(); BigDecimal threshold = isDaytime ? info.getDayWarning() : info.getNightWarning();
// 如果阈值为0，则不处理（阈值不为0且读数大于阈值，自动上报） // 如果阈值为0，则不处理（阈值不为0且读数大于阈值，自动上报）
if (threshold.compareTo(BigDecimal.ZERO) != 0 && record.getCurrentReading().compareTo(threshold) > 0) { if (threshold.compareTo(BigDecimal.ZERO) != 0 && (record.getCurrentReading().subtract(record.getPreviousReading())).compareTo(threshold) > 0) {
// 根据仪表类型设置工单名称和类型 // 根据仪表类型设置工单名称和类型
String orderName = "能耗异常"; String orderName = "能耗异常";
Long orderType = 0L; Long orderType = 0L;