xufenglei
2018-07-18 8d2d5103aea98fab6ad94acd1c8421c05d1108fa
src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java
@@ -186,7 +186,8 @@
      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", "")));
            return o1.split("-")[0].compareTo(o2.split("-")[0]);
            //return Integer.compare(Integer.valueOf(o1.split("-")[0].replace("e", "")), Integer.valueOf(o2.split("-")[0].replace("e", "")));
         }
      });
      Map<String, Double> sortMap = new HashMap<String, Double>();
@@ -230,15 +231,21 @@
            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) {
//               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));
               if (key1[0].compareTo(key2[0]) == 0) {
                  return Integer.compare(Integer.valueOf(key1[1]), Integer.valueOf(key2[1]));
               } else {
                  return key1[0].compareTo(key2[0]);
               }
               return Integer.valueOf(sensor1).compareTo(Integer.valueOf(sensor2));
            }
            } else {
            return o2.getValue().compareTo(o1.getValue());
         }
         }
         
      });
      resultMap.put("times", timeList);