From 47a63dcdcd1889bd806208dc79937cd8112b8e38 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 19 十一月 2024 16:41:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
index dcabfe6..c5a47a3 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
@@ -401,11 +401,11 @@
List<EnergyDataVO> loadCurveList = new ArrayList<>();
try {
BaseResponse<List<EnergyTodayLoadDataResponse>> response = HKService.energyTodayLoadData();
- if(response == null || !StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE) || response.getData()==null ){
+ if(response != null && StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE) && response.getData()!=null ){
for (EnergyTodayLoadDataResponse model :response.getData()) {
EnergyDataVO data = new EnergyDataVO();
data.setTimeData(model.getName());
- data.setEnergy(new BigDecimal(model.getName()));
+ data.setEnergy(new BigDecimal(StringUtils.defaultString(model.getValue(),"0")));
loadCurveList.add(data);
}
}
@@ -473,7 +473,7 @@
Date month0 = DateUtil.getDateFromString(firstDate);
Date month1 = DateUtil.increaseMonth(month0,-1);//涓婃湀
Date month2 = DateUtil.increaseMonth(month0,-2);//涓婁笂鏈�
- Date month3 = DateUtil.increaseMonth(month0,-12);//鍘诲勾鍚屾湀
+ Date month3 = DateUtil.increaseMonth(month0,-13);//鍘诲勾鍚屾湀
List<PlatformWaterGas> list = platformWaterGasMapper.selectList(new QueryWrapper<PlatformWaterGas>()
.lambda()
@@ -494,10 +494,10 @@
data.getGasQuantity().setTotal(Constants.formatBigdecimal(model.getNum())+"");
}
if(model.getTimeInfo().getTime() == month2.getTime()){
- data.getGasQuantity().setSameNum(Constants.formatBigdecimal(model.getNum()) );
+ data.getGasQuantity().setRingNum(Constants.formatBigdecimal(model.getNum()) );
}
if(model.getTimeInfo().getTime() == month3.getTime()){
- data.getGasQuantity().setRingNum(Constants.formatBigdecimal(model.getNum()) );
+ data.getGasQuantity().setSameNum(Constants.formatBigdecimal(model.getNum()) );
}
}else if(Constants.equalsInteger(model.getType(),Constants.ZERO)){
@@ -509,10 +509,10 @@
data.getWaterQuantity().setTotal(Constants.formatBigdecimal(model.getNum())+"");
}
if(model.getTimeInfo().getTime() == month2.getTime()){
- data.getWaterQuantity().setSameNum(Constants.formatBigdecimal(model.getNum()) );
+ data.getWaterQuantity().setRingNum(Constants.formatBigdecimal(model.getNum()) );
}
if(model.getTimeInfo().getTime() == month3.getTime()){
- data.getWaterQuantity().setRingNum(Constants.formatBigdecimal(model.getNum()) );
+ data.getWaterQuantity().setSameNum(Constants.formatBigdecimal(model.getNum()) );
}
}
}
@@ -557,7 +557,7 @@
* @param data
*/
private void getLastMonthElectricityData(EnergyModelDataVO data) {
- BaseResponse<LastMonthFeeByMeterTypeResponse> response = HKService.lastMonthFeeByMeterType("1");
+ BaseResponse<LastMonthFeeByMeterTypeResponse> response = HKService.lastMonthFeeByMeterType("1");
if(response != null && StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE) && response.getData()!=null ){
data.setRingRate(StringUtils.defaultString(response.getData().getRingPercent(),"0"));
data.setSameRate(StringUtils.defaultString(response.getData().getSamePercent(),"0"));
--
Gitblit v1.9.3