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/mapper/HistoryDailyMapper.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/moral/mapper/HistoryDailyMapper.java b/src/main/java/com/moral/mapper/HistoryDailyMapper.java
index 7a0c48f..ee8532a 100644
--- a/src/main/java/com/moral/mapper/HistoryDailyMapper.java
+++ b/src/main/java/com/moral/mapper/HistoryDailyMapper.java
@@ -1,12 +1,18 @@
package com.moral.mapper;
+import org.apache.ibatis.annotations.Param;
+
import java.util.List;
import java.util.Map;
public interface HistoryDailyMapper {
- List<Map<String, Object>> getEmissionsData(Map<String, Object> parameters);
+ List<Map<String, Object>> getEmissionsData(Map<String, Object> parameters);
- List<Map<String, Object>> getOverproofData(Map<String, Object> parameters);
+ List<Map<String, Object>> getOverproofData(Map<String, Object> parameters);
+ // ���������������������������������������������
+ Map<String, Double> getTraceabilityData(Map<String, Object> parameters);
+
+ List<Map<String, Object>> getDataByTimeSlot(@Param("mac") String mac, @Param("startTime") String startTime, @Param("endTime") String endTime);
}
--
Gitblit v1.8.0