From 3771512ff8b1f4bd6c40cdcdff58b3a64cee78b1 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Tue, 14 Nov 2023 13:50:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/qa' into qa
---
screen-manage/src/main/java/com/moral/api/service/DeviceService.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 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 0d3fa02..e67f393 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,23 @@
Map<String, Object> getDeviceByMac(String mac);
//������������������
- Map<String, Object> adjustDeviceData(Map<String, Object> deviceData);
+ Map<String, Object> adjustDeviceData(Map<String, Object> deviceData,String code);
+
+ //������������������������
+ 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);
+
+ void setRedisDevice();
+
}
--
Gitblit v1.8.0