From c8aa05fd65cc788abc0f44494338b04993e3b4be Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 10 Sep 2021 15:08:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev_
---
screen-manage/src/main/java/com/moral/api/service/DeviceService.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/service/DeviceService.java b/screen-manage/src/main/java/com/moral/api/service/DeviceService.java
index 5fac936..e22ba74 100644
--- a/screen-manage/src/main/java/com/moral/api/service/DeviceService.java
+++ b/screen-manage/src/main/java/com/moral/api/service/DeviceService.java
@@ -56,9 +56,12 @@
Map<String, Object> getDeviceByMac(String mac);
//������������������
- Map<String, Object> adjustDeviceData(Map<String, Object> deviceData, Map<String, Object> deviceInfo);
+ Map<String, Object> adjustDeviceData(Map<String, Object> deviceData);
- //���������������������������
- Map<String, Object> judgeDeviceState(Map<String, Object> data, Map<String, Object> deviceInfo);
+ //������������������������
+ Map<String, Object> adjustSpecialDeviceData(Map<String, Object> deviceData);
+
+ //���������������������������
+ void judgeDeviceState(Map<String, Object> data);
}
--
Gitblit v1.8.0