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

cjl

2023-12-14 6992aaf0587c09f7c511c1afd12e1519d91363d3

 screen-api/src/main/java/com/moral/api/service/HistoryFiveMinutelyService.java

@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.moral.api.pojo.dto.historyFiveMinutely.DeviceAndFiveMinuteDataDTO;
import com.moral.api.pojo.form.historyFiveMinutely.QueryDeviceAndFiveMinuteDataForm;
import com.moral.api.pojo.vo.historyFiveMinutely.QueryFiveDataByMacVO;

import java.util.Date;
import java.util.List;
@@ -26,7 +27,7 @@
            * @Author: 陈凯裕
            * @Date: 2021/7/16
            */
    List<DeviceAndFiveMinuteDataDTO> queryDeviceAndFiveMinuteData(QueryDeviceAndFiveMinuteDataForm form);
    List<Map<String, Object>> queryDeviceAndFiveMinuteData(QueryDeviceAndFiveMinuteDataForm form);

    /**
    * @Description: 查询一个设备最新的五分钟数据
@@ -35,9 +36,23 @@
            * @Author: 陈凯裕
            * @Date: 2021/7/23
            */
    HistoryFiveMinutely queryLastDataByMac(String mac);
    Map<String, Object> queryLastDataByMac(String mac);

    //获取5分钟风场数据
    List<Object> getAreaWindData(Map<String,Object> params);
    //获取中心风场风场数据
    List<Object> getAreaWindDataCenter(Map<String,Object> params);

    /**
    * @Description: 获取五分钟弹窗数据，六参+时间+tvoc
            * @Param: [mac]
            * @return: java.util.Map<java.lang.String,java.lang.Object>
            * @Author: 陈凯裕
            * @Date: 2022/3/10
            */
    Map<String,Object> getPopDataByMac(Map<String, Object> params);


   QueryFiveDataByMacVO queryFiveDataByMac(String name,String chooseTime,String time);

}