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

cjl

2023-12-25 2ab4d484c09bf29d5f63dafb0fec3eda23bc4b4e

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

@@ -1,12 +1,12 @@
package com.moral.api.service;

import com.moral.api.pojo.dto.dataDisplay.HeatMapDTO;
import com.moral.api.pojo.dto.dataDisplay.MonitorPointDataDisplayDTO;
import com.moral.api.pojo.dto.dataDisplay.SensorComparisonDisplayDTO;
import com.moral.api.pojo.form.dataDisplay.MonitorPointDataDisplayForm;
import com.moral.api.pojo.form.dataDisplay.SensorComparisonDisplayForm;
import org.springframework.stereotype.Service;

import java.util.List;
import java.util.Map;

/**
* @Description: 数据显示服务层接口
@@ -35,4 +35,20 @@
            * @Date: 2021/10/8
            */
    List<SensorComparisonDisplayDTO> getSensorComparisonDisplayData(SensorComparisonDisplayForm form);
    /**
    * @Description: 获取因子对比图数据第二版
            * @Param: [form]
            * @return: List<SensorComparisonDisplayDTO>
            * @Author: 李子杰
            * @Date: 2022/09/26
            */
    List<SensorComparisonDisplayDTO> getSensorComparisonDisplayDataV2(Map<String, Object> params);


    List<HeatMapDTO> getHeatMapData(String code, String startTime, String type, String form);




    List<HeatMapDTO> getHeatMapDataV2(Integer id, String startTime, String type, String form);
}