From 8bb914874ef1ebcda2a9c606224bf3e3db2f46f8 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 23 Nov 2020 09:51:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/service/DeviceService.java | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/moral/service/DeviceService.java b/src/main/java/com/moral/service/DeviceService.java
index 6a587dc..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;
@@ -7,9 +9,19 @@
List<Map<String, Object>> getSensorData(Map<String, Object> parameters);
+ List<Map<String, Object>> getSensorDataOnce(Map<String, Object> parameters);
+
+ 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