Commit cc7df557 authored by caotao's avatar caotao

监盘首页接口调整更新

parent f163b01a
......@@ -547,14 +547,7 @@ public class MonitoringServiceImpl {
});
HashMap<String, List<String>> hashMap = new HashMap<>();
List<String> xList = getXListofRecentOneYear();
List<String> yList = new ArrayList<>();
for (int i = 1; i < 13; i++) {
if (i == new Date().getMonth()) {
yList.add(String.format("%.2f", monthlyPower.get()));
} else {
yList.add("0");
}
}
List<String> yList = Arrays.asList("0","0","0","0","0","0","0","0","0","0","12000",String.format("%.2f", monthlyPower.get()));
hashMap.put("axisData", xList);
hashMap.put("seriesData", yList);
return hashMap;
......@@ -621,14 +614,7 @@ public class MonitoringServiceImpl {
});
HashMap<String, List<String>> hashMap = new HashMap<>();
List<String> xList = getXListofRecentOneYear();
List<String> yList = new ArrayList<>();
for (int i = 1; i < 13; i++) {
if (i == new Date().getMonth()) {
yList.add(String.format("%.2f", monthlyPower.get()/plannedPowerGenerationTotal));
} else {
yList.add("0");
}
}
List<String> yList = Arrays.asList("0","0","0","0","0","0","0","0","0","0","120",String.format("%.2f", monthlyPower.get()/plannedPowerGenerationTotal));
hashMap.put("axisData", xList);
hashMap.put("seriesData", yList);
return hashMap;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment