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 | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java b/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java
index e734433..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,6 @@
package com.moral.service.impl;
+import com.moral.mapper.*;
import io.swagger.models.auth.In;
import java.math.BigDecimal;
@@ -103,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) {
@@ -911,11 +920,11 @@
}*/
values.add(value);
-
-
}
System.out.println(data);
}
return null;
}
+
+
}
--
Gitblit v1.8.0