From 71af09a7d35a1146122776bebac8d51c1903beed Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 04 May 2018 08:55:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/service/AlarmService.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/moral/service/AlarmService.java b/src/main/java/com/moral/service/AlarmService.java
index e3a8a45..4433a59 100644
--- a/src/main/java/com/moral/service/AlarmService.java
+++ b/src/main/java/com/moral/service/AlarmService.java
@@ -1,10 +1,16 @@
package com.moral.service;
+import com.moral.entity.charts.TimeUnits;
+
+import java.util.Date;
+import java.util.List;
import java.util.Map;
@SuppressWarnings("rawtypes")
public interface AlarmService {
- Map getPieData(Map<String, Object> parameters);
+ List<Map> countByTimes(Date start, Date end, TimeUnits timeUnits);
+
+ Map getPieData(Map<String, Object> parameters);
}
--
Gitblit v1.8.0