From 5ebd05f0bbb5509dba3a7d5c576307b7b19adf78 Mon Sep 17 00:00:00 2001 From: jinpengyong <jpy123456> Date: Wed, 12 Jul 2023 10:22:00 +0800 Subject: [PATCH] fix: 修补bug --- screen-api/src/main/java/com/moral/api/service/MonitorPointService.java | 28 ++++++++++++++++++++++++---- 1 files changed, 24 insertions(+), 4 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 9195454..9dd3484 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.alibaba.fastjson.JSONObject; 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> @@ -26,12 +28,30 @@ List<MonitorPoint> queryByOrgIdAndRegionCode(MonitorPointQueryForm form); /** - * @Description: ������������������������������������ - * @Param: [regionCode] + * @Description: ������������id������������������������ + * @Param: [organizationId] * @return: java.util.List<com.moral.api.entity.MonitorPoint> * @Author: ��������� - * @Date: 2021/7/16 + * @Date: 2021/9/26 */ - List<MonitorPoint> queryStateControlStationByRegionCode(Integer regionCode); + 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); + + } -- Gitblit v1.8.0