更改获取五分钟数据结构BUG

kaiyu

2020-12-02 dcf1385a88fdf517e2cc60b50ea2e0a30e5652ca

 src/main/java/com/moral/service/MonitorPointService.java

@@ -3,9 +3,13 @@
import java.util.Collection;

import java.util.List;

import java.util.Map;

import java.util.Set;



import com.alibaba.fastjson.JSONObject;

import com.moral.common.bean.PageBean;

import com.moral.entity.Device;

import com.moral.entity.MonitorPoint;

import org.apache.xmlbeans.impl.jam.mutable.MPackage;



public interface MonitorPointService {



@@ -28,7 +32,11 @@


    List<MonitorPoint> getMonitorPointsByOrganizationId(Integer orgId);



    List<MonitorPoint> getMonitorPointsByOrganizationIds(Set<Integer> orgIds);



   List<MonitorPoint> getMonitorPointsByRegion(Map<String, Object> parameters);



    List<MonitorPoint> getMonitorPointsAndDevicesByRegionNew(Map<String, Object> parameters);



    List<Integer> queryVersionsById(Integer id);



@@ -39,4 +47,20 @@
   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);



    JSONObject getMacList(int id);



    List<MonitorPoint> getMonitorPointListByAccountId(int id);



    MonitorPoint byIdGetMonitorPoint(int id);



    String getOrgIdByMac(String mac);

}