From 0197c2fcac5fdb701ff91dcea0d98ec226bc008d Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 13 Oct 2021 15:21:08 +0800
Subject: [PATCH] 删除historySecondSpecial相关类
---
screen-api/src/main/java/com/moral/api/pojo/vo/uav/UAVQueryTimeSlotVOs.java | 16 ++++++++++------
1 files changed, 10 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..4ff8a79 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,17 @@
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"));
timeSlotVo.add(newMap);
}
vo.setTimeSlot(timeSlotVo);
--
Gitblit v1.8.0