From d7ee12cb208473741f79b64505adccd0653e4654 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 27 Oct 2020 13:44:28 +0800
Subject: [PATCH] vue页面增加误差率参数,沧州剔除非本公司设备显示,报表接口更新

---
 src/main/java/com/moral/service/impl/HistoryServiceImpl.java |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/moral/service/impl/HistoryServiceImpl.java b/src/main/java/com/moral/service/impl/HistoryServiceImpl.java
index f46c6ea..343cdd3 100644
--- a/src/main/java/com/moral/service/impl/HistoryServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/HistoryServiceImpl.java
@@ -117,7 +117,9 @@
     public String queryValueByMacAndTime(String mac, Date time) {
         return historyMapper.selectValueByMacAndTime(mac, time);
     }
-
+    public String getValueByMacAndTime(String mac, String time,String time1) {
+        return historyMapper.getValueByMacAndTime(mac, time,time1);
+    }
     @Override
     public List<Map<String, Object>> getRegionRankingData(Map<String, Object> parameters) {
         ValidateUtil.notNull(parameters.get("regionCode"), "param.is.null");

--
Gitblit v1.8.0