q792602257/FrameTour-BE
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

生成视频时发送通知，其他调整

Browse Source
This commit is contained in:
Jerry Yan
2025-01-06 18:44:53 +08:00
parent 9b32c2fd75
commit 00d53dd197
30 changed files with 403 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,7 +14,6 @@ import com.ycwl.basic.model.mobile.statistic.req.StatisticsRecordAddReq;
import com.ycwl.basic.model.pc.face.entity.FaceEntity;
import com.ycwl.basic.model.pc.face.req.FaceReqQuery;
import com.ycwl.basic.model.pc.face.resp.FaceRespVO;
import com.ycwl.basic.model.pc.faceSample.resp.FaceSampleRespVO;
import com.ycwl.basic.model.pc.source.entity.MemberSourceEntity;
import com.ycwl.basic.model.pc.source.entity.SourceEntity;
import com.ycwl.basic.model.task.resp.SearchFaceRespVo;
@@ -56,7 +55,7 @@ public class FaceServiceImpl implements FaceService {
@Value("${face.score}")
private float faceScore;
private float strictScore = 90F;
private final float strictScore = 0.90F;
@Autowired
private TaskService taskTaskService;
@Autowired
@@ -181,8 +180,6 @@ public class FaceServiceImpl implements FaceService {
faceEntity.setMemberId(userId);
faceEntity.setFaceUrl(faceUrl);
List<Long> sampleListIds = scenicDbSearchResult.getSampleListIds();
// 匹配原片：照片
List<SourceEntity> sourceEntities = sourceMapper.listBySampleIds(sampleListIds);
if (faceEntity.getId()==null) {
//新增人脸
faceEntity.setId(newFaceId);
@@ -191,6 +188,11 @@ public class FaceServiceImpl implements FaceService {
//2、更新人脸
faceMapper.update(faceEntity);
}
if (sampleListIds == null) {
return ApiResponse.fail("请先游玩后再来获取视频吧");
}
// 匹配原片：照片
List<SourceEntity> sourceEntities = sourceMapper.listBySampleIds(sampleListIds);
List<MemberSourceEntity> memberSourceEntityList = sourceEntities.stream().map(sourceEntity -> {
MemberSourceEntity memberSourceEntity = new MemberSourceEntity();
memberSourceEntity.setScenicId(scenicId);
@@ -204,7 +206,7 @@ public class FaceServiceImpl implements FaceService {
sourceMapper.addRelations(memberSourceEntityList);
VideoPieceGetter.Task task = new VideoPieceGetter.Task();
task.faceId = faceEntity.getId();
task.faceSampleId = sampleListIds;
task.faceSampleIds = sampleListIds;
task.memberId = userId;
VideoPieceGetter.addTask(task);
taskTaskService.autoCreateTaskByFaceId(faceEntity.getId());

37
src/main/java/com/ycwl/basic/service/impl/pc/ScenicServiceImpl.java
View File

@@ -1,13 +1,7 @@
package com.ycwl.basic.service.impl.pc;
import com.aliyuncs.DefaultAcsClient;
import com.aliyuncs.IAcsClient;
import com.aliyuncs.exceptions.ClientException;
import com.aliyuncs.facebody.model.v20191230.CreateFaceDbRequest;
import com.aliyuncs.profile.DefaultProfile;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.ycwl.basic.config.FaceDetectConfig;
import com.ycwl.basic.mapper.ScenicAccountMapper;
import com.ycwl.basic.mapper.ScenicMapper;
import com.ycwl.basic.model.pc.scenic.entity.ScenicAccountEntity;
@@ -15,6 +9,7 @@ import com.ycwl.basic.model.pc.scenic.entity.ScenicConfigEntity;
import com.ycwl.basic.model.pc.scenic.req.ScenicAddOrUpdateReq;
import com.ycwl.basic.model.pc.scenic.req.ScenicReqQuery;
import com.ycwl.basic.model.pc.scenic.resp.ScenicRespVO;
import com.ycwl.basic.repository.ScenicRepository;
import com.ycwl.basic.service.pc.ScenicService;
import com.ycwl.basic.service.task.TaskFaceService;
import com.ycwl.basic.utils.ApiResponse;
@@ -39,9 +34,9 @@ public class ScenicServiceImpl implements ScenicService {
@Autowired
private ScenicAccountMapper scenicAccountMapper;
@Autowired
private FaceDetectConfig faceDetectConfig;
@Autowired
private TaskFaceService taskFaceService;
@Autowired
private ScenicRepository scenicRepository;
@Override
public ApiResponse<PageInfo<ScenicRespVO>> pageQuery(ScenicReqQuery scenicReqQuery) {
@@ -96,6 +91,7 @@ public class ScenicServiceImpl implements ScenicService {
scenicMapper.deleteConfigByScenicId(id);
scenicAccountMapper.deleteByScenicId(id);
taskFaceService.deleteFaceDB(id.toString());
scenicRepository.clearCache(id);
return ApiResponse.success(true);
}else {
return ApiResponse.fail("景区删除失败");
@@ -129,6 +125,7 @@ public class ScenicServiceImpl implements ScenicService {
}
int i = scenicMapper.update(scenicUpdateReq);
if (i > 0) {
scenicRepository.clearCache(scenicUpdateReq.getId());
taskFaceService.assureFaceDB(scenicUpdateReq.getId().toString());
return ApiResponse.success(true);
}else {
@@ -141,6 +138,7 @@ public class ScenicServiceImpl implements ScenicService {
public ApiResponse<Boolean> updateStatus(Long id) {
int i = scenicMapper.updateStatus(id);
if (i > 0) {
scenicRepository.clearCache(id);
taskFaceService.assureFaceDB(id.toString());
return ApiResponse.success(true);
}else {
@@ -152,6 +150,7 @@ public class ScenicServiceImpl implements ScenicService {
public ApiResponse<Boolean> addConfig(ScenicConfigEntity scenicConfig) {
int i = scenicMapper.addConfig(scenicConfig);
if (i > 0) {
scenicRepository.clearCache(scenicConfig.getScenicId());
taskFaceService.assureFaceDB(scenicConfig.getScenicId().toString());
return ApiResponse.success(true);
}else {
@@ -163,6 +162,7 @@ public class ScenicServiceImpl implements ScenicService {
public ApiResponse<Boolean> updateConfigById(ScenicConfigEntity scenicConfig) {
int i = scenicMapper.updateConfigById(scenicConfig);
if (i > 0) {
scenicRepository.clearCache(scenicConfig.getScenicId());
taskFaceService.assureFaceDB(scenicConfig.getScenicId().toString());
return ApiResponse.success(true);
}else {
@@ -172,27 +172,16 @@ public class ScenicServiceImpl implements ScenicService {
@Override
public ScenicConfigEntity getConfig(Long id) {
ScenicConfigEntity config = scenicMapper.getConfig(id);
if (config == null) {
config = new ScenicConfigEntity();
config.setId(SnowFlakeUtil.getLongId());
config.setScenicId(id);
config.setIsDefault(1);
scenicMapper.addConfig(config);
}
return config;
return scenicRepository.getScenicConfig(id);
}
@Override
public void saveConfig(Long configId, ScenicConfigEntity config) {
config.setId(configId);
if (config.getScenicId() == null) {
throw new RuntimeException("景区ID不能为空");
}
scenicMapper.updateConfigById(config);
}
private IAcsClient getClient() {
DefaultProfile profile = DefaultProfile.getProfile(
faceDetectConfig.getRegion(),faceDetectConfig.getAccessKeyId(), faceDetectConfig.getAccessKeySecret());
IAcsClient client = new DefaultAcsClient(profile);
return client;
scenicRepository.clearCache(config.getScenicId());
}
}

6
src/main/java/com/ycwl/basic/service/impl/pc/TaskServiceImpl.java
View File

@@ -6,6 +6,7 @@ import com.ycwl.basic.mapper.TaskMapper;
import com.ycwl.basic.model.pc.task.entity.TaskEntity;
import com.ycwl.basic.model.pc.task.req.TaskReqQuery;
import com.ycwl.basic.model.pc.task.resp.TaskRespVO;
import com.ycwl.basic.repository.VideoTaskRepository;
import com.ycwl.basic.service.pc.TaskService;
import com.ycwl.basic.utils.ApiResponse;
import org.springframework.beans.factory.annotation.Autowired;
@@ -22,6 +23,8 @@ public class TaskServiceImpl implements TaskService {
@Autowired
private TaskMapper taskMapper;
@Autowired
private VideoTaskRepository videoTaskRepository;
@Override
public ApiResponse<PageInfo<TaskRespVO>> pageQuery(TaskReqQuery taskReqQuery) {
@@ -44,6 +47,7 @@ public class TaskServiceImpl implements TaskService {
@Override
public ApiResponse<Boolean> deleteById(Long id) {
int i = taskMapper.deleteById(id);
videoTaskRepository.clearTaskCache(id);
if (i > 0) {
return ApiResponse.success(true);
}else {
@@ -54,6 +58,7 @@ public class TaskServiceImpl implements TaskService {
@Override
public ApiResponse<Boolean> update(TaskEntity task) {
int i = taskMapper.update(task);
videoTaskRepository.clearTaskCache(task.getId());
if (i > 0) {
return ApiResponse.success(true);
}else {
@@ -64,6 +69,7 @@ public class TaskServiceImpl implements TaskService {
@Override
public ApiResponse<Boolean> updateStatus(Long id, Integer status) {
int i = taskMapper.updateStatus(id, status);
videoTaskRepository.clearTaskCache(id);
if (i > 0) {
return ApiResponse.success(true);
}else {