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/impl/HistorySecondUavServiceImpl.java | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
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 ed2433a..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
@@ -36,7 +36,7 @@
/*
* ������������������
* */
- private Double filterDistance = 3d;
+ private Double filterDistance = 2d;
@Autowired
HistorySecondUavMapper historySecondUavMapper;
@@ -63,6 +63,7 @@
queryWrapper.between("batch", startDate, endDate);
//������������������
queryWrapper.select("DISTINCT batch");
+ queryWrapper.orderByDesc("batch");
//������������
List<HistorySecondUav> historySecondUavs = historySecondUavMapper.selectList(queryWrapper);
//������������Date������
@@ -141,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) -> {
@@ -243,8 +244,5 @@
Double Distance = Math.sqrt(MathUtils.mul(planDistance,planDistance)+MathUtils.mul(heightDsitance,heightDsitance));
return Distance;
}
-
-
-
}
--
Gitblit v1.8.0