Merge remote-tracking branch 'origin/wb' into qa

jinpengyong

2023-10-10 f0837ee21f7650d4413830d4ee90da02bcdd6d36

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

@@ -2,6 +2,8 @@

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.moral.api.entity.HistoryHourly;
import com.moral.api.pojo.dto.Wind.WindData;

import org.apache.ibatis.annotations.Param;

import java.util.List;
@@ -19,6 +21,29 @@

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

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

    List<Map<String,Object>> selectDataByMacsAndTime(@Param("timeUnits") String timeUnits, @Param("list")List list, @Param("time")String time);


    String queryLastHourlyMac(String mac,String time,String timeUnits);


    List<WindData> getArea(Map<String, Object> params);

//    //获取TVOC浓度
//    String getTVOCByMac(@Param("mac") String mac, @Param("time") String time, @Param("sensor") String sensor,@Param("yearAndMonth") String yearAndMonth);
//
//    //获取压强大小
//    String getPressureByMac(@Param("mac") String mac,@Param("time") String time,@Param("yearAndMonth") String yearAndMonth);
//
//
//    Map<String,Object> getDataByMac(@Param("mac") String mac,@Param("time") String time,@Param("yearAndMonth") String yearAndMonth);
    void insertHistoryHourly(Map<String, Object> params);

    void updateHistoryHourly(Map<String, Object> params);

    List<HistoryHourly> listResult(Map<String, Object> params);

    List<HistoryHourly> listLikeResult(Map<String, Object> params);
}