提交指数趋势排序

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/TDBigScreenAnalyseController.java

@@ -1663,7 +1663,13 @@ public class TDBigScreenAnalyseController extends BaseController implements Appl
 
 		Map<String, Object> resultMap = new HashMap<>();
 		List<FanHealthIndex> fanHealthIndexList = fanHealthIndexMapper.selectList(lambdaQueryWrapper);
-
+		if(CollectionUtil.isNotEmpty(fanHealthIndexList)){
+			Collections.sort(fanHealthIndexList, (o1, o2) -> {
+				Date date1 = DateUtils.dateParse(o1.getRecDate());
+				Date date2 = DateUtils.dateParse(o2.getRecDate());
+				return date1.compareTo(date2);
+			});
+		}
 		List<String> time = new ArrayList<>();
 		List<Object> valueList = new ArrayList<>();
 		fanHealthIndexList.forEach(item -> {
@@ -1699,7 +1705,13 @@ public class TDBigScreenAnalyseController extends BaseController implements Appl
 		lambdaQueryWrapper.last("limit 15");
 
 		List<PvHealthIndex> fanHealthIndexDayList = pvHealthIndexMapper.selectList(lambdaQueryWrapper);
-
+		if(CollectionUtil.isNotEmpty(fanHealthIndexDayList)){
+			Collections.sort(fanHealthIndexDayList, (o1, o2) -> {
+				Date date1 = DateUtils.dateParse(o1.getRecDate());
+				Date date2 = DateUtils.dateParse(o2.getRecDate());
+				return date1.compareTo(date2);
+			});
+		}
 		HashMap<String, Object> resultMap = new HashMap<>();
 		List<String> time = new ArrayList<>();
 		List<Object> valueList = new ArrayList<>();