1.电站总览页面接口调整。

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/JpStationController.java

@@ -412,7 +412,7 @@ public class JpStationController extends BaseController {
     @ApiOperation(httpMethod = "GET",value = "电站发电量统计",   notes = "电站发电量统计")
     @GetMapping(value = "/getCountJpStationdata")
     @UserLimits
-    public ResponseModel< List<JpStationDto>> getCountJpStationdata(JpStationDto reviewDto) {
+    public ResponseModel< Page<JpStationDto>> getCountJpStationdata(JpStationDto reviewDto) {
         JpStationDto jpStation= jpStationMapper.getCountJpStationdata(reviewDto);
         List<Map<String,Object>> powerRatio=new ArrayList<>();
         Map<String,Object> map=new HashMap<>();
@@ -421,7 +421,11 @@ public class JpStationController extends BaseController {
         jpStation.setPowerRatio(powerRatio);
         List<JpStationDto> list=new ArrayList<>();
         list.add(jpStation);
-        return ResponseHelper.buildResponse(list);
+        Page<JpStationDto> result = new Page<>();
+        result.setCurrent(1);
+        result.setTotal(1);
+        result.setRecords(list);
+        return ResponseHelper.buildResponse(result);
     }
 
    //电站分布
@@ -440,7 +444,9 @@ public class JpStationController extends BaseController {
     @ApiOperation(httpMethod = "GET",value = "节能减排",   notes = "节能减排")
     @GetMapping(value = "/getEnergyConservation")
     @UserLimits
-    public ResponseModel< Map<String,Object>> getEnergyConservation(JpStationDto reviewDto) {
+    public ResponseModel< Page<Map<String,Object>>> getEnergyConservation(JpStationDto reviewDto) {
+        Page<Map<String,Object>> result =new Page<>();
+        List<Map<String,Object>> itemList =new ArrayList<>();
         JpStationDto jpStation= jpStationMapper.getCountJpStationdata(reviewDto);
         Map<String,Object> map=new HashMap<>();
         DecimalFormat format2 = new DecimalFormat("#.00");
@@ -452,7 +458,11 @@ public class JpStationController extends BaseController {
         map.put("dust",format2.format(jpStation.getAccumulatedPower()*DUST));
         //煤
         map.put("coal",format2.format(jpStation.getAccumulatedPower()*COAL));
-        return ResponseHelper.buildResponse(map);
+        itemList.add(map);
+        result.setCurrent(1);
+        result.setTotal(1);
+        result.setRecords(itemList);
+        return ResponseHelper.buildResponse(result);
     }
 
 
@@ -519,8 +529,8 @@ public class JpStationController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "GET",value = "电站统计",   notes = "电站统计")
     @GetMapping(value = "/getcountJpStation")
-    public ResponseModel< Map<String,Object>> getcountJpStation(JpStationDto reviewDto) {
-
+    public ResponseModel<Page< Map<String,Object>>> getcountJpStation(JpStationDto reviewDto) {
+        List<Map<String,Object>> itemList =new ArrayList<>();
         Map<String,Object>  collector =new HashMap<>();
         collector.put("zx",0);
         collector.put("bj",0);
@@ -546,7 +556,12 @@ public class JpStationController extends BaseController {
         collector.put("tc",tc.get("num"));
         collector.put("jr",jr.get("num"));
         collector.put("zs",zs.get("num"));
-        return ResponseHelper.buildResponse(collector);
+        itemList.add(collector);
+        Page< Map<String,Object>> result =new Page<>();
+        result.setCurrent(1);
+        result.setTotal(1);
+        result.setRecords(itemList);
+        return ResponseHelper.buildResponse(result);
     }
 
     //日满发小时排行