1.异常度时间顺序异常

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

@@ -185,6 +185,7 @@ public class AlarmInfoDetailServiceImpl implements IAlarmInfoDetailService {
             IdxBizFanHealthIndex idxBizFanHealthIndex = idxBizFanHealthIndexList.get(i);
             xDatas.add(idxBizFanHealthIndex.getANALYSISTIME());
             yDatas.add(String.valueOf(idxBizFanHealthIndex.getHealthIndex()));
+            alarmAbnormalityItem.put("sort", String.valueOf(i));
             alarmAbnormalityItem.put("time", idxBizFanHealthIndex.getANALYSISTIME());
             alarmAbnormalityItem.put("abnormal", String.valueOf(idxBizFanHealthIndex.getANOMALY()).replace("null","0.0"));
             alarmAbnormalityItem.put("healthValue", String.valueOf(idxBizFanHealthIndex.getHealthIndex()));
@@ -217,7 +218,9 @@ public class AlarmInfoDetailServiceImpl implements IAlarmInfoDetailService {
         result.put("alarmTrend", alarmTrendMap);
         //  异常度 alarmAbnormality
         int alarmAbnormalitySize = idxBizFanHealthIndexListSize >= 3 ? 3 : idxBizFanHealthIndexListSize;
-        result.put("alarmAbnormalityList", alarmAbnormalityList.subList(alarmAbnormalityList.size() - alarmAbnormalitySize, alarmAbnormalityList.size()));
+        alarmAbnormalityList=alarmAbnormalityList.subList(alarmAbnormalityList.size() - alarmAbnormalitySize, alarmAbnormalityList.size());
+        alarmAbnormalityList.sort(Comparator.comparingInt(o->Integer.parseInt(o.get("sort"))));
+        result.put("alarmAbnormalityList", alarmAbnormalityList);
         result.put("startTime", startTime);
         result.put("endTime", endTime);
         return result;
@@ -249,6 +252,7 @@ public class AlarmInfoDetailServiceImpl implements IAlarmInfoDetailService {
             IdxBizPvHealthIndex idxBizPvHealthIndex = idxBizPvHealthIndexList.get(i);
             xDatas.add(idxBizPvHealthIndex.getANALYSISTIME());
             yDatas.add(String.valueOf(idxBizPvHealthIndex.getHealthIndex()));
+            alarmAbnormalityItem.put("sort", String.valueOf(i));
             alarmAbnormalityItem.put("time", idxBizPvHealthIndex.getANALYSISTIME());
             alarmAbnormalityItem.put("abnormal", String.valueOf(idxBizPvHealthIndex.getANOMALY()).replace("null","0.0"));
             alarmAbnormalityItem.put("healthValue", String.valueOf(idxBizPvHealthIndex.getHealthIndex()));
@@ -281,7 +285,9 @@ public class AlarmInfoDetailServiceImpl implements IAlarmInfoDetailService {
         result.put("alarmTrend", alarmTrendMap);
         //  异常度 alarmAbnormality
         int alarmAbnormalitySize = idxBizPvHealthIndexListSize >= 3 ? 3 : idxBizPvHealthIndexListSize;
-        result.put("alarmAbnormalityList", alarmAbnormalityList.subList(alarmAbnormalityList.size() - alarmAbnormalitySize, alarmAbnormalityList.size()));
+        alarmAbnormalityList=alarmAbnormalityList.subList(alarmAbnormalityList.size() - alarmAbnormalitySize, alarmAbnormalityList.size());
+        alarmAbnormalityList.sort(Comparator.comparingInt(o->Integer.parseInt(o.get("sort"))));
+        result.put("alarmAbnormalityList", alarmAbnormalityList);
         result.put("startTime", startTime);
         result.put("endTime", endTime);
         return result;