Commit 4ceb83e7 authored by tangwei's avatar tangwei

修改监盘发电量接口

parent 46426f53
......@@ -481,8 +481,8 @@ public class JpStationController extends BaseController {
Map<String,Object> map=new HashMap<>();
DecimalFormat format2 = new DecimalFormat("0.00");
//炭
map.put("name1","实时功率");
map.put("name2","组件总容量");
map.put("name1","实时功率(kW)");
map.put("name2","组件总容量(MWp)");
map.put("value1",format2.format(jpStation.getRealTimePower()));
//硫
......@@ -490,31 +490,31 @@ public class JpStationController extends BaseController {
Map<String,Object> map2=new HashMap<>();
map2.put("name1","当日电量");
map2.put("name2","当日收益");
map2.put("name1","当日电量(kWh)");
map2.put("name2","当日收益(元)");
//炭
map2.put("value1",format2.format(jpStation.getDayGenerate()));
//硫
map2.put("value2",format2.format(jpStation.getDayIncome()));
Map<String,Object> map3=new HashMap<>();
map3.put("name1","当月电量");
map3.put("name2","当月收益");
map3.put("name1","当月电量(MWh)");
map3.put("name2","当月收益(万元)");
//炭
map3.put("value1",format2.format(jpStation.getMonthGenerate()));
//硫
map3.put("value2",format2.format(jpStation.getMonthIncome()));
Map<String,Object> map4=new HashMap<>();
map4.put("name1","累计电量");
map4.put("name2","累计收益");
map4.put("name1","累计电量(MWh)");
map4.put("name2","累计收益(万元)");
//炭
map4.put("value1",format2.format(jpStation.getYearGenerate()));
//硫
map4.put("value2",format2.format(jpStation.getYearIncome()));
date.add(map);
date.add(map4);
date.add(map2);
date.add(map3);
date.add(map4);
Page<Map<String,Object>> page = new Page<>(1, 4);
page.setRecords(date);
return ResponseHelper.buildResponse(page);
......
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