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,11 +1,10 @@
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;

@@ -44,4 +43,12 @@
            * @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);
}