From 2ab4d484c09bf29d5f63dafb0fec3eda23bc4b4e Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Mon, 25 Dec 2023 14:17:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into cjl
---
screen-api/src/main/java/com/moral/api/service/DataDisplayService.java | 34 +++++++++++++++++++++++++++++++++-
1 files changed, 33 insertions(+), 1 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 869e0a3..20443b0 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,6 +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 java.util.List;
+import java.util.Map;
/**
* @Description: ���������������������������
@@ -9,6 +15,7 @@
* @Author: ���������
* @Date: 2021/9/26
*/
+
public interface DataDisplayService {
/**
@@ -18,5 +25,30 @@
* @Author: ���������
* @Date: 2021/9/26
*/
- void getMonitorPointDisplayData(MonitorPointDataDisplayForm form);
+ List<MonitorPointDataDisplayDTO> getMonitorPointDisplayData(MonitorPointDataDisplayForm form);
+
+ /**
+ * @Description: ���������������������������
+ * @Param: [form]
+ * @return: List<SensorComparisonDisplayDTO>
+ * @Author: ���������
+ * @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);
}
--
Gitblit v1.8.0