From 8228b06f808840d95d58e4ad457e072800af33e6 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 09 Mar 2022 11:35:00 +0800
Subject: [PATCH] 校准公式工具类修改

---
 screen-manage/src/main/java/com/moral/api/service/DeviceService.java |   18 +++++++++++++++---
 1 files changed, 15 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..e8fd83c 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,21 @@
     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);
+
+    /**
+      *@Description: ������������id���������������������
+      *@Param: [orgId]
+      *@return: java.util.List<java.util.Map<java.lang.String,java.lang.Object>> 
+      *@Author: lizijie
+      *@Date: 2022/1/17 10:30
+     **/
+    List<Map<String,Object>> selectMonitorPiontAndDeviceByOrgId(int orgId);
 
 }

--
Gitblit v1.8.0