报表 优化

xufenglei

2018-03-28 530aeddc3a2fc1310f68f6c76c82fb4aa99145b4

 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.Calendar;

import java.util.Collections;

import java.util.Comparator;

import java.util.Date;

@@ -26,6 +27,7 @@
import java.util.concurrent.ExecutorCompletionService;

import java.util.concurrent.ExecutorService;

import java.util.concurrent.Executors;

import java.util.stream.Collectors;



import javax.annotation.Resource;



@@ -142,42 +144,37 @@
   @Override

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

      Map<String, List<Object>> resultMap = new HashMap<String, List<Object>>();

      List<Map<String, Object>> list = JSON.parseObject((String)parameters.get("items"), new TypeReference<List<Map<String, Object>>>() {});

      parameters.remove("items");

      Map<String, Object> timeType = JSON.parseObject((String)parameters.get("timeType"), new TypeReference<Map<String, Object>>() {});

      parameters.remove("timeType");

      parameters.putAll(timeType);

      List<Map<String, Object>> list = JSON.parseObject((String)parameters.remove("items"), new TypeReference<List<Map<String, Object>>>() {});

      

      ExecutorService threadPool = Executors.newCachedThreadPool();

      CompletionService<Map<String, List<Object>>> cs = new ExecutorCompletionService<Map<String, List<Object>>>(threadPool);



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

      parameters.putAll(getElementByType(type));

      Integer timeLength = Integer.valueOf(parameters.remove("timeLength").toString());

      if ("month".equals(type)) {

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

            int timeLength = Integer.valueOf(parameters.get("timeLength").toString());

            String[] formatTime = map.get("formatTime").toString().split("-");

            LocalDate localDate = LocalDate.of(Integer.valueOf(formatTime[0]), Integer.valueOf(formatTime[1]), 1);

            int lengthOfMonth = localDate.lengthOfMonth();

            if (lengthOfMonth > timeLength) {

               parameters.put("timeLength", lengthOfMonth);

               timeLength = lengthOfMonth;

            }

         }

      }

      

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

      for (int i = 0; i <Integer.valueOf(parameters.get("timeLength").toString()); i++) {

      for (int i = 0; i < timeLength; i++) {

         timeList.add(i, String.format("%02d", "day".equals(type) || "hour".equals(type) ? i : i + 1));

      }

      parameters.put("timeList", timeList);

      

      ExecutorService threadPool = Executors.newCachedThreadPool();

      CompletionService<Map<String, List<Object>>> cs = new ExecutorCompletionService<Map<String, List<Object>>>(threadPool);

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

         Map<String, Object> map = list.get(i);

         map.put("part", i);

         if (ObjectUtils.isEmpty(map.get("mac"))) {

            map.remove("mac");

         }

         map.put("time", map.get("formatTime"));

         map.remove("formatTime");

         map.put("time", map.remove("formatTime"));

         map.putAll(parameters);

         cs.submit(new Callable<Map<String, List<Object>>>() {

            @Override

@@ -265,27 +262,20 @@
      List<Map<String, Object>> resultList ;



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

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

         parameters.putAll(getElementByType(type));

      }

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

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

      Integer field = Integer.valueOf(parameters.get("field").toString());

      Date start = DateUtils.parseDate(time, format), end = null ;

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

         end = DateUtils.parseDate((String)parameters.get("timeb"), format);

      } else {

         switch (type) {

         case "year":

            end = DateUtils.addYears(start, 1);

            break;

         case "month":

            end = DateUtils.addMonths(start, 1);

            break;

         case "day":

            end = DateUtils.addDays(start, 1);

            break;

         case "hour":

            end = DateUtils.addHours(start, 1);

            break;

         }

			
         Calendar instance = Calendar.getInstance();

         instance.setTime(start);

         instance.add(field, 1);

         end = instance.getTime();

      }

      parameters.put("start", start);

      parameters.put("end", end);

@@ -315,7 +305,7 @@
      // 监控点平均值

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

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

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

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

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

         ExecutorService threadPool = Executors.newCachedThreadPool();

         CompletionService<List<Map<String, Object>>> cs = new ExecutorCompletionService<List<Map<String, Object>>>(threadPool);

@@ -346,8 +336,7 @@
         }

         Map<String, Map<String, Number[]>> result = new LinkedHashMap<String, Map<String, Number[]>>();

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

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

            map.remove("time");

            time = (String) map.remove("time");

            Map<String, Number[]> times = new HashMap<String, Number[]>();

            if (result.containsKey(time)) {

               times = (Map<String, Number[]>) result.get(time);

@@ -454,68 +443,101 @@
    * @return

    */

   @Override

   public Map<String, List<List<PairData>>> queryLineChartDateByCrieria(LineChartCriteria lineChartCriteria){

       Map<String,List<List<PairData>>> listMap = new HashMap<>();

       for(String sensorKey:lineChartCriteria.getSensorKeys()){

            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);

            });

            listMap.put(sensorKey,list);

        }



   public Map<String, List<List<Double>>> queryLineChartDateByCrieria(LineChartCriteria lineChartCriteria){

       Map<String,List<List<Double>>> listMap = new HashMap<>();

      List<String> sensorKeys = lineChartCriteria.getSensorKeys();

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

      TimePeriod timePeriod = lineChartCriteria.getTimePeriod();

      sensorKeys.forEach(sensorKey -> {

         listMap.put(sensorKey,new ArrayList<List<Double>>(dataConditionList.size()));

      });

      dataConditionList.forEach(dataCondition -> {

         Map<String,List<Double>> dataMap =  queryOneLineChartDateByCrieria(sensorKeys,timePeriod,dataCondition);

         // 数据装载

         listMap.forEach( (sensorKey,list) -> {

            List<Double> rowData = dataMap.get(sensorKey);

            list.add(rowData);

         });

      });

      return  listMap;

   }



   /**

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

    * @param sensorKey

    * 根据线性表单的条件规则，获取一条线性表单数据,包含 所有检测项目

    * @param sensorKeys

    * @param timePeriod

    * @param dataCondition

    * @return

    */

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

   public Map<String,List<Double>> queryOneLineChartDateByCrieria(List<String> sensorKeys, TimePeriod timePeriod, DataCondition dataCondition){

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

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

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

      List<Map<String,Object>> lineChartDatas = historyMinutelyMapper.selectLineChartDateByCrieria(sensorKeys,timePeriod,dataCondition);

      Map<String,List<Double>> lineChartDatasWithEmpty = new HashMap<>();

      // lineChartDatasWithEmpty 初始化

      sensorKeys.forEach(sensorKey -> {

         lineChartDatasWithEmpty.put(sensorKey,timeList.stream().map(time -> {

            Double data = null;

            return data;

         }).collect(Collectors.toList()));

      });

      // m 为查询data的index，此处要防止m越界

      int m = 0;

      int dataLength = lineChartDatas.size()-1;

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

      if(m>-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));

            }



             if(m>-1) {

                String time = timeList.get(n);

                Map<String,Object> rowData = lineChartDatas.get(m);

                String keyTime = rowData.get("format_time").toString();

                if(time.equals(keyTime)){

                   // list to map

                   int finalN = n;

                   sensorKeys.forEach(sensorKey -> {

                       Object value = rowData.get(sensorKey);

                      List<Double> lineChartDatasWithEmptyTemp = lineChartDatasWithEmpty.get(sensorKey);

                      if(finalN < lineChartDatasWithEmptyTemp.size()){

                         Double sensorValue = value!= null?new Double(value.toString()):null;

                         lineChartDatasWithEmptyTemp.set(finalN,sensorValue);

                      }

                   });

                   // 置为 -1，防止越界

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

                }

             }

         }

      }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);

      });

	
   private Map<String, Object> getElementByType(Object type){

      Map<String, Object> resultMap = new HashMap<String, Object>();

      switch (type.toString()) {

      case "year":

         resultMap.put("format", "yyyy");

         resultMap.put("typeFormat", "%Y-%m");

         resultMap.put("timeLength", 12);

         resultMap.put("field", Calendar.YEAR);

         break;

      case "month":

         resultMap.put("format", "yyyy-MM");

         resultMap.put("typeFormat", "%Y-%m-%d");

         resultMap.put("timeLength", 28);

         resultMap.put("field", Calendar.MONTH);

         break;

      case "day":

         resultMap.put("format", "yyyy-MM-dd");

         resultMap.put("typeFormat", "%Y-%m-%d %H");

         resultMap.put("timeLength", 24);

         resultMap.put("field", Calendar.DATE);

         break;

      case "hour":

         resultMap.put("format", "yyyy-MM-dd HH");

         resultMap.put("typeFormat", "%Y-%m-%d %H:%i");

         resultMap.put("timeLength", 60);

         resultMap.put("field", Calendar.HOUR);

         break;

      }

      return resultMap;

   }

}