Merge remote-tracking branch 'origin/master'

沈斌

2017-11-07 ba9a621c55f520be8e26cdb0d3ad61b5246b2fc1

 src/main/java/com/moral/monitor/dao/HistoryEntityMapper.java

@@ -7,7 +7,12 @@
import com.moral.monitor.entity.HistoryEntityExample;



public interface HistoryEntityMapper extends BaseDao<HistoryEntity, HistoryEntityExample, Integer>{

    Map<String, Object> getMonthAverageBySensor(Map<String, Object> parameters);



   List<Map<String, Object>> getAverageByAll(Map<String, Object> parameters); 
   Map<String, Object> getMonthAverageBySensor(Map<String, Object> parameters);



   List<Map<String, Object>> getAverageByAll(Map<String, Object> parameters);



   List<Map<String, Object>> getEquipmentStates(Map<String, Object> parameters); 


   String getMacLogByLast(); 
}