From cc120d54e26f64753e99b349599875cf6911a0af Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 18 Oct 2023 08:26:19 +0800
Subject: [PATCH] chore:小程序测试提交

---
 screen-api/src/main/java/com/moral/api/mapper/DeviceMapper.java |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/screen-api/src/main/java/com/moral/api/mapper/DeviceMapper.java b/screen-api/src/main/java/com/moral/api/mapper/DeviceMapper.java
index a40f6ba..f4f0bad 100644
--- a/screen-api/src/main/java/com/moral/api/mapper/DeviceMapper.java
+++ b/screen-api/src/main/java/com/moral/api/mapper/DeviceMapper.java
@@ -20,6 +20,18 @@
     /*���������������������������*/
     List<Map<String, Object>> getTrendChartData(Map<String, Object> params);
 
-    List<Device> deviceList(@Param("organizationId") int organizationId,@Param("regionCode")  int regionCode,@Param("region")  String region);
+    List<Map<String, Object>> deviceList(@Param("organizationId") int organizationId,
+                            @Param("regionCode")  int regionCode,
+                            @Param("region")  String region,
+                            @Param("type")  String type,
+                            @Param("sensorCode")  String sensorCode,
+                            @Param("times")  String times,
+                            @Param("endHourlyTime") String endHourlyTime);
+
+    List<Integer> deviceIdList(@Param("organizationId") int organizationId);
+
+    List<Integer> deviceOrgIdList(@Param("organizationId") int organizationId);
+
+    List<String> deviceMacs(@Param("organizationId") int organizationId);
 
 }

--
Gitblit v1.8.0