From 74c912b06445d5ba78c33810030dd22a018051df Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Thu, 19 Oct 2023 15:31:22 +0800
Subject: [PATCH] fix:监测站数据问题
---
screen-api/src/main/java/com/moral/api/pojo/vo/uav/UAVQueryTimeSlotVOs.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/pojo/vo/uav/UAVQueryTimeSlotVOs.java b/screen-api/src/main/java/com/moral/api/pojo/vo/uav/UAVQueryTimeSlotVOs.java
index a713d11..1bb0b79 100644
--- a/screen-api/src/main/java/com/moral/api/pojo/vo/uav/UAVQueryTimeSlotVOs.java
+++ b/screen-api/src/main/java/com/moral/api/pojo/vo/uav/UAVQueryTimeSlotVOs.java
@@ -26,13 +26,18 @@
vo.setMac(dto.getMac());
vo.setName(dto.getName());
List<Map<String,String>> timeSlotVo = new ArrayList<>();
- List<Map<String, Date>> timeSlot = dto.getTimeSlot();
- for (Map<String, Date> map : timeSlot) {
+ List<Map<String, Object>> timeSlot = dto.getTimeSlot();
+ for (Map<String, Object> map : timeSlot) {
Map<String,String> newMap = new LinkedHashMap<>();
- map.forEach((key,value)->{
- String dateStr = DateUtils.dateToDateString(value, "yyyy-MM-dd HH:mm:ss");
- newMap.put(key,dateStr);
- });
+ //������������������
+ Date startDate = (Date) map.get("startTime");
+ newMap.put("startTime",DateUtils.dateToDateString(startDate, "yyyy-MM-dd HH:mm:ss"));
+ //������������������
+ Date endDate = (Date) map.get("endTime");
+ newMap.put("endTime",DateUtils.dateToDateString(endDate, "yyyy-MM-dd HH:mm:ss"));
+ //������batch������
+ newMap.put("batch", (String) map.get("batch"));
+ newMap.put("total",map.get("total").toString());
timeSlotVo.add(newMap);
}
vo.setTimeSlot(timeSlotVo);
--
Gitblit v1.8.0