From dad9ebf1e6bfd86e7d4ce9cb976a8f24422c4cf7 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Tue, 28 Dec 2021 15:30:55 +0800
Subject: [PATCH] 获取设备一天24小时平均值、最小值、最大值接口
---
screen-api/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java | 39 +++++++++++++++++++++++++++++++++++++++
1 files changed, 39 insertions(+), 0 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java
index c60183b..5c01832 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java
@@ -527,6 +527,45 @@
return list;
}
+ @Override
+ public List<Map<String, Object>> getHourCompleteDataByMacSensorCodeDate(Map<String, Object> map) {
+ String mac = map.get("mac").toString();
+ String sensorCode = map.get("sensor_code").toString();
+ String date = map.get("date").toString();
+ String dateTime = date.replace("-","");
+ String timeUnits = dateTime.substring(0,6)+"_complete";
+ Map<String,Object> params = new HashMap<>();
+ params.put("timeUnits",timeUnits);
+ params.put("mac",mac);
+ List resultList = new ArrayList();
+ for (int i = 0; i < 13; i++) {
+ Map<String,Object> oneHourDateMap = new HashMap<>();
+ String j;
+ if (i<10){
+ j = " 0"+i+":00:00";
+ }else {
+ j = " "+i+":00:00";
+ }
+ String time = date+j;
+ params.put("time",time);
+ if (ObjectUtils.isEmpty(historyHourlyMapper.selectHourlyData(params))){
+ resultList.add(oneHourDateMap);
+ continue;
+ }
+ String oneHourlyData = null;
+ oneHourlyData = historyHourlyMapper.selectHourlyData(params);
+ JSONObject js = JSONObject.parseObject(oneHourlyData);
+ String sensorDate = js.get(sensorCode).toString();
+ sensorDate = sensorDate.replace("[","");
+ sensorDate = sensorDate.replace("]","");
+ String[] split = sensorDate.split(",");
+ oneHourDateMap.put("time",time);
+ oneHourDateMap.put("values",split);
+ resultList.add(oneHourDateMap);
+ }
+ return resultList;
+ }
+
/**
* @Description: ���������������������������mac���������
* @Param: [mac, startDate, endDate]
--
Gitblit v1.8.0