From 8af1bd5ed227ff568b3ac60f3594ae2a8dfd9dec Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 25 Oct 2023 11:11:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into qa
---
screen-api/src/main/java/com/moral/api/service/DeviceService.java | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/DeviceService.java b/screen-api/src/main/java/com/moral/api/service/DeviceService.java
index 1bb65f1..923d79b 100644
--- a/screen-api/src/main/java/com/moral/api/service/DeviceService.java
+++ b/screen-api/src/main/java/com/moral/api/service/DeviceService.java
@@ -19,12 +19,17 @@
//������������id������������������
List<Device> getDevicesByMonitorPointId(Integer monitorPointId);
+ List<Device> getDevicesByMonitorPointId(List<Integer> monitorPointId);
+
//������macs������������������������
Map<String, Object> getSensorsByMac(Map<String,Object> params);
//���������������������������������
List<Map<String, Object>> getTrendChartData(Map<String,Object> params);
+ //������������������������������������������
+ List<Map<String, Object>> getTrendChartDataV2(Map<String,Object> params);
+
//������mac������������������
Device getDeviceByMac(String mac);
--
Gitblit v1.8.0