Merge remote-tracking branch 'origin/master'

fengxiang

2018-03-13 7f905053f3f879092e18558401185dd6595dbe10

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

@@ -9,6 +9,7 @@
import java.time.temporal.TemporalAdjusters;

import java.util.ArrayList;

import java.util.Arrays;

import java.util.Collection;

import java.util.Collections;

import java.util.Comparator;

import java.util.Date;

@@ -26,9 +27,16 @@
import java.util.concurrent.ExecutorCompletionService;

import java.util.concurrent.ExecutorService;

import java.util.concurrent.Executors;

import java.util.stream.Collector;

import java.util.stream.Collectors;



import javax.annotation.Resource;



import com.moral.common.util.ReportTimeFormat;

import com.moral.entity.charts.DataCondition;

import com.moral.entity.charts.LineChartCriteria;

import com.moral.entity.charts.PairData;

import com.moral.entity.charts.TimePeriod;

import org.apache.commons.lang3.time.DateUtils;

import org.springframework.stereotype.Service;

import org.springframework.util.ObjectUtils;

@@ -59,7 +67,6 @@
   private SensorMapper sensorMapper;



   // volatile

   private Set<String> sensorKeys = new HashSet<String>();



   @Override

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

@@ -184,15 +191,27 @@
         dataList.add(cs.take().get());

      }

      Map[] maps = new HashMap[list.size()];

      Set<String> sensors = new TreeSet<String>(new Comparator<String>() {

         @Override

         public int compare(String o1, String o2) {

            return Integer.compare(Integer.valueOf(o1.split("-")[0].replace("e", "")), Integer.valueOf(o2.split("-")[0].replace("e", "")));

         }

      });

      for (Object object : dataList) {

         Map<String, Object> map = (Map<String, Object>)object;

         for (String key : map.keySet()) {

            int index = Integer.valueOf(key.replace("data", ""));

            maps[index] = map;

            if (key.startsWith("data")) {

               int index = Integer.valueOf(key.replace("data", ""));

               maps[index] = map;

            }

            if (key.startsWith("sensors")) {

               sensors.addAll((List<String>) map.get(key));

            }

         }

      }

      resultMap.put("time", timeList);

      resultMap.put("data", Arrays.asList(maps));

      resultMap.put("times", timeList);

      resultMap.put("datas", Arrays.asList(maps));

      resultMap.put("sensors", new ArrayList<Object>(sensors));

      return resultMap;

   }



@@ -246,12 +265,13 @@
      dataList.add(doubleMap);

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

      resultMap.put("data" + part, dataList);

      resultMap.put("sensors" + part, new ArrayList<Object>(sensors));

      return resultMap;

   }

   

   @Override

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

      List<Map<String, Object>> resul ;

      List<Map<String, Object>> resultList ;



      String type = (String) parameters.get("type");

      String time = (String) parameters.get("time");

