性能等级评估代码提交

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/controller/ProEconEquipmentInfoDayTopController.java

@@ -1,6 +1,7 @@
 package com.gyee.runeconomy.controller;
 
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.gyee.runeconomy.dto.R;
 import com.gyee.runeconomy.dto.ResultMsg;
 import com.gyee.runeconomy.model.auto.ProEconEquipmentInfoDayTop;
@@ -10,7 +11,6 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
-
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -54,7 +54,7 @@ public class ProEconEquipmentInfoDayTopController {
             @RequestParam(value = "pageNum", required = true) Integer pageNum,
             @RequestParam(value = "pageSize", required = true) Integer pageSize){
 
-        List<ProEconEquipmentInfoDayTop> list = proEconEquipmentInfoDayTopService.getEquipmentInfoDayTopList(companyId, windpowerstationId, types, staType,date,pageNum,pageSize);
+        IPage<ProEconEquipmentInfoDayTop> list = proEconEquipmentInfoDayTopService.getEquipmentInfoDayTopList(companyId, windpowerstationId, types, staType,date,pageNum,pageSize);
         if (null != list) {
             return R.data(ResultMsg.ok(list));
         } else {

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/auto/IProEconEquipmentInfoDayTopService.java

@@ -1,7 +1,8 @@
 package com.gyee.runeconomy.service.auto;
 
-import com.gyee.runeconomy.model.auto.ProEconEquipmentInfoDayTop;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.gyee.runeconomy.model.auto.ProEconEquipmentInfoDayTop;
 
 import java.util.List;
 import java.util.Map;
@@ -18,7 +19,7 @@ public interface IProEconEquipmentInfoDayTopService extends IService<ProEconEqui
 
 
     /** 管理列表*/
-    List<ProEconEquipmentInfoDayTop> getEquipmentInfoDayTopList(String companyId, String windpowerstationId, Integer types, String staType,String date,Integer pageNum,Integer pageSize);
+    IPage<ProEconEquipmentInfoDayTop> getEquipmentInfoDayTopList(String companyId, String windpowerstationId, Integer types, String staType, String date, Integer pageNum, Integer pageSize);
 
 
     /** 历史数据 */

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/auto/impl/ProEconEquipmentInfoDayTopServiceImpl.java

@@ -41,7 +41,7 @@ public class ProEconEquipmentInfoDayTopServiceImpl extends ServiceImpl<ProEconEq
     @Resource
     private ProEconEquipmentInfoDayTopMapper proEconEquipmentInfoDayTopMapper;
     @Override
-    public List<ProEconEquipmentInfoDayTop> getEquipmentInfoDayTopList(String companyId, String windpowerstationId, Integer types, String staType,String date,Integer pageNum,Integer pageSize) {
+    public IPage<ProEconEquipmentInfoDayTop> getEquipmentInfoDayTopList(String companyId, String windpowerstationId, Integer types, String staType,String date,Integer pageNum,Integer pageSize) {
 
         QueryWrapper<ProEconEquipmentInfoDayTop> qw = new QueryWrapper<>();
         Page<ProEconEquipmentInfoDayTop> page = new Page<>(pageNum, pageSize);
@@ -115,10 +115,10 @@ public class ProEconEquipmentInfoDayTopServiceImpl extends ServiceImpl<ProEconEq
         List<ProEconEquipmentInfoDayTop> list = resultPage.getRecords();
 
 //        List<ProEconEquipmentInfoDayTop> list = baseMapper.selectList(qw);
-        list.stream().forEach(i->{
+        resultPage.getRecords().stream().forEach(i->{
             i.setNemCode(CacheContext.wtmap.get(i.getWindturbineId()).getAname());
         });
-        return list;
+        return resultPage;
     }
 
     @Override