From e6f974ca6eab798c2df5c09cdb8320ecf4ff4185 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 22 Aug 2023 16:52:36 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb_21

---
 screen-api/src/main/java/com/moral/api/mapper/DeviceMapper.java |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 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 589c2e8..0f56b49 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
@@ -5,6 +5,7 @@
 
 import com.moral.api.entity.Device;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import io.lettuce.core.dynamic.annotation.Param;
 
 /**
  * <p>
@@ -19,4 +20,16 @@
     /*���������������������������*/
     List<Map<String, Object>> getTrendChartData(Map<String, Object> params);
 
+    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);
+
 }

--
Gitblit v1.8.0