From 607613b5d0e3fd237c04dbd2ae8a65bb143fe598 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 13 Nov 2023 17:17:05 +0800
Subject: [PATCH] chore:立行立改pc端日志接口提交

---
 screen-api/src/main/java/com/moral/api/mapper/DeviceMapper.java |   17 ++++++++++++++++-
 1 files changed, 16 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..025f615 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 com.moral.api.pojo.vo.device.AppDeviceVo;
 import io.lettuce.core.dynamic.annotation.Param;
 
 /**
@@ -20,6 +21,20 @@
     /*���������������������������*/
     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);
+
+    List<AppDeviceVo> getDevices(@Param("mac") String mac,@Param("organizationId") Integer organizationId);
 
 }

--
Gitblit v1.8.0