admin/dc_project
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

系统预警修复，打包完善

Browse Source
This commit is contained in:
liyxie
2025-11-14 00:15:18 +08:00
parent 47a6217329
commit 39d190e06d
8 changed files with 58 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@@ -32,5 +32,5 @@ build/
### VS Code ### ### VS Code ###
.vscode/ .vscode/
*.log */*.log
logs/ /logs/

69
pom.xml
View File

@@ -134,36 +134,49 @@
</dependencies> </dependencies>
<build> <build>
<resources>
<resource>
<directory>src/main/java</directory>
<includes>
<include>**/*.xml</include>
</includes>
<filtering>false</filtering>
</resource>
<resource>
<directory>src/main/resources</directory>
</resource>
</resources>
<testResources>
<testResource>
<directory>src/main/java</directory>
<includes>
<include>**/*.xml</include>
</includes>
<filtering>false</filtering>
</testResource>
</testResources>
<plugins> <plugins>
<!--<plugin>--> <!-- maven打包插件 -> 将整个工程打成一个 fatjar -->
<!-- <groupId>org.apache.maven.plugins</groupId>--> <plugin>
<!-- <artifactId>maven-compiler-plugin</artifactId>--> <groupId>org.springframework.boot</groupId>
<!-- <configuration>--> <artifactId>spring-boot-maven-plugin</artifactId>
<!-- <annotationProcessorPaths>--> <!-- 作用:项目打成jar，同时把本地jar包也引入进去 -->
<!-- <path>--> <configuration>
<!-- <groupId>org.springframework.boot</groupId>--> <includeSystemScope>true</includeSystemScope>
<!-- <artifactId>spring-boot-configuration-processor</artifactId>--> <mainClass>com.dc.dc_project.DcProjectApplication</mainClass>
<!-- </path>--> </configuration>
<!-- <path>--> </plugin>
<!-- <groupId>org.projectlombok</groupId>--> <!--添加配置跳过测试-->
<!-- <artifactId>lombok</artifactId>--> <plugin>
<!-- </path>--> <groupId>org.apache.maven.plugins</groupId>
<!-- </annotationProcessorPaths>--> <artifactId>maven-surefire-plugin</artifactId>
<!-- </configuration>--> <version>2.22.1</version>
<!--</plugin>--> <configuration>
<!--<plugin>--> <skipTests>true</skipTests>
<!-- <groupId>org.springframework.boot</groupId>--> </configuration>
<!-- <artifactId>spring-boot-maven-plugin</artifactId>--> </plugin>
<!-- <configuration>-->
<!-- <excludes>-->
<!-- <exclude>-->
<!-- <groupId>org.projectlombok</groupId>-->
<!-- <artifactId>lombok</artifactId>-->
<!-- </exclude>-->
<!-- </excludes>-->
<!-- </configuration>-->
<!--</plugin>-->
</plugins> </plugins>
<finalName>dc-project</finalName>
</build> </build>
</project> </project>

4
src/main/java/com/dc/dc_project/mapper/EquipmentMapper.java
View File

@@ -21,9 +21,9 @@ public interface EquipmentMapper extends BaseMapper<Equipment> {
* @param nowStr * @param nowStr
* @return * @return
*/ */
BasePageVo<SystemWarningItemVo> getCheckOverdueCount(String nowStr, IPage<SystemWarningItemVo> page); Page<SystemWarningItemVo> getCheckOverdueCount(String nowStr, IPage<SystemWarningItemVo> page);
BasePageVo<SystemWarningItemVo> getCheckExpiringCount(String nowStr, IPage<SystemWarningItemVo> page); Page<SystemWarningItemVo> getCheckExpiringCount(String nowStr, IPage<SystemWarningItemVo> page);
} }

5
src/main/java/com/dc/dc_project/mapper/RecordSampleMapper.java
View File

@@ -1,6 +1,7 @@
package com.dc.dc_project.mapper; package com.dc.dc_project.mapper;
import com.baomidou.mybatisplus.core.metadata.IPage; 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.dc.dc_project.model.pojo.RecordSample;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.dc.dc_project.model.vo.BasePageVo; 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<RecordSample> { public interface RecordSampleMapper extends BaseMapper<RecordSample> {
BasePageVo<SystemWarningItemVo> getCheckNotCheckedCount(String nowStr, IPage<SystemWarningItemVo> page); Page<SystemWarningItemVo> getCheckNotCheckedCount(String nowStr, IPage<SystemWarningItemVo> page);
BasePageVo<SystemWarningItemVo> getCheckNotChecked(String nowStr, IPage<SystemWarningItemVo> page); Page<SystemWarningItemVo> getCheckNotChecked(String nowStr, IPage<SystemWarningItemVo> page);
} }

