|
@@ -543,9 +543,11 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
|
|
|
|
|
|
if ("1".equals(type)) {
|
|
|
jsonObject.put("value", jsonArray.getJSONObject(i).get("waterValue"));
|
|
|
+
|
|
|
} else {
|
|
|
jsonObject.put("value", jsonArray.getJSONObject(i).get("electricityValue"));
|
|
|
}
|
|
|
+ jsonObject.put("originalValue", jsonArray.getJSONObject(i).get("originalValue"));
|
|
|
array.add(jsonObject);
|
|
|
}
|
|
|
return new Result(ResultCode.SUCCESS,array);
|