From 4a64c0801f147536ed0a9d09977941f313a286ae Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 18 Aug 2023 16:19:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into wb
---
screen-api/src/main/java/com/moral/api/service/DataDisplayService.java | 20 ++++++++++++++++++++
1 files changed, 20 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 dace3a1..feb92a1 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,10 +1,13 @@
package com.moral.api.service;
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: ���������������������������
@@ -24,4 +27,21 @@
* @Date: 2021/9/26
*/
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);
}
--
Gitblit v1.8.0