From 3fe2aea7827eafc7513159db9a337fdf567584c8 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期一, 08 五月 2023 01:21:13 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-common/src/main/java/com/java110/common/smartMeter/SmartMeterCoreReadImpl.java | 31 ++++++++++++++++---------------
1 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/service-common/src/main/java/com/java110/common/smartMeter/SmartMeterCoreReadImpl.java b/service-common/src/main/java/com/java110/common/smartMeter/SmartMeterCoreReadImpl.java
index ab0a2ea..289cbfb 100644
--- a/service-common/src/main/java/com/java110/common/smartMeter/SmartMeterCoreReadImpl.java
+++ b/service-common/src/main/java/com/java110/common/smartMeter/SmartMeterCoreReadImpl.java
@@ -81,12 +81,27 @@
List<MeterMachineDto> meterMachineDtos = meterMachineV1InnerServiceSMOImpl.queryMeterMachines(meterMachineDto);
Assert.listOnlyOne(meterMachineDtos, "琛ㄤ笉瀛樺湪");
+ String preDegrees = "0";
+ String preReadingTime = DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A);
+
+ //璐圭敤鎶勮〃
+ MeterWaterDto meterWaterDto = new MeterWaterDto();
+ meterWaterDto.setObjType(MeterWaterDto.OBJ_TYPE_ROOM);
+ meterWaterDto.setObjId(meterMachineDtos.get(0).getRoomId());
+ meterWaterDto.setCommunityId(meterMachineDtos.get(0).getCommunityId());
+ meterWaterDto.setMeterType(meterMachineDtos.get(0).getMeterType());
+ List<MeterWaterDto> meterWaterDtos = meterWaterInnerServiceSMOImpl.queryMeterWaters(meterWaterDto);
+
+ if (meterWaterDtos != null && meterWaterDtos.size() > 0) {
+ preDegrees = meterWaterDtos.get(0).getCurDegrees();
+ preReadingTime = meterWaterDtos.get(0).getCurReadingTime();
+ }
MeterMachineDetailPo meterMachineDetailPo = new MeterMachineDetailPo();
meterMachineDetailPo.setDetailId(meterMachineDetailDto.getDetailId());
meterMachineDetailPo.setCurDegrees(degree);
meterMachineDetailPo.setState(MeterMachineDetailDto.STATE_C);
- meterMachineDetailPo.setPrestoreDegrees(degree);
+ meterMachineDetailPo.setPrestoreDegrees(preDegrees);
meterMachineDetailPo.setCurReadingTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
meterMachineDetailV1InnerServiceSMOImpl.updateMeterMachineDetail(meterMachineDetailPo);
@@ -102,21 +117,7 @@
return;
}
- String preDegrees = "0";
- String preReadingTime = DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A);
- //璐圭敤鎶勮〃
- MeterWaterDto meterWaterDto = new MeterWaterDto();
- meterWaterDto.setObjType(MeterWaterDto.OBJ_TYPE_ROOM);
- meterWaterDto.setObjId(meterMachineDtos.get(0).getRoomId());
- meterWaterDto.setCommunityId(meterMachineDtos.get(0).getCommunityId());
- meterMachinePo.setMeterType(meterMachineDtos.get(0).getMeterType());
- List<MeterWaterDto> meterWaterDtos = meterWaterInnerServiceSMOImpl.queryMeterWaters(meterWaterDto);
-
- if (meterWaterDtos != null && meterWaterDtos.size() > 0) {
- preDegrees = meterWaterDtos.get(0).getPreDegrees();
- preReadingTime = meterWaterDtos.get(0).getCurReadingTime();
- }
CommunityMemberDto communityMemberDto = new CommunityMemberDto();
communityMemberDto.setCommunityId(meterMachineDtos.get(0).getCommunityId());
--
Gitblit v1.8.0