解决冲突

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/MonitorFanIndicatorImpl.java

@@ -567,7 +567,8 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
         List<String> windSpeeds = new ArrayList<>();
         List<String> activePowers = new ArrayList<>();
         List<String> axisData = new ArrayList<>();
-        for (int i = 0; i < indicatorDataListWindSpeed.size(); i++) {
+        Integer size = indicatorDataListWindSpeed.size()>indicatorDataListActivePower.size() ? indicatorDataListActivePower.size():indicatorDataListWindSpeed.size();
+        for (int i = 0; i < size; i++) {
             windSpeeds.add(indicatorDataListWindSpeed.get(i).getValue());
             activePowers.add(indicatorDataListActivePower.get(i).getValue());
             axisData.add(DateUtil.format(indicatorDataListWindSpeed.get(i).getCreatedTime(), "HH:mm"));
@@ -2138,7 +2139,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
     }
 
 
-    public ResultsData getDeaviAtionRate(String gatewayId, String zz, String nbq, String hlx) {
+	public ResultsData getDeaviAtionRate(String gatewayId, String zz, String nbq, String hlx) {
         ArrayList<Map<String, Object>> resultList = new ArrayList<>();
         Map<String, List<String>> queryConditon = new HashMap<>();
         queryConditon.put(CommonConstans.QueryStringGateWayId, Arrays.asList(gatewayId));
@@ -2174,12 +2175,23 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
                 if (c < 0) {
                     c = -c;
                 }
-                double lsv = c / avageValue;
-                lsv = Double.valueOf(String.format(CommonConstans.Twodecimalplaces, lsv));
-                resultMap.put("lsv", lsv);
+                double pcv = c / avageValue;
+                pcv = Double.valueOf(String.format(CommonConstans.Twodecimalplaces, pcv));
+                resultMap.put("pcv", pcv);
                 resultList.add(resultMap);
             }
         }
+        
+        Collections.sort(resultList, new Comparator<Map<String, Object>>() {
+            public int compare(Map<String, Object> o1, Map<String, Object> o2) {
+                String str1 = o1.get("hlx").toString();
+                String str2 = o2.get("hlx").toString();
+                //str1在前，str2在后，默认升序，这里Integer类型的也可以
+                return str1.compareTo(str2);
+            }
+        });
+
+        
         // 构建平台数据
         DataGridMock DataGridMock = new DataGridMock(0, resultList.size(), false, 0, resultList);
         ColModel colModelEventMovement = new ColModel("hlx", "hlx", "汇流箱", "汇流箱", "dataGrid", "hlx");