photovoltaic/analysis分页

power-fitting-JN/src/main/java/com.gyee.power.fitting/controller/gf/PhotovoltaicAnalysisController.java

@@ -3,10 +3,10 @@ package com.gyee.power.fitting.controller.gf;
 import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gyee.power.fitting.common.result.JsonResult;
 import com.gyee.power.fitting.common.result.ResultCode;
 import com.gyee.power.fitting.model.PhotovoltaicAnalysis;
-import com.gyee.power.fitting.model.ProBasicEquipment;
 import com.gyee.power.fitting.service.IPhotovoltaicAnalysisService;
 import com.gyee.power.fitting.service.ProBasicEquipmentService;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -16,7 +16,6 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import java.util.Date;
-import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
@@ -41,7 +40,9 @@ public class PhotovoltaicAnalysisController {
     public JSONObject photovoltaicAnalysis(
             @RequestParam("stationId") String stationId,
             @RequestParam("time") String time,
-            @RequestParam("timeType") String timeType) {
+            @RequestParam("timeType") String timeType,
+            @RequestParam("pageNum") int pageNum,
+            @RequestParam("pageSize") int pageSize) {
 
         Date date, startDate, endDate;
         if ("year".equals(timeType)) {
@@ -63,10 +64,12 @@ public class PhotovoltaicAnalysisController {
                         " conversion_efficiency,sum(equivalent_generating_time) equivalent_generating_time," +
                         "avg(device_availability) device_availability").between("data_date", startDate, endDate)
                 .groupBy("station_id,equipment_id").orderByAsc("equipment_id");
-        List<PhotovoltaicAnalysis> list = photovoltaicAnalysisService.list(wrapper);
+        Page<PhotovoltaicAnalysis> page = new Page<>(pageNum, pageSize);
+        Page<PhotovoltaicAnalysis> list = photovoltaicAnalysisService.page(page, wrapper);
 
         Map<String, String> collect = proBasicEquipmentService.getStationMap("IN");
-        list = list.stream().peek(pa -> pa.setEquipmentId(collect.get(pa.getEquipmentId()))).collect(Collectors.toList());
+
+        list.setRecords(list.getRecords().stream().peek(pa -> pa.setEquipmentId(collect.get(pa.getEquipmentId()))).collect(Collectors.toList()));
         return JsonResult.successData(ResultCode.SUCCESS, list);
     }
 }