From 4784ba9b5fe0d2c9ada694834ac6b0d0b7474b89 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Thu, 12 Aug 2021 15:52:23 +0800
Subject: [PATCH] special_device、special_device_history相关文件，special_device查询接口
---
screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 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 a43bef9..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,26 +91,29 @@
String sensorCode = params.get("sensorCode").toString();
String end;
String timeUnits;
-
+ String dateFormat;
//���������������,time=data
List<Map<String, Object>> result = new ArrayList<>();
for (String start : times) {
- if ("day".equals(type)) {
+ if ("hour".equals(type)) {
end = DateUtils.getDateAddDay(start, 1);
timeUnits = "hourly";
- } else if ("month".equals(type)) {
+ 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