Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb

jinpengyong

2023-10-20 a9cc2343ceaad3e99dc25eb036dc99aeded279a6

 screen-api/src/main/java/com/moral/api/mapper/HistorySecondCruiserMapper.java

@@ -5,6 +5,7 @@

import com.moral.api.entity.HistorySecondCruiser;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.moral.api.pojo.dto.historySecondCruiser.HistorySecondCruiserListDTO;

/**
 * <p>
@@ -18,11 +19,17 @@

    List<Map<String,Object>> getCruiserData(Map<String,Object> params);

    List<HistorySecondCruiserListDTO> getCruiserDataNewAvg(Map<String,Object> params);

    List<String> getDates(Map<String,Object> params);


    String  getDaily(Map<String,Object> params);

    List<Double> getDust(String start,String end,String mac);
    List<String> getDust(String start,String end,String mac);

    List<Map<String,Object>> getDusts(Map<String,Object> params);

    List<Map<String,Object>> getAllCruiserData(Map<String,Object> params);

}