增加 省市区 查询条件

xufenglei

2018-03-30 9b33e93fccddea356c3d686684fc58ceb176ff39

 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;

@@ -76,14 +77,7 @@
      // 今日00:00:00

      parameters.put("end", localDate);

      String[] macKeys = { "e1", "e2", "e10", "e11", "e15", "e16" };

      String sensorKeyColumn = "";

      for (int i = 0; i < macKeys.length; i++) {

         sensorKeyColumn += "AVG(json -> '$." + macKeys[i] + "[0]') " + macKeys[i];

         if (i != macKeys.length -1) {

            sensorKeyColumn += " ,";

         } 
      }

      parameters.put("sensorKeyColumn", sensorKeyColumn);

      parameters.put("sensorKeys", Arrays.asList(macKeys));

      Map<String, Double> average = historyMinutelyMapper.getSersionAvgByDevice(parameters);

      return getAQIByDataMap(average);

   }

@@ -143,44 +137,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("timeTypes"), new TypeReference<Map<String, Object>>() {});

      parameters.remove("timeTypes");

      parameters.putAll(timeType);

      parameters.put("type", parameters.get("value"));

      parameters.remove("value");

      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,161 +252,51 @@
   

   @Override

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

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



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

      List<String> sensorKeys = new ArrayList<String>();

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

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

         List<String> sensors;

         try {

            sensors = JSON.parseObject((String)parameters.get("sensors"), new TypeReference<List<String>>() {});

            parameters.put("sensors", new HashSet<String>(sensors));

            for (String sensor : sensors) {

               sensorKeys.add(sensor.split("-")[0]);

            }

         } catch (Exception e) {

            sensors = new ArrayList<String>();

            sensors.add((String)parameters.get("sensorKey"));

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

            sensors = sensorKeys;

         }

         String sensorKeyColumn = "";

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

            String sensorKey = sensors.get(i).split("-")[0];

            sensorKeyColumn += "AVG(json -> '$." + sensorKey + "[0]') " + sensorKey;

            if (i != sensors.size() - 1) {

               sensorKeyColumn += " ,";

            } 
				
         }

         parameters.put("sensorKeyColumn", sensorKeyColumn);

      }



      //sensorKeys.clear();

      // 监控点平均值

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

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

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

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

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

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

               @Override

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

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

                  Integer deviceVersionId = (Integer) map.get("deviceVersionId");

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

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

                     String sensorKeyColumn = getSensorKeyColumnBySensors(sensors, parameters);

                     parameter.put("sensorKeyColumn", sensorKeyColumn);

                  }

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

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

                     return new ArrayList<Map<String,Object>>();

                  }else {

                     parameter.put("macs", macs);

                     return historyMinutelyMapper.getMonitorPointOrDeviceAvgData(parameter);

                  }

               }

            });

         }

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

            list.addAll(cs.take().get());

         }

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

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

            if (result.containsKey(time)) {

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

            } 
            for (Map.Entry<String,Object> entry  : map.entrySet()) {

               String sensorKey = entry.getKey();

               Number[] doubles = new Number[3];

               Double sum = (Double) entry.getValue();

               Integer count = 1;

               if (times.containsKey(sensorKey)) {

                  doubles = times.get(sensorKey);

                  sum = (Double) doubles[0] + sum;

                  count = (Integer) doubles[1] + 1;

               } 
               doubles[0] = sum;

               doubles[1] = count;

               doubles[2] = new BigDecimal(sum / count).setScale(3, RoundingMode.HALF_UP).doubleValue();

               times.put(sensorKey, doubles);

            }

            result.put(time, times);

         }

         Iterator<Entry<String, Map<String, Number[]>>> iterator = result.entrySet().iterator();

         while(iterator.hasNext()){  
            Entry<String, Map<String, Number[]>> entry = iterator.next();

            String resultTime = entry.getKey();

            Map<String, Number[]> value = entry.getValue();

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

            resultMap.put("time", resultTime);

            for (String sensorKey : value.keySet()) {

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

            }

            resultList.add(resultMap);

         }

      // 设备 平均值	
         sensorsSet = new HashSet<String>(sensors);

      } else {

         // 所有传感器

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

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

            Device device = new Device();

            device.setMac(mac);

            device = deviceMapper.selectOne(device);

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

            String sensorKeyColumn = getSensorKeyColumnBySensors(sensors,parameters);

            parameters.put("sensorKeyColumn", sensorKeyColumn);

				
         List<Sensor> sensors = sensorMapper.getSensorsByCriteria(parameters);

         for (Sensor sensor : sensors) {

            sensorKeys.add(sensor.getSensorKey());

            sensorsSet.add(sensor.getSensorKey() + "-" + sensor.getName() + "-" + sensor.getUnit());

         }

         resultList = historyMinutelyMapper.getMonitorPointOrDeviceAvgData(parameters);

      }

      return resultList;

   }

      parameters.put("sensorKeys", sensorKeys);

      parameters.put("sensors", sensorsSet);



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

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

         sensorKeyColumn += "AVG(json -> '$." + sensorKey + "[0]') " + sensorKey;

         if (i != sensors.size() - 1) {

            sensorKeyColumn += " ,";

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

         parameters.put("sensors", sensorKeys);

      }

      return sensorKeyColumn;

      return historyMinutelyMapper.getMonitorPointOrDeviceAvgData(parameters);

   }



   @Override

@@ -438,9 +315,10 @@
      }

      parameters.put("start", start);

      parameters.put("end", end);

      String sensorKey = (String) parameters.get("macKey");

      String sensorKeyColumn = "AVG(json -> '$." + sensorKey + "[0]') " + sensorKey;

      parameters.put("sensorKeyColumn", sensorKeyColumn);

      String sensorKey = (String) parameters.remove("macKey");

      List<String> sensorKeys = new ArrayList<String>();

      sensorKeys.add(sensorKey);

      parameters.put("sensorKeys", sensorKeys);



      Map<String, Double> average = historyMinutelyMapper.getSersionAvgByDevice(parameters);

      if (isEmpty(average)) {

@@ -523,4 +401,35 @@
      }

      return  lineChartDatasWithEmpty;

   }

	
   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;

   }

}