From 02a6c170797c5d2750ed07b21f22396a7683c54e Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 25 Oct 2023 15:00:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa
---
screen-api/src/main/java/com/moral/api/service/MonitorPointService.java | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/MonitorPointService.java b/screen-api/src/main/java/com/moral/api/service/MonitorPointService.java
index dd0ca7b..69bfe79 100644
--- a/screen-api/src/main/java/com/moral/api/service/MonitorPointService.java
+++ b/screen-api/src/main/java/com/moral/api/service/MonitorPointService.java
@@ -1,5 +1,6 @@
package com.moral.api.service;
+import com.moral.api.dto.MonitoringStationDTO;
import com.moral.api.entity.MonitorPoint;
import com.baomidou.mybatisplus.extension.service.IService;
import com.moral.api.pojo.form.device.MonitorPointQueryForm;
@@ -37,5 +38,21 @@
List<Map<String, Object>> getHourlyDataByMonitorPoint(Map map);
+ /**
+ * ������������������������
+ * @param params
+ * @return
+ */
+ List<Map<String, Object>> getHourlyDataDataV3(Map<String, Object> params);
+
+ /**
+ * ������������������������
+ * @param params
+ * @return
+ */
+ List<Map<String, Object>> getHourlyDataDataV3Excel(Map<String, Object> params);
+
+ List<MonitoringStationDTO> listMonitoringStationDTO(Map<String, Object> params, int reportType, String startTime, String endTime);
+
}
--
Gitblit v1.8.0