From 2d4d397ce9ea8e53d4a63b6463c02a7586fb27ea Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Thu, 08 Aug 2019 17:03:55 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2

---
 src/main/java/com/moral/service/AlarmService.java |    6 +++++-
 1 files changed, 5 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..dcad103 100644
--- a/src/main/java/com/moral/service/AlarmService.java
+++ b/src/main/java/com/moral/service/AlarmService.java
@@ -1,10 +1,14 @@
 package com.moral.service;
 
+import java.util.Date;
+import java.util.List;
 import java.util.Map;
+
+import com.moral.entity.charts.TimeUnits;
 
 @SuppressWarnings("rawtypes")
 public interface AlarmService {
 
-	Map getPieData(Map<String, Object> parameters);
+    List<Map> countByTimes(Date start, Date end, TimeUnits timeUnits);
 
 }

--
Gitblit v1.8.0