|
@@ -402,6 +402,12 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
|
|
jsonObject.put("gas", energyGasDataVos);
|
|
jsonObject.put("gas", energyGasDataVos);
|
|
jsonObject.put("water", energyWaterDataVos);
|
|
jsonObject.put("water", energyWaterDataVos);
|
|
jsonObject.put("energyElectricity", energyElectricityDataVos);
|
|
jsonObject.put("energyElectricity", energyElectricityDataVos);
|
|
|
|
+ if (energyFeedDataVos.size() != 0) {
|
|
|
|
+ for (EnergyAllDataVo energyFeedDataVo : energyFeedDataVos) {
|
|
|
|
+ Double feed = Double.valueOf(energyFeedDataVo.getValue());
|
|
|
|
+ energyFeedDataVo.setValue(String.valueOf(feed/1000));
|
|
|
|
+ }
|
|
|
|
+ }
|
|
jsonObject.put("feed", energyFeedDataVos);
|
|
jsonObject.put("feed", energyFeedDataVos);
|
|
return new Result(ResultCode.SUCCESS, jsonObject);
|
|
return new Result(ResultCode.SUCCESS, jsonObject);
|
|
}
|
|
}
|