From 266448b4c6380ceb4ef025c196114e32381b3bf0 Mon Sep 17 00:00:00 2001
From: liriming <1343021927@qq.com>
Date: 星期一, 12 五月 2025 13:13:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ansteel-biz/src/main/java/com/iailab/module/ansteel/power/service/impl/PowerMaxdemandMainServiceImpl.java | 11 ++---------
1 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/power/service/impl/PowerMaxdemandMainServiceImpl.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/power/service/impl/PowerMaxdemandMainServiceImpl.java
index 0120725..1da3661 100644
--- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/power/service/impl/PowerMaxdemandMainServiceImpl.java
+++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/power/service/impl/PowerMaxdemandMainServiceImpl.java
@@ -1,15 +1,11 @@
package com.iailab.module.ansteel.power.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.iailab.framework.common.constant.Constant;
import com.iailab.framework.common.pojo.PageResult;
-import com.iailab.module.ansteel.api.dto.PowerMaxDemandMainDTO;
import com.iailab.module.ansteel.api.vo.PowerMaxDemandMainPageReqVO;
import com.iailab.module.ansteel.power.dao.PowerMaxdemandMainDao;
import com.iailab.module.ansteel.power.entity.PowerMaxdemandMainEntity;
import com.iailab.module.ansteel.power.service.PowerMaxdemandMainService;
-import com.iailab.module.model.api.mcs.dto.StAlarmAndSuggestRespVO;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -18,8 +14,6 @@
import java.math.BigDecimal;
import java.util.*;
import java.util.stream.Collectors;
-
-import static org.bouncycastle.pqc.jcajce.provider.util.WrapUtil.getWrapper;
/**
* @author PanZhibao
@@ -34,9 +28,8 @@
private PowerMaxdemandMainDao powerMaxdemandMainDao;
@Override
- public PageResult<PowerMaxDemandMainDTO> page(PowerMaxDemandMainPageReqVO reqVO) {
- IPage<PowerMaxDemandMainDTO> page = powerMaxdemandMainDao.selectPage(reqVO);
- return new PageResult<>(page.getRecords(), page.getTotal());
+ public PageResult<PowerMaxdemandMainEntity> page(PowerMaxDemandMainPageReqVO reqVO) {
+ return powerMaxdemandMainDao.selectPage(reqVO);
}
@Override
--
Gitblit v1.9.3