feat(face):优化视频重切任务的样本选择逻辑

- 根据设备配置限制视频样本数量
- 实现按设备分组并应用数量限制- 更新视频重切任务中的样本ID列表
- 保留原有照片与视频数量比较逻辑

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<Long> faceSampleIds = faceSampleList.stream()
+                .sorted(Comparator.comparing(FaceSampleEntity::getCreateAt).reversed())
                 .collect(Collectors.groupingBy(FaceSampleEntity::getDeviceId))
                 .entrySet()
                 .stream().flatMap(entry -> {

src/main/java/com/ycwl/basic/service/task/impl/TaskFaceServiceImpl.java

@@ -166,6 +166,7 @@ public class TaskFaceServiceImpl implements TaskFaceService {
                     memberRelationRepository.clearSCacheByFace(faceId);
                     List<FaceSampleEntity> faceSampleList = faceRepository.getFaceSampleList(faceId);
                     List<Long> faceSampleIds = faceSampleList.stream()
+                            .sorted(Comparator.comparing(FaceSampleEntity::getCreateAt).reversed())
                             .collect(Collectors.groupingBy(FaceSampleEntity::getDeviceId))
                             .entrySet()
                             .stream().flatMap(entry -> {

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<Long> faceSampleIds = faceSampleList.stream().collect(Collectors.groupingBy(FaceSampleEntity::getDeviceId)).entrySet()
+        List<Long> 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<Long> faceSampleIds = faceSampleList.stream().collect(Collectors.groupingBy(FaceSampleEntity::getDeviceId)).entrySet()
+        List<Long> 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) {