From d8310f6bc609440fa352c0e5a9436c7c78caa287 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Mon, 29 Nov 2021 11:09:48 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_job
---
src/main/java/com/moral/service/DeviceService.java | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/moral/service/DeviceService.java b/src/main/java/com/moral/service/DeviceService.java
index 2947f3a..202b4b8 100644
--- a/src/main/java/com/moral/service/DeviceService.java
+++ b/src/main/java/com/moral/service/DeviceService.java
@@ -1,27 +1,29 @@
package com.moral.service;
+import com.moral.entity.Device;
+
import java.util.List;
import java.util.Map;
-import com.moral.entity.AlarmConfigValue;
-import com.moral.entity.Device;
-
-
public interface DeviceService {
-
- Map<String, Object> getAvgData(Map<String, Object> parameters);
-
- Map<String, Object> getMaxAndMinData(Map<String, Object> parameters);
-
- List<Map<String, Object>> getMacAndSensorkeyByOrganizationid(List<Object> organizationIdList);
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);
+
+ void alarmSms(Map<String, Object> params);
}
--
Gitblit v1.8.0