Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2

ZhuDongming

2019-08-12 a332264920c9cd9226d566c19e36e5d5b5549c1b

 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);



}