diff --git a/mh-admin/src/main/java/com/mh/web/controller/report/ReportHeatingController.java b/mh-admin/src/main/java/com/mh/web/controller/report/ReportHeatingController.java index fafce32..33fa491 100644 --- a/mh-admin/src/main/java/com/mh/web/controller/report/ReportHeatingController.java +++ b/mh-admin/src/main/java/com/mh/web/controller/report/ReportHeatingController.java @@ -1,16 +1,20 @@ package com.mh.web.controller.report; import com.alibaba.excel.EasyExcel; +import com.github.pagehelper.PageHelper; import com.mh.common.core.controller.BaseController; import com.mh.common.core.domain.AjaxResult; import com.mh.common.core.domain.dto.ReportHeatingRunParamDTO; import com.mh.common.core.domain.dto.ReportSteamRunParamDTO; import com.mh.common.core.domain.entity.ReportHeatingRunParamHis; import com.mh.common.core.domain.entity.ReportSteamRunParamHis; +import com.mh.common.core.page.PageDomain; import com.mh.common.core.page.TableDataInfo; +import com.mh.common.core.page.TableSupport; import com.mh.common.utils.file.handle.ExcelFillCellMergeHandler; import com.mh.common.utils.file.handle.ReportSysParamHandler; import com.mh.common.utils.file.handle.RowHeightStyleHandler; +import com.mh.common.utils.sql.SqlUtil; import com.mh.system.service.report.IReportHeatingService; import com.mh.system.service.report.IReportSteamService; import jakarta.servlet.http.HttpServletResponse; @@ -44,7 +48,9 @@ public class ReportHeatingController extends BaseController { @PostMapping("/list") public TableDataInfo list(@RequestBody ReportHeatingRunParamHis reportHeatingRunParamHis) { - startPage(); + if (reportHeatingRunParamHis.getPageNum() != 0) { + PageHelper.startPage(reportHeatingRunParamHis.getPageNum(), reportHeatingRunParamHis.getPageSize()); + } List list = reportHeatingService.selectHeatingList(reportHeatingRunParamHis); return getDataTable(list); } diff --git a/mh-admin/src/main/java/com/mh/web/controller/report/ReportHotWaterController.java b/mh-admin/src/main/java/com/mh/web/controller/report/ReportHotWaterController.java index bb5cec9..90eba59 100644 --- a/mh-admin/src/main/java/com/mh/web/controller/report/ReportHotWaterController.java +++ b/mh-admin/src/main/java/com/mh/web/controller/report/ReportHotWaterController.java @@ -1,6 +1,7 @@ package com.mh.web.controller.report; import com.alibaba.excel.EasyExcel; +import com.github.pagehelper.PageHelper; import com.mh.common.core.controller.BaseController; import com.mh.common.core.domain.AjaxResult; import com.mh.common.core.domain.dto.BFloorReportHotWaterDTO; @@ -44,7 +45,9 @@ public class ReportHotWaterController extends BaseController { @PostMapping("/list") public TableDataInfo list(@RequestBody ReportHotWaterParamHis reportHotWaterParamHis) { - startPage(); + if (reportHotWaterParamHis.getPageNum() != 0) { + PageHelper.startPage(reportHotWaterParamHis.getPageNum(), reportHotWaterParamHis.getPageSize()); + } List list = reportHotWaterService.selectList(reportHotWaterParamHis); return getDataTable(list); } @@ -56,7 +59,7 @@ public class ReportHotWaterController extends BaseController { } @PostMapping("/export") - public void exportExcel(@RequestBody ReportHotWaterParamHis reportHotWaterParamHis, HttpServletResponse response) { + public void exportExcel(ReportHotWaterParamHis reportHotWaterParamHis, HttpServletResponse response) { // 文件名 try { String fileName = "热水热泵运行记录表.xlsx"; diff --git a/mh-admin/src/main/java/com/mh/web/controller/report/ReportMeterReadingsController.java b/mh-admin/src/main/java/com/mh/web/controller/report/ReportMeterReadingsController.java index ea800ac..33e99c7 100644 --- a/mh-admin/src/main/java/com/mh/web/controller/report/ReportMeterReadingsController.java +++ b/mh-admin/src/main/java/com/mh/web/controller/report/ReportMeterReadingsController.java @@ -46,14 +46,14 @@ public class ReportMeterReadingsController extends BaseController { } @PostMapping("/list") - public TableDataInfo list(@RequestBody ReportMeterReadingsHis todayTimestamp) + public TableDataInfo list(ReportMeterReadingsHis todayTimestamp) { List list = meterReadingsHisService.selectList(todayTimestamp); return getDataTable(list); } @PostMapping("/export") - public void exportExcel(@RequestBody ReportMeterReadingsHis reportMeterReadingsHis, HttpServletResponse response) { + public void exportExcel(ReportMeterReadingsHis reportMeterReadingsHis, HttpServletResponse response) { // 文件名 try { String fileName = "节能岛改造每日能耗统计表"+ DateUtils.dateToString(reportMeterReadingsHis.getTodayTimestamp(), "yyyyMMdd")+".xlsx"; diff --git a/mh-admin/src/main/java/com/mh/web/controller/report/ReportSteamController.java b/mh-admin/src/main/java/com/mh/web/controller/report/ReportSteamController.java index 4bcefd3..db6eea6 100644 --- a/mh-admin/src/main/java/com/mh/web/controller/report/ReportSteamController.java +++ b/mh-admin/src/main/java/com/mh/web/controller/report/ReportSteamController.java @@ -1,6 +1,7 @@ package com.mh.web.controller.report; import com.alibaba.excel.EasyExcel; +import com.github.pagehelper.PageHelper; import com.mh.common.core.controller.BaseController; import com.mh.common.core.domain.AjaxResult; import com.mh.common.core.domain.dto.ReportSteamRunParamDTO; @@ -41,7 +42,9 @@ public class ReportSteamController extends BaseController { @PostMapping("/list") public TableDataInfo list(@RequestBody ReportSteamRunParamHis reportSteamRunParamHis) { - startPage(); + if (reportSteamRunParamHis.getPageNum() != 0) { + PageHelper.startPage(reportSteamRunParamHis.getPageNum(), reportSteamRunParamHis.getPageSize()); + } List list = reportSteamService.selectList(reportSteamRunParamHis); return getDataTable(list); } @@ -52,7 +55,7 @@ public class ReportSteamController extends BaseController { } @PostMapping("/export") - public void exportExcel(@RequestBody ReportSteamRunParamHis reportSteamRunParamHis, HttpServletResponse response) { + public void exportExcel(ReportSteamRunParamHis reportSteamRunParamHis, HttpServletResponse response) { // 文件名 try { String fileName = "蒸汽机运行记录表.xlsx"; diff --git a/mh-admin/src/main/java/com/mh/web/controller/report/ReportSysController.java b/mh-admin/src/main/java/com/mh/web/controller/report/ReportSysController.java index 2307dc6..17ffcf8 100644 --- a/mh-admin/src/main/java/com/mh/web/controller/report/ReportSysController.java +++ b/mh-admin/src/main/java/com/mh/web/controller/report/ReportSysController.java @@ -1,6 +1,7 @@ package com.mh.web.controller.report; import com.alibaba.excel.EasyExcel; +import com.github.pagehelper.PageHelper; import com.mh.common.core.controller.BaseController; import com.mh.common.core.domain.AjaxResult; import com.mh.common.core.domain.dto.MaglevReportSysParamDTO; @@ -40,9 +41,11 @@ public class ReportSysController extends BaseController { } @PostMapping("/list") - public TableDataInfo list(@RequestBody ReportSysRunParamHis reportSysRunParamHis) + public TableDataInfo list(ReportSysRunParamHis reportSysRunParamHis) { - startPage(); + if (reportSysRunParamHis.getPageNum() != 0) { + PageHelper.startPage(reportSysRunParamHis.getPageNum(), reportSysRunParamHis.getPageSize()); + } List list = reportSysService.selectList(reportSysRunParamHis); return getDataTable(list); } @@ -54,7 +57,7 @@ public class ReportSysController extends BaseController { } @PostMapping("/export") - public void exportExcel(@RequestBody ReportSysRunParamHis reportSysRunParamHis, HttpServletResponse response) { + public void exportExcel(ReportSysRunParamHis reportSysRunParamHis, HttpServletResponse response) { // 文件名 try { String fileName = "系统参数运行日志报表.xlsx"; diff --git a/mh-common/src/main/java/com/mh/common/core/domain/entity/ReportHeatingRunParamHis.java b/mh-common/src/main/java/com/mh/common/core/domain/entity/ReportHeatingRunParamHis.java index 05b8fd8..ad4e0b4 100644 --- a/mh-common/src/main/java/com/mh/common/core/domain/entity/ReportHeatingRunParamHis.java +++ b/mh-common/src/main/java/com/mh/common/core/domain/entity/ReportHeatingRunParamHis.java @@ -170,6 +170,14 @@ public class ReportHeatingRunParamHis extends BaseEntity { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date updateTime; + /** 更新者 */ + @TableField(exist = false) + private int pageNum; + + /** 更新者 */ + @TableField(exist = false) + private int pageSize; + @Override public String toString() { return new StringJoiner(", ", ReportHeatingRunParamHis.class.getSimpleName() + "[", "]") diff --git a/mh-common/src/main/java/com/mh/common/core/domain/entity/ReportHotWaterParamHis.java b/mh-common/src/main/java/com/mh/common/core/domain/entity/ReportHotWaterParamHis.java index 497ba2c..2ae8d7a 100644 --- a/mh-common/src/main/java/com/mh/common/core/domain/entity/ReportHotWaterParamHis.java +++ b/mh-common/src/main/java/com/mh/common/core/domain/entity/ReportHotWaterParamHis.java @@ -167,6 +167,14 @@ public class ReportHotWaterParamHis extends BaseEntity implements Serializable { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date updateTime; + /** 更新者 */ + @TableField(exist = false) + private int pageNum; + + /** 更新者 */ + @TableField(exist = false) + private int pageSize; + // 无参构造 public ReportHotWaterParamHis() { } diff --git a/mh-common/src/main/java/com/mh/common/core/domain/entity/ReportSteamRunParamHis.java b/mh-common/src/main/java/com/mh/common/core/domain/entity/ReportSteamRunParamHis.java index e1c4de4..23cba2b 100644 --- a/mh-common/src/main/java/com/mh/common/core/domain/entity/ReportSteamRunParamHis.java +++ b/mh-common/src/main/java/com/mh/common/core/domain/entity/ReportSteamRunParamHis.java @@ -129,6 +129,14 @@ public class ReportSteamRunParamHis extends BaseEntity implements Serializable { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date updateTime; + /** 更新者 */ + @TableField(exist = false) + private int pageNum; + + /** 更新者 */ + @TableField(exist = false) + private int pageSize; + @Override public String toString() { return new StringJoiner(", ", ReportSteamRunParamHis.class.getSimpleName() + "[", "]") diff --git a/mh-common/src/main/java/com/mh/common/core/domain/entity/ReportSysRunParamHis.java b/mh-common/src/main/java/com/mh/common/core/domain/entity/ReportSysRunParamHis.java index 4fe2425..16fd752 100644 --- a/mh-common/src/main/java/com/mh/common/core/domain/entity/ReportSysRunParamHis.java +++ b/mh-common/src/main/java/com/mh/common/core/domain/entity/ReportSysRunParamHis.java @@ -251,6 +251,14 @@ public class ReportSysRunParamHis extends BaseEntity { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date updateTime; + /** 更新者 */ + @TableField(exist = false) + private int pageNum; + + /** 更新者 */ + @TableField(exist = false) + private int pageSize; + @Override public String toString() { return new ToStringBuilder(this)