From 659b91b554ba5e98b6fffa045231f5aa3fb4ab9e Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Fri, 03 Sep 2021 15:21:48 +0800
Subject: [PATCH] 因子默认单位添加;角色、菜单更新

---
 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