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/mapper/DeviceUsageMapper.java | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/DeviceUsageMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/DeviceUsageMapper.java
index 9969bae..1754f85 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/DeviceUsageMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/DeviceUsageMapper.java
@@ -8,6 +8,8 @@
import com.ruoyi.system.query.DeviceListQuery;
import com.ruoyi.system.vo.DeviceCountVo;
import com.ruoyi.system.vo.DeviceListVo;
+import com.ruoyi.system.query.*;
+import com.ruoyi.system.vo.*;
import org.apache.ibatis.annotations.Param;
import java.time.LocalDateTime;
@@ -28,6 +30,16 @@
List<DeviceListVo> getDeviceList(@Param("page") Page<DeviceListVo> page, @Param("query") DeviceListQuery query);
+ List<EntrustProjectVo> projectList(@Param("page")Page<EntrustProjectVo> page,@Param("query")EntrustListQuery query);
+
+ List<EntrustProjectReportVo> projectReport(@Param("page")Page<EntrustProjectReportVo> page, @Param("query")ProjectReportListQuery query);
+
+ List<EntrustDeviceListVo> deviceList(@Param("page")Page<EntrustDeviceListVo> page, @Param("query")EntrustDeviceListQuery query);
+
+ List<ErrorListVo> errorList(@Param("page")Page<ErrorListVo> page, @Param("query")ErrorListQuery query);
List<DeviceCountVo> getProjectDeviceCount(@Param("id") Integer id);
+ List<ErrorListVo> deviceErrorList(@Param("page")Page<ErrorListVo> page, @Param("query")ErrorListQuery query);
+
+ List<ErrorListVo> safetyErrorList(@Param("page")Page<ErrorListVo> page, @Param("query")ErrorListQuery query);
}
--
Gitblit v1.7.1