@@ -285,10 +305,10 @@
         parameters.put("sensorKeyColumn", sensorKeyColumn);

      }



      sensorKeys.clear();

      //sensorKeys.clear();

      // 监控点平均值

      if (!parameters.containsKey("mac")) {

         resul = new ArrayList<Map<String,Object>>();

         resultList = new ArrayList<Map<String,Object>>();

         Integer monitorPointId = Integer.valueOf(parameters.get("monitorPoint").toString());

         List<Map<String, Object>> deviceVersions = deviceMapper.getDeviceVersionIdByMonitorPoint(monitorPointId);

         ExecutorService threadPool = Executors.newCachedThreadPool();

@@ -302,9 +322,8 @@
                  Integer deviceVersionId = (Integer) map.get("deviceVersionId");

                  if (!parameter.containsKey("sensorKeyColumn")) {

                     List<Map<String, Object>> sensors = sensorMapper.getSensorsByDeviceVersionId(deviceVersionId);

                     String sensorKeyColumn = getSensorKeyColumnBySensors(sensors);

                     String sensorKeyColumn = getSensorKeyColumnBySensors(sensors, parameters);

                     parameter.put("sensorKeyColumn", sensorKeyColumn);

                     parameters.put("sensors", sensorKeys);

                  }

                  List<String> macs = deviceMapper.getDeviceMacByMonitorPointAndDeviceVersion(monitorPointId, deviceVersionId);

                  if (ObjectUtils.isEmpty(macs) || macs.contains("null") ) {

@@ -354,7 +373,7 @@
            for (String sensorKey : value.keySet()) {

               resultMap.put(sensorKey, value.get(sensorKey)[2]);

            }

            resul.add(resultMap);

            resultList.add(resultMap);

         }

      // 设备 平均值   

      } else {

@@ -365,19 +384,21 @@
            device.setMac(mac);

            device = deviceMapper.selectOne(device);

            List<Map<String, Object>> sensors = sensorMapper.getSensorsByDeviceVersionId(device.getDeviceVersionId());

            String sensorKeyColumn = getSensorKeyColumnBySensors(sensors);

            String sensorKeyColumn = getSensorKeyColumnBySensors(sensors,parameters);

            parameters.put("sensorKeyColumn", sensorKeyColumn);

            parameters.put("sensors", sensorKeys);

            

         }

         resul = historyMinutelyMapper.getMonitorPointOrDeviceAvgData(parameters);

         resultList = historyMinutelyMapper.getMonitorPointOrDeviceAvgData(parameters);

      }

      return resul;

      return resultList;

   }



   private String getSensorKeyColumnBySensors(List<Map<String, Object>> sensors) {

   private String getSensorKeyColumnBySensors(List<Map<String, Object>> sensors,Map<String, Object> parameters) {

      String sensorKeyColumn = "";

		
      Set<String> sensorKeys = new HashSet<String>();

      if (parameters.containsKey("sensors")) {

         sensorKeys = (Set<String>) parameters.get("sensors");

      }

      for (int i = 0; i < sensors.size(); i++) {

         String sensorKey = (String) sensors.get(i).get("sensor_key");

         String name = (String) sensors.get(i).get("name");

@@ -387,6 +408,7 @@
            sensorKeyColumn += " ,";

         } 

         sensorKeys.add(sensorKey + "-" + name + "-" + unit );

         parameters.put("sensors", sensorKeys);

      }

      return sensorKeyColumn;

   }

@@ -420,4 +442,70 @@
      return result;

   }



   /**

    * 根据线性表单的条件规则，获取多条线性表单数据

    * @param lineChartCriteria

    * @return

    */

   @Override

   public List<List<PairData>> queryLineChartDateByCrieria(LineChartCriteria lineChartCriteria){

        String sensorKey = lineChartCriteria.getSensorKey();

        TimePeriod timePeriod = lineChartCriteria.getTimePeriod();

      List<DataCondition> dataConditionList = lineChartCriteria.getDataConditions();

      List<List<PairData>> list =  new ArrayList<>();

      dataConditionList.forEach(item -> {

         List<PairData> pairDataList =  queryOneLineChartDateByCrieria(sensorKey,timePeriod,item);

         list.add(pairDataList);

      });

      return  list;

   }



   /**

    * 根据线性表单的条件规则，获取一条线性表单数据

    * @param sensorKey

    * @param timePeriod

    * @param dataCondition

    * @return

    */

   public List<PairData> queryOneLineChartDateByCrieria(String sensorKey, TimePeriod timePeriod, DataCondition dataCondition){

      List<String> timeList = ReportTimeFormat.makeTimeList(timePeriod);

      List<PairData> lineChartDatas = historyMinutelyMapper.selectLineChartDateByCrieria(sensorKey,timePeriod,dataCondition);

      List<PairData> lineChartDatasWithEmpty = new ArrayList<>();

      int m = 0;

      int dataLength = lineChartDatas.size()-1;

      m = dataLength>-1?0:-1;

      if(m>-1){

         for(int n =0;n<timeList.size();n++){

            String time = timeList.get(n);

            if(m>-1){

               PairData pairData = lineChartDatas.get(m);

               String keyTime = pairData.getCategory();

               if(time.equals(keyTime)){

                  lineChartDatasWithEmpty.add(pairData);

                  m = m<dataLength ? m+1 : -1;

               }else{

                  lineChartDatasWithEmpty.add(generateEmptyData(time));

               }

            }else {

                   lineChartDatasWithEmpty.add(generateEmptyData(time));

            }



         }

      }else{

         fillEmptyDataToList(timeList,lineChartDatasWithEmpty);

      }

      return  lineChartDatasWithEmpty;

   }

   private PairData generateEmptyData(String time) {

      PairData pairData = new PairData();

      pairData.setCategory(time);

      pairData.setValue(null);

      return pairData;

   }

   private void fillEmptyDataToList(List<String> timeList,List<PairData> lineChartDatasWithEmpty){

        timeList.forEach( time ->{

         PairData pairData = generateEmptyData(time);

           lineChartDatasWithEmpty.add(pairData);

      });

   }

}