3
src/main/java/com/dc/dc_project/model/vo/bigScreen/SystemWarningVo.java
View File

@@ -1,5 +1,6 @@
package com.dc.dc_project.model.vo.bigScreen; 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 com.dc.dc_project.model.vo.BasePageVo;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
@@ -39,7 +40,7 @@ public class SystemWarningVo {
/** /**
* 预警信息 * 预警信息
*/ */
private BasePageVo<SystemWarningItemVo> equipmentWarningItemVos; private Page<SystemWarningItemVo> equipmentWarningItemVos;

8
src/main/java/com/dc/dc_project/service/impl/BigScreenServiceImpl.java
View File

@@ -114,10 +114,10 @@ public class BigScreenServiceImpl implements BigScreenService {
// 数量统计 // 数量统计
IPage<SystemWarningItemVo> page = new Page<>(systemWarningDto.getCurrent(), systemWarningDto.getSize()); IPage<SystemWarningItemVo> page = new Page<>(systemWarningDto.getCurrent(), systemWarningDto.getSize());
BasePageVo<SystemWarningItemVo> checkOverdue = equipmentMapper.getCheckOverdueCount(nowStr, page); Page<SystemWarningItemVo> checkOverdue = equipmentMapper.getCheckOverdueCount(nowStr, page);
BasePageVo<SystemWarningItemVo> checkExpiring = equipmentMapper.getCheckExpiringCount(nowStr, page); Page<SystemWarningItemVo> checkExpiring = equipmentMapper.getCheckExpiringCount(nowStr, page);
BasePageVo<SystemWarningItemVo> checkNotCheckedCount = recordSampleMapper.getCheckNotCheckedCount(nowStr, page); Page<SystemWarningItemVo> checkNotCheckedCount = recordSampleMapper.getCheckNotCheckedCount(nowStr, page);
BasePageVo<SystemWarningItemVo> checkNotChecked = recordSampleMapper.getCheckNotChecked(nowStr, page); Page<SystemWarningItemVo> checkNotChecked = recordSampleMapper.getCheckNotChecked(nowStr, page);
SystemWarningVo systemWarningVo = new SystemWarningVo( SystemWarningVo systemWarningVo = new SystemWarningVo(
checkOverdue.getTotal(), checkOverdue.getTotal(),

3
src/main/resources/mapper/EquipmentMapper.xml
View File

@@ -19,7 +19,7 @@
AND se.is_deleted = 0 AND se.is_deleted = 0
</where> </where>
ORDER BY se.valid_until ASC ORDER BY se.valid_until ASC
Limit #{page.offset}, #{page.size} Limit #{page.current}, #{page.size}
</select> </select>
<select id="getCheckExpiringCount" resultType="com.dc.dc_project.model.vo.bigScreen.SystemWarningItemVo"> <select id="getCheckExpiringCount" resultType="com.dc.dc_project.model.vo.bigScreen.SystemWarningItemVo">
SELECT se.id, se.name, se.valid_until AS date, DATEDIFF(se.valid_until, #{nowStr}) AS day FROM sys_equipment se SELECT se.id, se.name, se.valid_until AS date, DATEDIFF(se.valid_until, #{nowStr}) AS day FROM sys_equipment se
@@ -28,5 +28,6 @@
AND se.is_deleted = 0 AND se.is_deleted = 0
</where> </where>
ORDER BY se.valid_until ASC ORDER BY se.valid_until ASC
Limit #{page.current}, #{page.size}
</select> </select>
</mapper> </mapper>

4
src/main/resources/mapper/RecordSampleMapper.xml
View File

@@ -19,7 +19,7 @@
AND sys.calibration_date &lt; #{nowStr} AND sys.calibration_date &lt; #{nowStr}
</where> </where>
ORDER BY sys.calibration_date ASC ORDER BY sys.calibration_date ASC
LIMIT #{page.offset}, #{page.size} LIMIT #{page.current}, #{page.size}
</select> </select>
<select id="getCheckNotChecked" resultType="com.dc.dc_project.model.vo.bigScreen.SystemWarningItemVo"> <select id="getCheckNotChecked" resultType="com.dc.dc_project.model.vo.bigScreen.SystemWarningItemVo">
SELECT SELECT
@@ -34,6 +34,6 @@
AND sys.calibration_date BETWEEN #{nowStr} AND DATE_ADD(#{nowStr}, INTERVAL 15 DAY) AND sys.calibration_date BETWEEN #{nowStr} AND DATE_ADD(#{nowStr}, INTERVAL 15 DAY)
</where> </where>
ORDER BY sys.calibration_date ASC ORDER BY sys.calibration_date ASC
LIMIT #{page.offset}, #{page.size} LIMIT #{page.current}, #{page.size}
</select> </select>
</mapper> </mapper>