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

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

src/main/java/com/ycwl/basic/service/pc/impl/FaceServiceImpl.java

@@ -627,13 +627,30 @@ public class FaceServiceImpl implements FaceService {
                 .filter(item -> Integer.valueOf(2).equals(item.getType()))
                 .count();
 
+        List<FaceSampleEntity> faceSampleList = faceRepository.getFaceSampleList(faceId);
+        if (faceSampleList.isEmpty()) {
+            log.info("faceId:{} sample list not exist", faceId);
+            return;
+        }
+        List<Long> faceSampleIds = faceSampleList.stream()
+                .collect(Collectors.groupingBy(FaceSampleEntity::getDeviceId))
+                .entrySet()
+                .stream().flatMap(entry -> {
+                    DeviceConfigManager configManager = deviceRepository.getDeviceConfigManager(entry.getKey());
+                    if (configManager.getInteger("limit_video", 0) > 0) {
+                        return entry.getValue().subList(0, Math.min(entry.getValue().size(), configManager.getInteger("limit_video", 0))).stream();
+                    }
+                    return entry.getValue().stream();
+                }).toList()
+                .stream().map(FaceSampleEntity::getId).toList();
+        log.info("视频切分任务: faceId={}, 原始数量={}, 筛选后数量={}", faceId, sampleListIds.size(), faceSampleIds.size());
         log.debug("视频重切逻辑：视频数量 {}, 照片数量 {}", videoCount, photoCount);
 
         // 只有照片数量大于视频数量时才创建重切任务
         if (photoCount > videoCount) {
             VideoPieceGetter.Task task = new VideoPieceGetter.Task();
             task.faceId = faceId;
-            task.faceSampleIds = sampleListIds;
+            task.faceSampleIds = faceSampleIds;
             task.templateId = null;
             task.memberId = memberId;
             task.callback = () -> {

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

@@ -164,9 +164,22 @@ public class TaskFaceServiceImpl implements TaskFaceService {
                         log.warn("没有有效的关联关系可创建: faceId={}, 原始数量={}", faceId, memberSourceEntityList.size());
                     }
                     memberRelationRepository.clearSCacheByFace(faceId);
+                    List<FaceSampleEntity> faceSampleList = faceRepository.getFaceSampleList(faceId);
+                    List<Long> faceSampleIds = faceSampleList.stream()
+                            .collect(Collectors.groupingBy(FaceSampleEntity::getDeviceId))
+                            .entrySet()
+                            .stream().flatMap(entry -> {
+                                DeviceConfigManager configManager = deviceRepository.getDeviceConfigManager(entry.getKey());
+                                if (configManager.getInteger("limit_video", 0) > 0) {
+                                    return entry.getValue().subList(0, Math.min(entry.getValue().size(), configManager.getInteger("limit_video", 0))).stream();
+                                }
+                                return entry.getValue().stream();
+                            }).toList()
+                            .stream().map(FaceSampleEntity::getId).toList();
+                    log.info("视频切分任务: faceId={}, 原始数量={}, 筛选后数量={}", faceId, sampleListIds.size(), faceSampleIds.size());
                     VideoPieceGetter.Task task = new VideoPieceGetter.Task();
                     task.faceId = faceEntity.getId();
-                    task.faceSampleIds = sampleListIds;
+                    task.faceSampleIds = faceSampleIds;
                     task.memberId = face.getMemberId();
                     VideoPieceGetter.addTask(task);
                 }

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

@@ -255,7 +255,7 @@ public class TaskTaskServiceImpl implements TaskService {
 
     @Override
     public void autoCreateTaskByFaceId(Long faceId) {
-        FaceRespVO faceRespVO = faceMapper.getById(faceId);
+        FaceEntity faceRespVO = faceRepository.getFace(faceId);
         if (faceRespVO == null) {
             log.info("faceId:{} is not exist", faceId);
             return;
@@ -264,18 +264,28 @@ public class TaskTaskServiceImpl implements TaskService {
             log.info("faceId:{} matchSampleIds is empty", faceId);
             return;
         }
-        List<FaceSampleEntity> faceSampleList = faceSampleMapper.listByIds(Arrays.stream(faceRespVO.getMatchSampleIds().split(",")).filter(StringUtils::isNumeric).map(Long::valueOf).collect(Collectors.toList()));
+        List<FaceSampleEntity> faceSampleList = faceRepository.getFaceSampleList(faceId);
         if (faceSampleList.isEmpty()) {
             log.info("faceId:{} faceSampleList is empty", faceId);
             return;
         }
+        List<Long> faceSampleIds = faceSampleList.stream().collect(Collectors.groupingBy(FaceSampleEntity::getDeviceId)).entrySet()
+                .stream().flatMap(entry -> {
+                    DeviceConfigManager configManager = deviceRepository.getDeviceConfigManager(entry.getKey());
+                    if (configManager.getInteger("limit_video", 0) > 0) {
+                        return entry.getValue().subList(0, Math.min(entry.getValue().size(), configManager.getInteger("limit_video", 0))).stream();
+                    }
+                    return entry.getValue().stream();
+                }).toList()
+                .stream().map(FaceSampleEntity::getId).toList();
+        log.info("视频切分任务: faceId={}, 原始数量={}, 筛选后数量={}", faceId, faceSampleList.size(), faceSampleIds.size());
         ScenicConfigManager scenicConfig = scenicRepository.getScenicConfigManager(faceRespVO.getScenicId());
         List<TemplateRespVO> templateList = templateRepository.getTemplateListByScenicId(faceRespVO.getScenicId());
         if (templateList == null || templateList.isEmpty()) {
             // 没有vlog视频的情况下
             VideoPieceGetter.Task task = new VideoPieceGetter.Task();
             task.faceId = faceId;
-            task.faceSampleIds = faceSampleList.stream().map(FaceSampleEntity::getId).toList();
+            task.faceSampleIds = faceSampleIds;
             task.templateId = null;
             task.memberId = faceRespVO.getMemberId();
             task.callback = () -> {
@@ -343,6 +353,7 @@ public class TaskTaskServiceImpl implements TaskService {
                     return entry.getValue().stream();
                 }).toList()
                 .stream().map(FaceSampleEntity::getId).collect(Collectors.toList());
+        log.info("视频切分任务: faceId={}, 原始数量={}, 筛选后数量={}", faceId, faceSampleList.size(), faceSampleIds.size());
         List<SourceEntity> sourceList = sourceMapper.listVideoByScenicFaceRelation(face.getScenicId(), faceId);
         VideoPieceGetter.Task task = new VideoPieceGetter.Task();
         task.faceId = faceId;