Commit 405e450b authored by caotao's avatar caotao

1.大屏监盘全国、区域发电量top5接口调整。

parent cd839ea4
...@@ -6,4 +6,5 @@ import lombok.Data; ...@@ -6,4 +6,5 @@ import lombok.Data;
public class BudunStationValueDto { public class BudunStationValueDto {
private String station_name; private String station_name;
private Double value; private Double value;
private Double genValue;
} }
...@@ -364,14 +364,14 @@ public class MonitorServiceImpl implements MonitorService { ...@@ -364,14 +364,14 @@ public class MonitorServiceImpl implements MonitorService {
fanList.stream().forEach(fan ->{ fanList.stream().forEach(fan ->{
Map<String, Object> dayMap = new HashMap<>(); Map<String, Object> dayMap = new HashMap<>();
dayMap.put("name", fan.getStation_name()); dayMap.put("name", fan.getStation_name());
dayMap.put("value",fan.getValue()); dayMap.put("value",fan.getGenValue());
dayDataFan.add(dayMap); dayDataFan.add(dayMap);
}); });
pvList.stream().forEach(pv ->{ pvList.stream().forEach(pv ->{
Map<String, Object> dayMap = new HashMap<>(); Map<String, Object> dayMap = new HashMap<>();
dayMap.put("name", pv.getStation_name()); dayMap.put("name", pv.getStation_name());
dayMap.put("value",pv.getValue()); dayMap.put("value",pv.getGenValue());
dayDataPV.add(dayMap); dayDataPV.add(dayMap);
}); });
Page<Map<String, Object>> socialContributionDtoPage = new Page<Map<String, Object>>(); Page<Map<String, Object>> socialContributionDtoPage = new Page<Map<String, Object>>();
......
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