From 2bcbf240bd4419d01232967915295df61a8e1d84 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 19 Oct 2020 13:20:34 +0800
Subject: [PATCH] 删除测试websocket
---
src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java | 61 ++++++++++++++++++++++++++++++
1 files changed, 61 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java b/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java
index ff5c58b..79ef541 100644
--- a/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java
@@ -1,5 +1,8 @@
package com.moral.service.impl;
+import com.moral.mapper.*;
+import io.swagger.models.auth.In;
+
import java.math.BigDecimal;
import java.text.ParseException;
import java.text.SimpleDateFormat;
@@ -36,6 +39,7 @@
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.time.DateUtils;
+import org.apache.jasper.compiler.JspUtil;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
@@ -63,7 +67,9 @@
import com.moral.mapper.MonitorPointMapper;
import com.moral.mapper.ProvinceMapper;
import com.moral.mapper.SensorMapper;
+import com.moral.mapper.ShAreaMapper;
import com.moral.service.HistoryMinutelyService;
+import com.sun.org.apache.bcel.internal.generic.ANEWARRAY;
import static com.moral.common.bean.Constants.NULL_VALUE;
import static org.springframework.util.ObjectUtils.isEmpty;
@@ -98,6 +104,14 @@
@Resource
private MonitorPointMapper monitorPointMapper;
+ @Resource
+ HistoryFiveMinutelyMapper historyFiveMinutelyMapper;
+
+ @Override
+ public List<Map<String, Object>> getFiveMinutesDataByMacsAndTime(Map<String, Object> parameters) {
+ ValidateUtil.notNull(parameters,"���������������������������������");
+ return historyFiveMinutelyMapper.getFiveMinutesDataByMacsAndTime(parameters);
+ }
@Override
public Map<String, Object> getDayAQIByDevice(Map<String, Object> parameters) {
@@ -380,6 +394,15 @@
parameters.put("timeUnits", "10min");
}
return historyMinutelyMapper.getMonitorPointOrDeviceAvgData(parameters);
+ }
+
+ @Override
+ public List<Map<String, Object>> get(Map<String, Object> parameters) throws Exception {
+ convertQueryParam(parameters);
+ if (!ObjectUtils.isEmpty(parameters.get("compensate"))) {
+ parameters.put("timeUnits", "10min");
+ }
+ return historyMinutelyMapper.getMultiDeviceSensorData(parameters);
}
@Override
@@ -866,4 +889,42 @@
}
return resultList;
}
+
+ @Override
+ public List<Map<String, Object>> getMultiDeviceSensorData(Map<String, Object> parameters) throws Exception {
+ String sensorKey = parameters.get("sensorKey").toString();
+ System.out.println(parameters);
+ String[] macs = parameters.get("macs").toString().split(",");
+ List<String> sensorKeys = new ArrayList<>();
+ sensorKeys.add(sensorKey);
+ parameters.put("sensorKeys", sensorKeys);
+ parameters.put("sensors", sensorKeys);
+ System.out.println(parameters);
+ List<Map<String, Object>> list = new ArrayList<>(24);
+ int max = 0;
+ for (String mac : macs) {
+ parameters.put("mac", mac);
+ List<Map<String, Object>> data = getMonitorPointOrDeviceAvgData(parameters);
+ if (data.size() >= max) {
+ max = data.size();
+ }
+ for (Map<String, Object> map : data) {
+ List<String> values = new ArrayList<>();
+ Map<String, Object> hashMap = new HashMap<>();
+ String time = map.get("time").toString();
+ hashMap.put("time",time);
+ int length = time.length();
+ Integer t = Integer.valueOf(time.substring(time.length() - 2));
+ String value = map.get(sensorKey).toString();
+ /* if (length > 10) {
+
+ }*/
+ values.add(value);
+ }
+ System.out.println(data);
+ }
+ return null;
+ }
+
+
}
--
Gitblit v1.8.0