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

refactor(meterRecord): 修正电表读数为零时的处理逻辑

Browse Source
This commit is contained in:
zcxlsm
2025-09-11 16:17:45 +08:00
parent b93be50a7a
commit f671fd51b2
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -212,14 +212,6 @@ public class TbMeterRecordServiceImpl implements ITbMeterRecordService {
record.setCurrentReading(BigDecimal.ZERO); record.setCurrentReading(BigDecimal.ZERO);
} }
if (record.getCurrentReading().compareTo(BigDecimal.ZERO) == 0){
// 通信状态改为离线
TbMeterInfoBo bo = new TbMeterInfoBo();
bo.setId(info.getId());
bo.setCommunicationState(0L);
tbMeterInfoService.updateByBo(bo);
}
// 设置上次读数 // 设置上次读数
if (hasOldRecords) { if (hasOldRecords) {
TbMeterRecord oldRecord = oldRecordMap.get(info.getId()); TbMeterRecord oldRecord = oldRecordMap.get(info.getId());
@@ -229,6 +221,15 @@ public class TbMeterRecordServiceImpl implements ITbMeterRecordService {
record.setPreviousReading(record.getCurrentReading()); record.setPreviousReading(record.getCurrentReading());
} }
if (record.getCurrentReading().compareTo(BigDecimal.ZERO) == 0){
// 通信状态改为离线
TbMeterInfoBo bo = new TbMeterInfoBo();
bo.setId(info.getId());
bo.setCommunicationState(0L);
tbMeterInfoService.updateByBo(bo);
record.setCurrentReading(record.getPreviousReading());
}
record.setReadingMethod(MeterRecordTypeEnum.AUTO_RECORD.getCode()); record.setReadingMethod(MeterRecordTypeEnum.AUTO_RECORD.getCode());
recordNew.add(record); recordNew.add(record);
} }