From 39d190e06d9e65fd7da1075a6d4a1214670c9a51 Mon Sep 17 00:00:00 2001 From: liyxie Date: Fri, 14 Nov 2025 00:15:18 +0800 Subject: [PATCH] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E9=A2=84=E8=AD=A6=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=EF=BC=8C=E6=89=93=E5=8C=85=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 4 +- pom.xml | 69 +++++++++++-------- .../dc/dc_project/mapper/EquipmentMapper.java | 4 +- .../dc_project/mapper/RecordSampleMapper.java | 5 +- .../model/vo/bigScreen/SystemWarningVo.java | 3 +- .../service/impl/BigScreenServiceImpl.java | 8 +-- src/main/resources/mapper/EquipmentMapper.xml | 3 +- .../resources/mapper/RecordSampleMapper.xml | 4 +- 8 files changed, 58 insertions(+), 42 deletions(-) diff --git a/.gitignore b/.gitignore index 9415624..0c5f343 100644 --- a/.gitignore +++ b/.gitignore @@ -32,5 +32,5 @@ build/ ### VS Code ### .vscode/ -*.log -logs/ +*/*.log +/logs/ diff --git a/pom.xml b/pom.xml index 92a8efe..bef4fa3 100644 --- a/pom.xml +++ b/pom.xml @@ -134,36 +134,49 @@ + + + src/main/java + + **/*.xml + + false + + + src/main/resources + + + + + src/main/java + + **/*.xml + + false + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + org.springframework.boot + spring-boot-maven-plugin + + + true + com.dc.dc_project.DcProjectApplication + + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.22.1 + + true + + + dc-project diff --git a/src/main/java/com/dc/dc_project/mapper/EquipmentMapper.java b/src/main/java/com/dc/dc_project/mapper/EquipmentMapper.java index 6d3755f..b07057d 100644 --- a/src/main/java/com/dc/dc_project/mapper/EquipmentMapper.java +++ b/src/main/java/com/dc/dc_project/mapper/EquipmentMapper.java @@ -21,9 +21,9 @@ public interface EquipmentMapper extends BaseMapper { * @param nowStr * @return */ - BasePageVo getCheckOverdueCount(String nowStr, IPage page); + Page getCheckOverdueCount(String nowStr, IPage page); - BasePageVo getCheckExpiringCount(String nowStr, IPage page); + Page getCheckExpiringCount(String nowStr, IPage page); } diff --git a/src/main/java/com/dc/dc_project/mapper/RecordSampleMapper.java b/src/main/java/com/dc/dc_project/mapper/RecordSampleMapper.java index 87ef11a..8dc36c2 100644 --- a/src/main/java/com/dc/dc_project/mapper/RecordSampleMapper.java +++ b/src/main/java/com/dc/dc_project/mapper/RecordSampleMapper.java @@ -1,6 +1,7 @@ package com.dc.dc_project.mapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.dc.dc_project.model.pojo.RecordSample; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.dc.dc_project.model.vo.BasePageVo; @@ -14,9 +15,9 @@ import com.dc.dc_project.model.vo.bigScreen.SystemWarningItemVo; */ public interface RecordSampleMapper extends BaseMapper { - BasePageVo getCheckNotCheckedCount(String nowStr, IPage page); + Page getCheckNotCheckedCount(String nowStr, IPage page); - BasePageVo getCheckNotChecked(String nowStr, IPage page); + Page getCheckNotChecked(String nowStr, IPage page); } diff --git a/src/main/java/com/dc/dc_project/model/vo/bigScreen/SystemWarningVo.java b/src/main/java/com/dc/dc_project/model/vo/bigScreen/SystemWarningVo.java index 32183ec..fa386d7 100644 --- a/src/main/java/com/dc/dc_project/model/vo/bigScreen/SystemWarningVo.java +++ b/src/main/java/com/dc/dc_project/model/vo/bigScreen/SystemWarningVo.java @@ -1,5 +1,6 @@ package com.dc.dc_project.model.vo.bigScreen; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.dc.dc_project.model.vo.BasePageVo; import lombok.AllArgsConstructor; import lombok.Data; @@ -39,7 +40,7 @@ public class SystemWarningVo { /** * 预警信息 */ - private BasePageVo equipmentWarningItemVos; + private Page equipmentWarningItemVos; diff --git a/src/main/java/com/dc/dc_project/service/impl/BigScreenServiceImpl.java b/src/main/java/com/dc/dc_project/service/impl/BigScreenServiceImpl.java index 56675eb..8a904a6 100644 --- a/src/main/java/com/dc/dc_project/service/impl/BigScreenServiceImpl.java +++ b/src/main/java/com/dc/dc_project/service/impl/BigScreenServiceImpl.java @@ -114,10 +114,10 @@ public class BigScreenServiceImpl implements BigScreenService { // 数量统计 IPage page = new Page<>(systemWarningDto.getCurrent(), systemWarningDto.getSize()); - BasePageVo checkOverdue = equipmentMapper.getCheckOverdueCount(nowStr, page); - BasePageVo checkExpiring = equipmentMapper.getCheckExpiringCount(nowStr, page); - BasePageVo checkNotCheckedCount = recordSampleMapper.getCheckNotCheckedCount(nowStr, page); - BasePageVo checkNotChecked = recordSampleMapper.getCheckNotChecked(nowStr, page); + Page checkOverdue = equipmentMapper.getCheckOverdueCount(nowStr, page); + Page checkExpiring = equipmentMapper.getCheckExpiringCount(nowStr, page); + Page checkNotCheckedCount = recordSampleMapper.getCheckNotCheckedCount(nowStr, page); + Page checkNotChecked = recordSampleMapper.getCheckNotChecked(nowStr, page); SystemWarningVo systemWarningVo = new SystemWarningVo( checkOverdue.getTotal(), diff --git a/src/main/resources/mapper/EquipmentMapper.xml b/src/main/resources/mapper/EquipmentMapper.xml index d31b598..8f9ccf1 100644 --- a/src/main/resources/mapper/EquipmentMapper.xml +++ b/src/main/resources/mapper/EquipmentMapper.xml @@ -19,7 +19,7 @@ AND se.is_deleted = 0 ORDER BY se.valid_until ASC - Limit #{page.offset}, #{page.size} + Limit #{page.current}, #{page.size} diff --git a/src/main/resources/mapper/RecordSampleMapper.xml b/src/main/resources/mapper/RecordSampleMapper.xml index d9cd6fe..feeddac 100644 --- a/src/main/resources/mapper/RecordSampleMapper.xml +++ b/src/main/resources/mapper/RecordSampleMapper.xml @@ -19,7 +19,7 @@ AND sys.calibration_date < #{nowStr} ORDER BY sys.calibration_date ASC - LIMIT #{page.offset}, #{page.size} + LIMIT #{page.current}, #{page.size}