From f502917e38fa5817aee2452fa7b1f9331269f0c8 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 15 Sep 2021 09:55:09 +0800
Subject: [PATCH] 修改device实体类
---
screen-api/src/main/java/com/moral/api/service/impl/HistorySecondUavServiceImpl.java | 10 ++++------
1 files changed, 4 insertions(+), 6 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..145895d 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,11 +142,11 @@
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) -> {
- Date slotStartDate = mValue.get(0).getTime();
+ Date slotStartDate = mValue. get(0).getTime();
Date slotEndDate = mValue.get(mValue.size() - 1).getTime();
Map<String, Object> dateMap = new HashMap<>();
dateMap.put("startTime", slotStartDate);
@@ -243,8 +244,5 @@
Double Distance = Math.sqrt(MathUtils.mul(planDistance,planDistance)+MathUtils.mul(heightDsitance,heightDsitance));
return Distance;
}
-
-
-
}
--
Gitblit v1.8.0