站点排名

lizijie

2019-08-30 5fed7b486fea656ae9878166e3530b7e29eae7eb

 src/main/java/com/moral/service/impl/HistoryServiceImpl.java

@@ -1,5 +1,6 @@
package com.moral.service.impl;



import java.text.SimpleDateFormat;

import java.time.Instant;

import java.time.LocalDate;

import java.time.LocalDateTime;

@@ -33,6 +34,7 @@
import com.moral.entity.Sensor;

import com.moral.mapper.DeviceMapper;

import com.moral.mapper.HistoryMapper;

import com.moral.mapper.MonitorPointMapper;

import com.moral.mapper.OrganizationRelationMapper;

import com.moral.mapper.SensorMapper;

import com.moral.mapper.SensorUnitMapper;

@@ -61,6 +63,9 @@
    

    @Resource

    private OrganizationRelationMapper organizationRelationMapper;

    
    @Resource

    private MonitorPointMapper monitorPointMapper;



   @Override

   public Map<String, Object> getAllSensorAverageByDevice(Map<String, Object> parameters) throws Exception {

@@ -382,7 +387,7 @@
   }



   @Override

   public Map<String, Object> getMointorPointRankByOrganizationId(Map<String, Object> parameters) {

   public List<Map<String, Object>> getMointorPointRankByOrganizationId(Map<String, Object> parameters) {

      //获取组织id

      String organizationId = parameters.get("organization_id").toString();

      //声明一个集合存放要查询站点数据的组织id

@@ -396,11 +401,9 @@
      for(int i=0;i<10;i++) {

         if(!parentIdList.isEmpty()) {

            //或去该组织下的子组织

            System.out.println("parentIdList:"+parentIdList);

            List<Map<String, Object>> childIdList = organizationRelationMapper.getChildIdByParentId(parentIdList);

            //清空父组织id集合

            parentIdList.clear();

            System.out.println("childIdList:"+childIdList);

            //将子组织id放入到集合中

            for (Map<String, Object> map : childIdList) {

               organizationIdList.add(map.get("child_id"));

@@ -412,6 +415,27 @@
      }

      System.out.println(organizationIdList);

      

      return null;

      //根据组织id获取站点id

      List<Map<String, Object>> monitorPointIdListMap = monitorPointMapper.getIdByOrganizationId(organizationIdList);

      //将List<Map<String, Object>>装换为List<Object>

      List<Object> monitorPointIdList = new ArrayList<>();

      for (Map<String, Object> map : monitorPointIdListMap) {

         monitorPointIdList.add(map.get("id"));

      }

		
      //通过站点id获取设备因子的排名

      //获取系统当前时间

      Calendar rightNow = Calendar.getInstance();

      //获取五分钟前的时间

      Calendar beforeTime = Calendar.getInstance();

      beforeTime.add(Calendar.MINUTE, -5);// 5分钟之前的时间

      Date beforeD = beforeTime.getTime();

      Date end = rightNow.getTime();

      String endTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(end);

      String before5Time = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(beforeD);  // 前五分钟时间

		
      String sensor = parameters.get("sensor").toString();

      List<Map<String, Object>> result = historyMapper.getAVGSensorRankByMonitorPointIdList(sensor, monitorPointIdList, before5Time, endTime);

      return result;

   }

}