From e77cdf62567ba92d2d3131da20429dcbfc3b7ea2 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 31 Aug 2023 16:11:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa
---
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..899c7ae 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,String code);
- //���������������������������
- 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