From 9655ea9ce8cdd671a766f87a0885b0fdff7b89c9 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 24 Aug 2023 17:12:28 +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 |   19 +++++++++++++++++++
 1 files changed, 19 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 f49f9df..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
@@ -1,7 +1,11 @@
 package com.moral.api.mapper;
 
+import java.util.List;
+import java.util.Map;
+
 import com.moral.api.entity.Device;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import io.lettuce.core.dynamic.annotation.Param;
 
 /**
  * <p>
@@ -13,4 +17,19 @@
  */
 public interface DeviceMapper extends BaseMapper<Device> {
 
+    /*���������������������������*/
+    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