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/DeviceUsageService.java | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/DeviceUsageService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/DeviceUsageService.java
index aeed6e3..d6f836d 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/DeviceUsageService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/DeviceUsageService.java
@@ -4,6 +4,8 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.system.model.DeviceUsage;
+import com.ruoyi.system.query.*;
+import com.ruoyi.system.vo.*;
import com.ruoyi.system.query.DeviceListQuery;
import com.ruoyi.system.vo.DeviceCountVo;
import com.ruoyi.system.vo.DeviceListVo;
@@ -25,6 +27,17 @@
List<DeviceListVo> getDeviceList(Page<DeviceListVo> page, @Valid DeviceListQuery query);
+ List<EntrustProjectVo> projectList(Page<EntrustProjectVo> page, EntrustListQuery query);
+
+ List<EntrustProjectReportVo> projectReport(Page<EntrustProjectReportVo> page, ProjectReportListQuery query);
+
+ List<EntrustDeviceListVo> deviceList(Page<EntrustDeviceListVo> page, EntrustDeviceListQuery query);
+
+ List<ErrorListVo> errorList(Page<ErrorListVo> page, ErrorListQuery query);
+
+ List<ErrorListVo> deviceErrorList(Page<ErrorListVo> page, ErrorListQuery query);
+
+ List<ErrorListVo> safetyErrorList(Page<ErrorListVo> page, ErrorListQuery query);
List<DeviceCountVo> getProjectDeviceCount(Integer id);
}
--
Gitblit v1.7.1