修改

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

@@ -222,7 +222,7 @@ public class FaceServiceImpl implements FaceService {
                 memberSourceEntity.setMemberId(face.getMemberId());
                 memberSourceEntity.setSourceId(sourceEntity.getId());
                 memberSourceEntity.setType(sourceEntity.getType());
-                IsBuyRespVO isBuy = orderBiz.isBuy(face.getMemberId(), face.getScenicId(), sourceEntity.getType(), sourceEntity.getId());
+                IsBuyRespVO isBuy = orderBiz.isBuy(face.getMemberId(), face.getScenicId(), sourceEntity.getType(), faceEntity.getId());
                 if (isBuy.isBuy()) { // 如果用户买过
                     memberSourceEntity.setIsBuy(1);
                 } else if (isBuy.isFree()) { // 全免费逻辑
@@ -235,11 +235,11 @@ public class FaceServiceImpl implements FaceService {
             if (!memberSourceEntityList.isEmpty()) {
                 sourceMapper.addRelations(memberSourceEntityList);
                 taskTaskService.autoCreateTaskByFaceId(face.getId());
-                VideoPieceGetter.Task task = new VideoPieceGetter.Task();
-                task.faceId = face.getId();
-                task.faceSampleIds = sampleListIds;
-                task.memberId = face.getMemberId();
-                VideoPieceGetter.addTask(task);
+//                VideoPieceGetter.Task task = new VideoPieceGetter.Task();
+//                task.faceId = face.getId();
+//                task.faceSampleIds = sampleListIds;
+//                task.memberId = face.getMemberId();
+//                VideoPieceGetter.addTask(task);
             }
         }
         return scenicDbSearchResult;

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

@@ -14,6 +14,7 @@ import com.ycwl.basic.utils.SnowFlakeUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -80,6 +81,7 @@ public class TemplateServiceImpl implements TemplateService {
 
     @Override
     public ApiResponse<Boolean> update(TemplateEntity template) {
+        template.setUpdateTime(new Date());
         int i = templateMapper.update(template);
         if (template.getChildren() != null) {
             templateMapper.deleteByPid(template.getId());

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

@@ -217,7 +217,7 @@ public class TaskTaskServiceImpl implements TaskService {
             log.info("faceId:{} matchSampleIds is empty", faceId);
             return;
         }
-        List<FaceSampleEntity> faceSampleList = faceSampleMapper.listByIds(Arrays.stream(faceRespVO.getMatchSampleIds().split(",")).map(Long::valueOf).collect(Collectors.toList()));
+        List<FaceSampleEntity> faceSampleList = faceSampleMapper.listByIds(Arrays.stream(faceRespVO.getMatchSampleIds().split(",")).filter(StringUtils::isNumeric).map(Long::valueOf).collect(Collectors.toList()));
         if (faceSampleList.isEmpty()) {
             log.info("faceId:{} faceSampleList is empty", faceId);
             return;
@@ -253,10 +253,6 @@ public class TaskTaskServiceImpl implements TaskService {
         }
         List<Long> faceSampleIds = faceSampleList.stream().map(FaceSampleEntity::getId).collect(Collectors.toList());
         List<SourceEntity> sourceList = sourceMapper.listVideoByScenicFaceRelation(face.getScenicId(), faceId);
-        if (sourceList.isEmpty()) {
-            log.info("faceId:{} source list not exist", faceId);
-            return;
-        }
 //        ScenicConfigEntity scenicConfig = scenicRepository.getScenicConfig(face.getScenicId());
 //        if (automatic > 0) {
 //            TaskReqQuery taskReqQuery = new TaskReqQuery();
@@ -307,6 +303,11 @@ public class TaskTaskServiceImpl implements TaskService {
             Map<String, List<SourceEntity>> sourcesMap = videoSourceList.stream()
                     .peek(item -> item.setUrl(item.getVideoUrl()))
                     .collect(Collectors.groupingBy(item -> item.getDeviceId().toString()));
+            if (sourcesMap.isEmpty()) {
+                // 主动禁止没有视频源视频生成
+                log.info("task callback: 没有视频源");
+                return;
+            }
             sourcesMap.forEach((key, value) -> {
                 // 每个value只保留第一个
                 value.removeIf(item -> !value.get(0).equals(item));

src/main/java/com/ycwl/basic/task/DynamicTaskGenerator.java

@@ -103,6 +103,10 @@ public class DynamicTaskGenerator {
             log.info("人脸样本ID{}不存在", task.getFaceSampleId());
             return;
         }
+        if (faceSample.getScore() == null) {
+            log.info("人脸样本ID{}人脸质量为空", task.getFaceSampleId());
+            return;
+        }
         ScenicConfigEntity scenicConfig = scenicRepository.getScenicConfig(faceSample.getScenicId());
         if (scenicConfig == null) {
             log.info("当前景区{}，无配置", faceSample.getScenicId());

src/main/resources/mapper/OrderMapper.xml

@@ -87,8 +87,8 @@
             oi.goods_type,
             CASE oi.goods_type
                 WHEN '0' THEN mvd.name
-                WHEN '1' THEN '原片包'
-                WHEN '2' THEN '照片包'
+                WHEN '1' THEN '原片集'
+                WHEN '2' THEN '照片集'
                 ELSE '其他'
                 END AS goods_name,
             CASE oi.goods_type
@@ -113,7 +113,7 @@
                  LEFT JOIN `order` o ON oi.order_id = o.id
                  LEFT JOIN scenic sc ON o.scenic_id = sc.id
                  LEFT JOIN member_video_data mvd ON o.member_id = mvd.member_id AND oi.goods_id = mvd.video_id
-                 LEFT JOIN member_source_data msd ON o.member_id = msd.member_id AND oi.goods_id = msd.source_id
+                 LEFT JOIN member_source_data msd ON o.member_id = msd.member_id AND oi.goods_id = msd.face_id
         WHERE oi.order_id = #{id};
     </select>