From 6992aaf0587c09f7c511c1afd12e1519d91363d3 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Thu, 14 Dec 2023 15:38:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into qa
---
screen-api/src/main/java/com/moral/api/service/MonitorPointService.java | 33 +++++++++++++++++++++++++++++++++
1 files changed, 33 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 4d2668f..5afe6f1 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,10 +1,12 @@
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;
import java.util.List;
+import java.util.Map;
/**
* <p>
@@ -25,8 +27,39 @@
*/
List<MonitorPoint> queryByOrgIdAndRegionCode(MonitorPointQueryForm form);
+ /**
+ * @Description: ������������id������������������������
+ * @Param: [organizationId]
+ * @return: java.util.List<com.moral.api.entity.MonitorPoint>
+ * @Author: ���������
+ * @Date: 2021/9/26
+ */
List<MonitorPoint> queryAllMonitorPoints(Integer organizationId);
+ 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);
+
+ /**
+ * ������������������������
+ * @return
+ */
+
+ List<MonitorPoint> getOrganizations();
}
--
Gitblit v1.8.0