From 641b065c69f4311f3ac2b555a9d952e4daab62ad Mon Sep 17 00:00:00 2001 From: jinpengyong <jpy123456> Date: Thu, 02 Jul 2020 13:28:06 +0800 Subject: [PATCH] update --- src/main/java/com/moral/service/MonitorPointService.java | 23 ++++++++++++++++++++++- 1 files changed, 22 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/moral/service/MonitorPointService.java b/src/main/java/com/moral/service/MonitorPointService.java index 452a257..c0fb66d 100644 --- a/src/main/java/com/moral/service/MonitorPointService.java +++ b/src/main/java/com/moral/service/MonitorPointService.java @@ -1,9 +1,12 @@ package com.moral.service; +import java.util.Collection; import java.util.List; import java.util.Map; +import com.alibaba.fastjson.JSONObject; import com.moral.common.bean.PageBean; +import com.moral.entity.Device; import com.moral.entity.MonitorPoint; public interface MonitorPointService { @@ -23,9 +26,27 @@ List<MonitorPoint> getMonitorPointsByName(String name); List<Map<String,String>> queryMonitroPointsState(List<Integer> idList); - List<MonitorPoint> getMonitorPointsByOrganizationId(Integer orgId); + Integer countOfSubOrgs(Integer orgId); + + List<MonitorPoint> getMonitorPointsByOrganizationId(Integer orgId); List<MonitorPoint> getMonitorPointsByRegion(Map<String, Object> parameters); List<Integer> queryVersionsById(Integer id); + + MonitorPoint queryMonitorPointById(Integer mpointId); + + List<MonitorPoint> getMonitorPointsAndDevicesByRegion(Map<String, Object> parameters); + + Collection<Object> getDevicesStateByRegion(Map<String, Object> parameters); + + void isCompensateCalculation(Map<String, Object> parameters); + + Map<String, Object> selectAllById(String id); + + //������monitorPointId������������������������������������ + List<Device> getDeviceList(int id); + + //���������������������������id + JSONObject getMonitorPointById(int id, String Time, int i, String sensor); } -- Gitblit v1.8.0