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
2024-12-15 17:31:39 +08:00
parent ba00a90412
commit c27d094965
25 changed files with 265 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,6 +15,7 @@ import com.ycwl.basic.model.pc.face.resp.FaceRespVO;
import com.ycwl.basic.model.task.resp.SearchFaceRespVo;
import com.ycwl.basic.service.pc.FaceService;
import com.ycwl.basic.service.task.TaskFaceService;
import com.ycwl.basic.service.task.TaskService;
import com.ycwl.basic.utils.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -26,6 +27,8 @@ import java.io.IOException;
import java.io.InputStream;
import java.util.Date;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
/**
* @Author：longbinbin
@@ -45,6 +48,8 @@ public class FaceServiceImpl implements FaceService {
@Value("${face.score}")
private float faceScore;
@Autowired
private TaskService taskTaskService;
@Override
public ApiResponse<PageInfo<FaceRespVO>> pageQuery(FaceReqQuery faceReqQuery) {
@@ -110,53 +115,55 @@ public class FaceServiceImpl implements FaceService {
log.info("当前登录用户信息：{}",worker);
//1、上传人脸照片
String facaeUrl = uploadFileALiOss(file, userId);
String faceUrl = uploadFileALiOss(file, userId);
SearchFaceRespVo searchFaceRespVo = faceService.searchFace(scenicId, faceUrl);
float score = searchFaceRespVo.getScore();
if (score<faceScore) {
//校验失败，删除，提示重新上传
ossUtil.deleteFileByUrl(faceUrl);
throw new BaseException("人脸照片校验失败，请重新上传");
}
// 2、查看人脸是否已上传
FaceRespVO faceRespVO=faceMapper.getByMemberId(userId);
FaceRespVO faceRespVO=faceMapper.getByMemberId(userId, scenicId);
FaceEntity faceEntity = new FaceEntity();
faceEntity.setScore(searchFaceRespVo.getScore());
faceEntity.setMatchResult(searchFaceRespVo.getSearchResultJson());
faceEntity.setMatchSampleIds(searchFaceRespVo.getSampleListIds().stream().map(String::valueOf).collect(Collectors.joining(",")));
faceEntity.setCreateAt(new Date());
faceEntity.setScenicId(scenicId);
faceEntity.setMemberId(userId);
faceEntity.setFaceUrl(faceUrl);
if (faceRespVO==null) {
//新增人脸
faceEntity.setId(SnowFlakeUtil.getLongId());
faceEntity.setMemberId(userId);
faceEntity.setFaceUrl(facaeUrl);
// faceEntity.setScore();
// faceEntity.setMatchSampleIds();
// faceEntity.setFirstMatchRate();
// faceEntity.setMatchResult();
//TODO 人脸数据存库
faceMapper.add(faceEntity);
taskTaskService.autoCreateTaskByFaceId(faceEntity.getId());
}else {
//2、更新人脸
faceRespVO.setFaceUrl(facaeUrl);
BeanUtil.copyProperties(faceRespVO,faceEntity);
faceEntity.setId(faceRespVO.getId());
faceMapper.update(faceEntity);
if (!Objects.equals(
faceRespVO.getMatchSampleIds(),
searchFaceRespVo.getSampleListIds().stream().map(String::valueOf).collect(Collectors.joining(","))
)) {
taskTaskService.autoCreateTaskByFaceId(faceEntity.getId());
}
}
SearchFaceRespVo faceRespVo = faceService.searchFace(scenicId, faceEntity.getId());
float score = faceRespVo.getScore();
if (score<faceScore) {
//校验失败，删除，提示重新上传
ossUtil.deleteFile(facaeUrl);
throw new BaseException("人脸照片校验失败，请重新上传");
}else {
StatisticsRecordAddReq statisticsRecordAddReq = new StatisticsRecordAddReq();
statisticsRecordAddReq.setMemberId(userId);
statisticsRecordAddReq.setType(StatisticEnum.UPLOAD_FACE.code);
statisticsRecordAddReq.setScenicId(scenicId);
statisticsRecordAddReq.setMorphId(faceEntity.getId());
statisticsMapper.addStatisticsRecord(statisticsRecordAddReq);
//校验成功，保存用户人脸信息，将访问人脸照片访问地址响应给前端
return ApiResponse.success(facaeUrl);
}
StatisticsRecordAddReq statisticsRecordAddReq = new StatisticsRecordAddReq();
statisticsRecordAddReq.setMemberId(userId);
statisticsRecordAddReq.setType(StatisticEnum.UPLOAD_FACE.code);
statisticsRecordAddReq.setScenicId(scenicId);
statisticsRecordAddReq.setMorphId(faceEntity.getId());
statisticsMapper.addStatisticsRecord(statisticsRecordAddReq);
return ApiResponse.success(faceUrl);
}
@Override
public ApiResponse<FaceRespVO> getFaceByMemberId(Long memberId) {
return ApiResponse.success(faceMapper.getByMemberId(memberId));
// TODO: 修改
return ApiResponse.success(faceMapper.getByMemberId(memberId, 3928516560393736192L));
}
/**