From 58f3b8815e3c3180fa011b5fb6836989a7c8b813 Mon Sep 17 00:00:00 2001 From: Angel <1050374295@qq.com> Date: Mon, 29 Jan 2024 15:27:53 +0800 Subject: [PATCH] DDDDD --- .../com/ruoyi/business/controller/BigScreenController.java | 1 - .../com/ruoyi/database/controller/DisposalInfoController.java | 4 +++- .../database/controller/TransitUserRecordController.java | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/gather-app/src/main/java/com/ruoyi/business/controller/BigScreenController.java b/gather-app/src/main/java/com/ruoyi/business/controller/BigScreenController.java index 95a2e6d..61f77d7 100644 --- a/gather-app/src/main/java/com/ruoyi/business/controller/BigScreenController.java +++ b/gather-app/src/main/java/com/ruoyi/business/controller/BigScreenController.java @@ -315,7 +315,6 @@ public class BigScreenController extends BaseController { metaAlarmInfoAndHandleAlarmVo.setJjxxAlarmResponseTime(dateFormat.format(jjxxAlarmResponse)); } alarmVos.add(metaAlarmInfoAndHandleAlarmVo); - } List sortedList = alarmVos.stream() .sorted(Comparator.comparing(MetaAlarmInfoAndHandleAlarmVo::getJjxxInformantTime)) diff --git a/gather-app/src/main/java/com/ruoyi/database/controller/DisposalInfoController.java b/gather-app/src/main/java/com/ruoyi/database/controller/DisposalInfoController.java index 58b89cc..c82cdce 100644 --- a/gather-app/src/main/java/com/ruoyi/database/controller/DisposalInfoController.java +++ b/gather-app/src/main/java/com/ruoyi/database/controller/DisposalInfoController.java @@ -42,7 +42,9 @@ public class DisposalInfoController extends BaseController { DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); DateTimeFormatter inputFormatter = DateTimeFormatter.ofPattern("yyyyMMddHHmmss"); PageUtils.startPage(); - List list1 = transitHuntersUserModelRecordService.list(new QueryWrapper<>(modelRecord)); + QueryWrapper queryWrapper = new QueryWrapper<>(modelRecord); + queryWrapper.orderByDesc("warning_time"); + List list1 = transitHuntersUserModelRecordService.list(queryWrapper); ArrayList transitHuntersUserModelRecords = new ArrayList<>(); for (TransitHuntersUserModelRecord transitHuntersUserModelRecord :list1){ Long id = transitHuntersUserModelRecord.getId(); diff --git a/gather-app/src/main/java/com/ruoyi/database/controller/TransitUserRecordController.java b/gather-app/src/main/java/com/ruoyi/database/controller/TransitUserRecordController.java index 916388b..96efef7 100644 --- a/gather-app/src/main/java/com/ruoyi/database/controller/TransitUserRecordController.java +++ b/gather-app/src/main/java/com/ruoyi/database/controller/TransitUserRecordController.java @@ -38,7 +38,7 @@ import java.util.stream.Collectors; * 人脸记录表(TransitUserRecord)Controller * * @author makejava - * @since 2023-12-04 14:25:44 + * @since 202312-04 14:25:44 */ @Api(tags = "人脸记录表") @RestController