Merge remote-tracking branch 'origin/cjl' into dev

cjl

2023-11-02 a0a6f95ec5b92be03385eea83b64bf97fcbfa17e

 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>
@@ -16,6 +17,19 @@
 */
public interface HistorySecondCruiserMapper extends BaseMapper<HistorySecondCruiser> {

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

}