From c3e8b19537332aa0e5282cae78d3ea9c9189fd4e Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 22 Aug 2023 16:50:39 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb
---
screen-api/src/main/java/com/moral/api/mapper/DeviceMapper.java | 12 +++++++++++-
1 files changed, 11 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..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
@@ -20,6 +20,16 @@
/*���������������������������*/
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);
}
--
Gitblit v1.8.0