修正

src/main/java/com/ycwl/basic/service/impl/mobile/AppScenicServiceImpl.java

@@ -22,9 +22,8 @@ import com.ycwl.basic.model.pc.scenic.resp.ScenicRespVO;
 import com.ycwl.basic.model.pc.source.req.SourceReqQuery;
 import com.ycwl.basic.model.pc.source.resp.SourceRespVO;
 import com.ycwl.basic.model.pc.video.entity.MemberVideoEntity;
-import com.ycwl.basic.model.pc.video.req.VideoReqQuery;
-import com.ycwl.basic.model.pc.video.resp.VideoRespVO;
 import com.ycwl.basic.service.mobile.AppScenicService;
+import com.ycwl.basic.template.repository.TemplateRepository;
 import com.ycwl.basic.utils.ApiResponse;
 import com.ycwl.basic.utils.JwtTokenUtil;
 import lombok.extern.slf4j.Slf4j;
@@ -66,6 +65,8 @@ public class AppScenicServiceImpl implements AppScenicService {
 
     @Value("${face.score}")
     private BigDecimal faceScore;
+    @Autowired
+    private TemplateRepository templateRepository;
 
     @Override
     public ApiResponse<PageInfo<ScenicAppVO>> pageQuery(ScenicReqQuery scenicReqQuery) {
@@ -179,12 +180,19 @@ public class AppScenicServiceImpl implements AppScenicService {
         List<ContentPageVO> contentList = templateMapper.listFor(faceRespVO.getScenicId());
         contentList.forEach(contentPageVO -> {
             List<MemberVideoEntity> memberVideoEntityList = videoMapper.userFaceTemplateVideo(userId, faceId, contentPageVO.getTemplateId());
+            contentPageVO.setContentType(1);
             if (!memberVideoEntityList.isEmpty()) {
                 contentPageVO.setIsBuy(memberVideoEntityList.get(0).getIsBuy());
                 contentPageVO.setContentId(memberVideoEntityList.get(0).getVideoId());
-                contentPageVO.setContentType(1);
+                contentPageVO.setLockType(-1);
             } else {
                 contentPageVO.setContentType(0);
+                boolean canGenerate = templateRepository.determineTemplateCanGenerate(contentPageVO.getTemplateId(), faceId);
+                if (canGenerate) {
+                    contentPageVO.setLockType(0);
+                } else {
+                    contentPageVO.setLockType(1);
+                }
             }
         });
 

src/main/java/com/ycwl/basic/service/impl/mobile/GoodsServiceImpl.java

@@ -16,6 +16,7 @@ import com.ycwl.basic.model.pc.video.entity.VideoEntity;
 import com.ycwl.basic.model.pc.video.req.VideoReqQuery;
 import com.ycwl.basic.model.pc.video.resp.VideoRespVO;
 import com.ycwl.basic.service.mobile.GoodsService;
+import com.ycwl.basic.template.repository.TemplateRepository;
 import com.ycwl.basic.utils.ApiResponse;
 import com.ycwl.basic.utils.DateUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -48,6 +49,8 @@ public class GoodsServiceImpl implements GoodsService {
      private DeviceMapper deviceMapper;
     @Autowired
     private FaceMapper faceMapper;
+     @Autowired
+     private TemplateRepository templateRepository;
 
     public ApiResponse<List<GoodsPageVO>> goodsList(GoodsReqQuery query) {
          //查询原素材

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

@@ -208,7 +208,6 @@ public class FaceServiceImpl implements FaceService {
             task.faceId = faceEntity.getId();
             task.faceSampleId = sampleRespVO.getId();
             task.memberId = userId;
-            task.createTime = sampleRespVO.getCreateAt();
             VideoPieceGetter.addTask(task);
         }
         taskTaskService.autoCreateTaskByFaceId(faceEntity.getId());

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

@@ -8,6 +8,7 @@ import com.ycwl.basic.model.pc.template.entity.TemplateEntity;
 import com.ycwl.basic.model.pc.template.req.TemplateReqQuery;
 import com.ycwl.basic.model.pc.template.resp.TemplateRespVO;
 import com.ycwl.basic.service.pc.TemplateService;
+import com.ycwl.basic.template.repository.TemplateRepository;
 import com.ycwl.basic.utils.ApiResponse;
 import com.ycwl.basic.utils.SnowFlakeUtil;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,6 +25,8 @@ public class TemplateServiceImpl implements TemplateService {
 
     @Autowired
     private TemplateMapper templateMapper;
+    @Autowired
+    private TemplateRepository templateRepository;
 
     @Override
     public ApiResponse<PageInfo<TemplateRespVO>> pageQuery(TemplateReqQuery templateReqQuery) {
@@ -40,9 +43,7 @@ public class TemplateServiceImpl implements TemplateService {
 
     @Override
     public ApiResponse<TemplateRespVO> getById(Long id) {
-        TemplateRespVO data = templateMapper.getById(id);
-        data.setChildren(templateMapper.getByPid(id));
-        return ApiResponse.success(data);
+        return ApiResponse.success(templateRepository.getTemplate(id));
     }
 
     @Override
@@ -70,6 +71,7 @@ public class TemplateServiceImpl implements TemplateService {
         int i = templateMapper.deleteById(id);
         if (i > 0) {
             templateMapper.deleteByPid(id);
+            templateRepository.clearTemplateCache(id);
             return ApiResponse.success(i);
         }else {
             return ApiResponse.fail("删除模版失败");
@@ -88,6 +90,7 @@ public class TemplateServiceImpl implements TemplateService {
                 item.setStatus(1);
                 templateMapper.add(item);
             });
+            templateRepository.clearTemplateCache(template.getId());
         }
         if (i > 0) {
             return ApiResponse.success(true);
@@ -108,19 +111,13 @@ public class TemplateServiceImpl implements TemplateService {
 
     @Override
     public TemplateConfigEntity getConfig(Long templateId) {
-        TemplateConfigEntity config = templateMapper.getConfig(templateId);
-        if (config == null) {
-            config = new TemplateConfigEntity();
-            config.setId(SnowFlakeUtil.getLongId());
-            config.setTemplateId(templateId);
-            templateMapper.addConfig(config);
-        }
-        return config;
+        return templateRepository.getTemplateConfig(templateId);
     }
 
     @Override
     public void saveConfig(Long configId, TemplateConfigEntity config) {
         config.setId(configId);
+        templateRepository.clearTemplateCache(config.getTemplateId());
         templateMapper.updateConfigById(config);
     }
 }

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

@@ -241,7 +241,6 @@ public class TaskTaskServiceImpl implements TaskService {
             VideoPieceGetter.Task task = new VideoPieceGetter.Task();
             task.setFaceSampleId(sample.getId());
             task.setMemberId(faceRespVO.getMemberId());
-            task.setCreateTime(sample.getCreateAt());
             return task;
         }).forEach(VideoPieceGetter::addTask);