fengxiang
2018-04-26 82007c3574640614f688479cc6c6e2ef5d729dbd
src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java
@@ -223,7 +223,17 @@
      Collections.sort(sortList,new Comparator<Map.Entry<String,Double>>(){
         @Override
         public int compare(Entry<String, Double> o1, Entry<String, Double> o2) {
            return o1.getValue().compareTo(o2.getValue());
            if (o2.getValue().compareTo(o1.getValue()) == 0) {
               String[] key1 = o1.getKey().split("-");
               String[] key2 = o2.getKey().split("-");
               String sensor1  = key1[0].replace("e", "");
               String sensor2  = key2[0].replace("e", "");
               if (Integer.valueOf(sensor1).compareTo(Integer.valueOf(sensor2)) == 0) {
                  return Integer.compare(Integer.valueOf(key1[1]), Integer.valueOf(key2[1]));
               }
               return Integer.valueOf(sensor1).compareTo(Integer.valueOf(sensor2));
            }
            return o2.getValue().compareTo(o1.getValue());
         }
         
      });
@@ -325,7 +335,11 @@
         List<Sensor> sensorList = sensorMapper.getSensorsByCriteria(parameters);
         for (Sensor sensor : sensorList) {
            sensorKeys.add(sensor.getSensorKey());
            sensors.add(sensor.getSensorKey() + "-" + sensor.getName() + "-" + sensor.getUnit());
            String string = sensor.getSensorKey() + "-" + sensor.getName() + "-" + sensor.getUnit();
            if (parameters.containsKey("description")) {
               string += "-" + sensor.getDescription();
            }
            sensors.add(string);
         }
      }
      parameters.put("sensorKeys", sensorKeys);