diff --git a/src/main/java/com/ycwl/basic/service/pc/impl/FaceServiceImpl.java b/src/main/java/com/ycwl/basic/service/pc/impl/FaceServiceImpl.java index f164642f..a4023f88 100644 --- a/src/main/java/com/ycwl/basic/service/pc/impl/FaceServiceImpl.java +++ b/src/main/java/com/ycwl/basic/service/pc/impl/FaceServiceImpl.java @@ -72,6 +72,7 @@ import java.io.File; import java.math.BigDecimal; import java.util.ArrayList; import java.util.Collections; +import java.util.Comparator; import java.util.Date; import java.util.LinkedHashSet; import java.util.List; @@ -633,6 +634,7 @@ public class FaceServiceImpl implements FaceService { return; } List faceSampleIds = faceSampleList.stream() + .sorted(Comparator.comparing(FaceSampleEntity::getCreateAt).reversed()) .collect(Collectors.groupingBy(FaceSampleEntity::getDeviceId)) .entrySet() .stream().flatMap(entry -> { diff --git a/src/main/java/com/ycwl/basic/service/task/impl/TaskFaceServiceImpl.java b/src/main/java/com/ycwl/basic/service/task/impl/TaskFaceServiceImpl.java index e9412974..e1241f6c 100644 --- a/src/main/java/com/ycwl/basic/service/task/impl/TaskFaceServiceImpl.java +++ b/src/main/java/com/ycwl/basic/service/task/impl/TaskFaceServiceImpl.java @@ -166,6 +166,7 @@ public class TaskFaceServiceImpl implements TaskFaceService { memberRelationRepository.clearSCacheByFace(faceId); List faceSampleList = faceRepository.getFaceSampleList(faceId); List faceSampleIds = faceSampleList.stream() + .sorted(Comparator.comparing(FaceSampleEntity::getCreateAt).reversed()) .collect(Collectors.groupingBy(FaceSampleEntity::getDeviceId)) .entrySet() .stream().flatMap(entry -> { diff --git a/src/main/java/com/ycwl/basic/service/task/impl/TaskTaskServiceImpl.java b/src/main/java/com/ycwl/basic/service/task/impl/TaskTaskServiceImpl.java index 49f1c353..1df3970e 100644 --- a/src/main/java/com/ycwl/basic/service/task/impl/TaskTaskServiceImpl.java +++ b/src/main/java/com/ycwl/basic/service/task/impl/TaskTaskServiceImpl.java @@ -69,6 +69,7 @@ import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.Arrays; +import java.util.Comparator; import java.util.Date; import java.util.HashMap; import java.util.List; @@ -269,7 +270,9 @@ public class TaskTaskServiceImpl implements TaskService { log.info("faceId:{} faceSampleList is empty", faceId); return; } - List faceSampleIds = faceSampleList.stream().collect(Collectors.groupingBy(FaceSampleEntity::getDeviceId)).entrySet() + List faceSampleIds = faceSampleList.stream() + .sorted(Comparator.comparing(FaceSampleEntity::getCreateAt).reversed()) + .collect(Collectors.groupingBy(FaceSampleEntity::getDeviceId)).entrySet() .stream().flatMap(entry -> { DeviceConfigManager configManager = deviceRepository.getDeviceConfigManager(entry.getKey()); if (configManager.getInteger("limit_video", 0) > 0) { @@ -344,7 +347,9 @@ public class TaskTaskServiceImpl implements TaskService { } } - List faceSampleIds = faceSampleList.stream().collect(Collectors.groupingBy(FaceSampleEntity::getDeviceId)).entrySet() + List faceSampleIds = faceSampleList.stream() + .sorted(Comparator.comparing(FaceSampleEntity::getCreateAt).reversed()) + .collect(Collectors.groupingBy(FaceSampleEntity::getDeviceId)).entrySet() .stream().flatMap(entry -> { DeviceConfigManager configManager = deviceRepository.getDeviceConfigManager(entry.getKey()); if (configManager.getInteger("limit_video", 0) > 0) {