Merge remote-tracking branch 'origin/master'

fengxiang

2018-02-01 af8dd6eccb0aab770246ae44db1cde4e531416c5

 src/main/java/com/moral/mapper/HistoryMapper.java

@@ -3,31 +3,8 @@
import java.util.List;

import java.util.Map;



import org.apache.ibatis.annotations.Mapper;

public interface HistoryMapper{



import com.moral.entity.History;

import com.moral.entity.HistoryExample;

import org.apache.ibatis.annotations.Param;



@Mapper

public interface HistoryMapper extends BaseMapper<History, HistoryExample, Integer> {



   int countByExample(HistoryExample example);



   int deleteByExample(HistoryExample example);



   int insert(History record);



   int insertSelective(History record);



   List<History> selectByExample(HistoryExample example);



   int updateByExampleSelective(@Param("record") History record, @Param("example") HistoryExample example);



   int updateByExample(@Param("record") History record, @Param("example") HistoryExample example);



   Map<String, Double> getDayAQIByDevice(Map<String, Object> parameters);



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

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



}