From 9b02f67b17b9dcbd798862021ac0a516d1ba69b3 Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Fri, 06 Nov 2020 15:37:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/service/HistoryDailyService.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/moral/service/HistoryDailyService.java b/src/main/java/com/moral/service/HistoryDailyService.java
index b06a3ba..12c81c9 100644
--- a/src/main/java/com/moral/service/HistoryDailyService.java
+++ b/src/main/java/com/moral/service/HistoryDailyService.java
@@ -4,6 +4,11 @@
import java.util.Map;
public interface HistoryDailyService {
- List<Map<String, Object>> getEmissionsData(Map<String, Object> parameters) throws Exception;
+ List<Map<String, Object>> getEmissionsData(Map<String, Object> parameters) throws Exception;
+ Map getOverproofData(Map<String, Object> parameters) throws Exception;
+
+ Map<String, Double> getTraceabilityData(Map<String, Object> parameters) throws Exception;
+
+ List<Map<String, Object>> getDataByTimeSlot(String mac, String startTime, String endTime) throws Exception;
}
--
Gitblit v1.8.0