From 3a46aae0a8e9e4bd3cb8dcd1185a69a74668995b Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 15 Dec 2020 14:08:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/service/HistoryDailyService.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/moral/service/HistoryDailyService.java b/src/main/java/com/moral/service/HistoryDailyService.java
index fa19eb8..12c81c9 100644
--- a/src/main/java/com/moral/service/HistoryDailyService.java
+++ b/src/main/java/com/moral/service/HistoryDailyService.java
@@ -4,8 +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 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