From ec192d94be582e5fa504cb355090ce98e0880e65 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 20 Oct 2020 10:40:57 +0800
Subject: [PATCH] 修改时间bug
---
src/main/java/com/moral/controller/WebController.java | 32 +++++++++++++++++++++++++++++---
1 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/moral/controller/WebController.java b/src/main/java/com/moral/controller/WebController.java
index 7b66415..a6fe5fe 100644
--- a/src/main/java/com/moral/controller/WebController.java
+++ b/src/main/java/com/moral/controller/WebController.java
@@ -256,8 +256,33 @@
parameters.put("yearAndMonth",yearAndMonth);
parameters.put("macs",macs);
List<Map<String, Object>> datas = historyMinutelyService.getFiveMinutesDataByMacsAndTime(parameters);
+ datas = insertDeviceInfo(datas,devices);
return new ResultBean<List<Map<String, Object>>>(datas);
+ }
+
+ /**
+ * @Description: ���������������������������������������state
+ * @Param: [datas, devices]
+ * @return: java.util.List<java.util.Map<java.lang.String,java.lang.Object>>
+ * @Author: ������������
+ * @Date: 2020/10/19
+ */
+ public List<Map<String, Object>> insertDeviceInfo(List<Map<String, Object>> datas,List<Device> devices ){
+ Map<String,Device> map = new HashMap<>();
+ devices.forEach(p->{
+ map.put(p.getMac(),p);
+ });
+
+ datas.forEach(p->{
+ String mac = (String) p.get("mac");
+ Device device = map.get(mac);
+ List list = LatLngTransformation.Convert_BD09_To_GCJ02(device.getLatitude(), device.getLongitude());
+ p.put("longitude",list.get(0));
+ p.put("latitude",list.get(1));
+ p.put("state",device.getState());
+ });
+ return datas;
}
/**
@@ -277,11 +302,12 @@
String yearAndMonth = "";
String startTime = "";
Integer endMinute = Integer.parseInt(String.valueOf(minute.charAt(minute.length() - 1)));
- if (endMinute >= 5) {
+ if (endMinute >= 6||endMinute==0) {//��������������������� 6 7 8 9 0 ������12:16,12:20��������� ���������12:10-12:15���������
+ date = DateUtil.rollMinute(date, -1);
StringBuilder time = new StringBuilder(sdf.format(date));
startTime = time.replace(15, 19, "0:00").toString();
- } else {
- date = DateUtil.rollMinute(date, -5);
+ }else {// ���������������������1 2 3 4 5 ������������������������������ ������12:11������������ ���������12:05-12:10���������
+ date = DateUtil.rollMinute(date, -9);
StringBuilder time = new StringBuilder(sdf.format(date));
startTime = time.replace(15, 19, "5:00").toString();
}
--
Gitblit v1.8.0