From 9b790d284324a54bd54de12a336e488e748a2b61 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 12 Aug 2021 14:57:15 +0800
Subject: [PATCH] 监测因子趋势图时间精简
---
screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
index 561c8b6..23efdd1 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
@@ -91,7 +91,7 @@
String sensorCode = params.get("sensorCode").toString();
String end;
String timeUnits;
-
+ String dateFormat;
//���������������,time=data
List<Map<String, Object>> result = new ArrayList<>();
@@ -99,18 +99,21 @@
if ("hour".equals(type)) {
end = DateUtils.getDateAddDay(start, 1);
timeUnits = "hourly";
+ dateFormat = "%Y-%m-%d %H";
} else if ("day".equals(type)) {
end = DateUtils.getDateAddMonth(start, 1);
timeUnits = "daily";
+ dateFormat = "%Y-%m-%d";
} else {
end = DateUtils.getDateAddYear(start, 1);
timeUnits = "monthly";
+ dateFormat = "%Y-%m";
}
params.put("timeUnits", timeUnits);
params.put("start", start);
params.put("end", end);
params.put("macs", macs);
- params.put("dateFormat", "%Y-%m-%d %H:%i:%s");
+ params.put("dateFormat", dateFormat);
//���������������������������������
List<Map<String, Object>> list = deviceMapper.getTrendChartData(params);
--
Gitblit v1.8.0