From 98fbc9bef757f5988bd1f567033f46665386c454 Mon Sep 17 00:00:00 2001 From: jinpengyong <jpy123456> Date: Tue, 24 Oct 2023 10:23:00 +0800 Subject: [PATCH] chore:修复日数据空指针异常 --- screen-api/src/main/java/com/moral/api/service/MonitorPointService.java | 19 +++++++++++++++++++ 1 files changed, 19 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 953a122..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,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> @@ -34,6 +36,23 @@ */ 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); } -- Gitblit v1.8.0