From 3604b90f27205b63b559502fb181ce150c2d9a5d Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 14 Sep 2021 09:57:12 +0800
Subject: [PATCH] screen-api 修改获取特殊设备逻辑
---
screen-api/src/main/java/com/moral/api/service/SpecialDeviceService.java | 2 +-
screen-api/src/main/java/com/moral/api/service/impl/HistorySecondUavServiceImpl.java | 5 +----
screen-api/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java | 8 +++++---
3 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/SpecialDeviceService.java b/screen-api/src/main/java/com/moral/api/service/SpecialDeviceService.java
index 7711c12..18498ae 100644
--- a/screen-api/src/main/java/com/moral/api/service/SpecialDeviceService.java
+++ b/screen-api/src/main/java/com/moral/api/service/SpecialDeviceService.java
@@ -29,7 +29,7 @@
* @Author: ���������
* @Date: 2021/9/8
*/
- Map<String,Object> getSpecialDeviceMapByMac(String mac);
+ SpecialDevice getSpecialDeviceMapByMac(String mac);
/**
* @Description: ������mac������������������������
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/HistorySecondUavServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/HistorySecondUavServiceImpl.java
index 5cbea96..7b85f26 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/HistorySecondUavServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/HistorySecondUavServiceImpl.java
@@ -142,7 +142,7 @@
List<Map<String, Object>> timeSlots = new ArrayList<>();
dto.setMac(key);
//������mac������������������
- dto.setName((String) specialDeviceService.getSpecialDeviceMapByMac(key).get("name"));
+ dto.setName((String) specialDeviceService.getSpecialDeviceMapByMac(key).getName());
//������������������batch
value.forEach(listValue -> {
listValue.forEach((mKey, mValue) -> {
@@ -244,8 +244,5 @@
Double Distance = Math.sqrt(MathUtils.mul(planDistance,planDistance)+MathUtils.mul(heightDsitance,heightDsitance));
return Distance;
}
-
-
-
}
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java
index fd19d65..7fe9dd9 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java
@@ -98,10 +98,12 @@
}
@Override
- public Map<String,Object> getSpecialDeviceMapByMac(String mac) {
+ public SpecialDevice getSpecialDeviceMapByMac(String mac) {
//������������������
- Map<String,Object> specialDeviceMap = (Map<String, Object>) redisTemplate.opsForHash().get(RedisConstants.DEVICE,mac);
- return specialDeviceMap;
+ QueryWrapper<SpecialDevice> wrapper = new QueryWrapper<>();
+ wrapper.eq("mac",mac);
+ wrapper.eq("is_delete",Constants.NOT_DELETE);
+ return specialDeviceMapper.selectOne(wrapper);
}
@Override
--
Gitblit v1.8.0