From 44cbfba860be1674d876a885d1b8b6cb24cc26e3 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 20 Oct 2020 11:54:58 +0800
Subject: [PATCH] 增加时间字段获取
---
src/main/java/com/moral/controller/WebController.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/moral/controller/WebController.java b/src/main/java/com/moral/controller/WebController.java
index 60faef1..a6fe5fe 100644
--- a/src/main/java/com/moral/controller/WebController.java
+++ b/src/main/java/com/moral/controller/WebController.java
@@ -277,8 +277,9 @@
datas.forEach(p->{
String mac = (String) p.get("mac");
Device device = map.get(mac);
- p.put("longitude",device.getLongitude());
- p.put("latitude",device.getLatitude());
+ 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;
@@ -301,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