From 68e750bf109efb0469704e54e48a29649512358c Mon Sep 17 00:00:00 2001 From: cjl <276999030@qq.com> Date: Mon, 18 Dec 2023 13:31:54 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into cjl --- screen-api/src/main/java/com/moral/api/service/DataDisplayService.java | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/screen-api/src/main/java/com/moral/api/service/DataDisplayService.java b/screen-api/src/main/java/com/moral/api/service/DataDisplayService.java index feb92a1..3f0c7db 100644 --- a/screen-api/src/main/java/com/moral/api/service/DataDisplayService.java +++ b/screen-api/src/main/java/com/moral/api/service/DataDisplayService.java @@ -1,11 +1,14 @@ 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.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -44,4 +47,7 @@ * @Date: 2022/09/26 */ List<SensorComparisonDisplayDTO> getSensorComparisonDisplayDataV2(Map<String, Object> params); + + + List<HeatMapDTO> getHeatMapData(String code, String startTime, String type, String form); } -- Gitblit v1.8.0