From f060b03b65806b8ab1b869459942fa1f20641c9b Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 12 Oct 2021 10:05:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/service/DeviceService.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/moral/service/DeviceService.java b/src/main/java/com/moral/service/DeviceService.java
index a91d4d6..7c76d7f 100644
--- a/src/main/java/com/moral/service/DeviceService.java
+++ b/src/main/java/com/moral/service/DeviceService.java
@@ -1,5 +1,7 @@
package com.moral.service;
+import com.moral.entity.Device;
+
import java.util.List;
import java.util.Map;
@@ -11,9 +13,15 @@
List<Map<String, Object>> getSensorDataByMac(Map<String, Object> parameters);
+ List<Map<String, Object>> getSensorDataByMacOnce(Map<String, Object> parameters);
+
List<String> getMacs();
List<String> getMacByOrganizationid(List<Object> organizationIdList);
List<Map<String, Object>> macAndOrganizationIdMap(List<String> macs);
+
+ List<Map<String, Object>> getAllByMacList(List<String> macList);
+
+ Device getDeviceByID(int id);
}
--
Gitblit v1.8.0