Skip to content

A
amos-boot-biz
Commit 89605d6e authored by litengwei's avatar litengwei
Browse files
Options

物联趋势图差8小时问题

parent 2aaaecad
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 6 deletions
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/TopographyController.java
View file @ 89605d6e
...@@ -915,14 +915,10 @@ public class TopographyController extends AbstractBaseController { ...@@ -915,14 +915,10 @@ public class TopographyController extends AbstractBaseController {
Date useDate = null; Date useDate = null;
String indexKey = null; String indexKey = null;
if (vos.get(i).getKey().equals("time")) { if (vos.get(i).getKey().equals("time")) {
String strDate = String.valueOf(vos.get(i).getValue()).substring(0, 19); useDate = dateParse(vos.get(i).getValue().toString());
SimpleDateFormat sdf = new SimpleDateFormat(ISO8601_DATE_HOUR_MIN_SEC);
useDate = sdf.parse(strDate);
indexKey = String.valueOf(vos.get(i + 1).getKey()); indexKey = String.valueOf(vos.get(i + 1).getKey());
} else { } else {
String strDate = String.valueOf(vos.get(i + 1).getValue()).substring(0, 19); useDate = dateParse(vos.get(i).getValue().toString());
SimpleDateFormat sdf = new SimpleDateFormat(ISO8601_DATE_HOUR_MIN_SEC);
useDate = sdf.parse(strDate);
indexKey = String.valueOf(vos.get(i).getKey()); indexKey = String.valueOf(vos.get(i).getKey());
} }
if (!dateMap.containsKey(indexKey)) { if (!dateMap.containsKey(indexKey)) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment