From 7d1feae71bfd79b9021e516916b79f918bfcbcd9 Mon Sep 17 00:00:00 2001
From: “mitao” <“2763622819@qq.com”>
Date: 星期四, 22 一月 2026 16:36:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DeviceUsageServiceImpl.java | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 56 insertions(+), 1 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DeviceUsageServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DeviceUsageServiceImpl.java
index c27f6e2..477c910 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DeviceUsageServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DeviceUsageServiceImpl.java
@@ -6,8 +6,9 @@
import com.ruoyi.system.mapper.DeviceUsageMapper;
import com.ruoyi.system.model.DeviceUsage;
import com.ruoyi.system.model.Record;
-import com.ruoyi.system.query.DeviceListQuery;
+import com.ruoyi.system.query.*;
import com.ruoyi.system.service.DeviceUsageService;
+import com.ruoyi.system.vo.*;
import com.ruoyi.system.vo.DeviceCountVo;
import com.ruoyi.system.vo.DeviceListVo;
import org.springframework.stereotype.Service;
@@ -55,5 +56,59 @@
return this.baseMapper.getProjectDeviceCount(id);
}
+ @Override
+ public List<EntrustProjectVo> projectList( Page<EntrustProjectVo> page,EntrustListQuery query) {
+ Integer pageNum = query.getPageNum();
+ Integer pageSize = query.getPageSize();
+ List<EntrustProjectVo> deviceList = this.baseMapper.projectList(page,query);
+ for (EntrustProjectVo deviceListVo : deviceList) {
+ LocalDateTime checkTime = deviceListVo.getCheckTime();
+ // 判断checkTime是否是本月的时间
+ if (checkTime != null && YearMonth.from(checkTime).equals(YearMonth.now())) {
+ deviceListVo.setCheckResult("已检查");
+ }else {
+ deviceListVo.setCheckResult("未检查");
+ }
+ }
+ return deviceList;
+ }
+
+ @Override
+ public List<EntrustProjectReportVo> projectReport(Page<EntrustProjectReportVo> page, ProjectReportListQuery query) {
+ List<EntrustProjectReportVo> entrustProjectReportVoList = this.baseMapper.projectReport(page,query);
+ return entrustProjectReportVoList;
+ }
+
+ @Override
+ public List<EntrustDeviceListVo> deviceList(Page<EntrustDeviceListVo> page, EntrustDeviceListQuery query) {
+ List<EntrustDeviceListVo> deviceList = this.baseMapper.deviceList(page, query);
+ for (EntrustDeviceListVo deviceListVo : deviceList) {
+ LocalDateTime checkTime = deviceListVo.getCheckTime();
+ // 判断checkTime是否是本月的时间
+ if (checkTime != null && YearMonth.from(checkTime).equals(YearMonth.now())) {
+ deviceListVo.setCheckResult("已检查");
+ }else {
+ deviceListVo.setCheckResult("未检查");
+ }
+ }
+ return deviceList;
+ }
+
+ @Override
+ public List<ErrorListVo> errorList(Page<ErrorListVo> page, ErrorListQuery query) {
+ List<ErrorListVo> errorList = this.baseMapper.errorList(page, query);
+ return errorList;
+ }
+
+ @Override
+ public List<ErrorListVo> deviceErrorList(Page<ErrorListVo> page, ErrorListQuery query) {
+ List<ErrorListVo> errorList = this.baseMapper.deviceErrorList(page, query);
+ return errorList; }
+
+ @Override
+ public List<ErrorListVo> safetyErrorList(Page<ErrorListVo> page, ErrorListQuery query) {
+ List<ErrorListVo> errorList = this.baseMapper.safetyErrorList(page, query);
+ return errorList; }
+
}
--
Gitblit v1.7.1