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

1

Browse Source
This commit is contained in:
Jerry Yan
2025-05-04 10:51:27 +08:00
parent 6197f13e8e
commit ef978529ac
16 changed files with 157 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -202,14 +202,11 @@ public class TaskFaceServiceImpl implements TaskFaceService {
SearchFaceRespVo respVo = new SearchFaceRespVo();
List<SearchFaceResultItem> records = response.getResult();
respVo.setScore(response.getOriginalFaceScore());
if (records.isEmpty()) {
return respVo;
}
respVo.setSearchResultJson(JSON.toJSONString(records));
logEntity.setMatchRawRecord(records);
if (records.isEmpty()) {
return respVo;
}
logEntity.setMatchRawRecord(records);
acceptFaceSampleIds = records.stream()
.filter(record -> record.getScore() > _threshold)
.map(SearchFaceResultItem::getExtData)
@@ -268,12 +265,12 @@ public class TaskFaceServiceImpl implements TaskFaceService {
record.setMatched(item.getScore() > _threshold);
collect.add(record);
}
logEntity.setMatchLocalRecord(JSONObject.toJSONString(collect));
if (acceptFaceSampleIds.isEmpty()) {
respVo.setFirstMatchRate(0f);
respVo.setSampleListIds(Collections.emptyList());
return respVo;
}
logEntity.setMatchLocalRecord(JSONObject.toJSONString(collect));
respVo.setFirstMatchRate(response.getFirstMatchRate());
respVo.setSampleListIds(acceptFaceSampleIds);
return respVo;

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

@@ -45,7 +45,6 @@ import com.ycwl.basic.notify.entity.NotifyContent;
import com.ycwl.basic.notify.enums.NotifyType;
import com.ycwl.basic.repository.DeviceRepository;
import com.ycwl.basic.repository.FaceRepository;
import com.ycwl.basic.repository.OrderRepository;
import com.ycwl.basic.repository.ScenicRepository;
import com.ycwl.basic.repository.VideoRepository;
import com.ycwl.basic.repository.VideoTaskRepository;
@@ -74,10 +73,7 @@ import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Optional;
import java.util.concurrent.ArrayBlockingQueue;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.ReentrantLock;
import java.util.stream.Collectors;
@@ -603,7 +599,7 @@ public class TaskTaskServiceImpl implements TaskService {
IStorageAdapter adapter = scenicService.getScenicTmpStorageAdapter(task.getScenicId());
String filename = StorageUtil.joinPath(StorageConstant.VLOG_PATH, task.getId() + "_" + task.getScenicId() + ".mp4");
adapter.setAcl(StorageAcl.PUBLIC_READ, filename);
videoReUploader.addVideoTask(task.getVideoUrl(), video.getId());
videoReUploader.addVideoTask(video.getId());
int isBuy = 0;
FaceEntity face = faceRepository.getFace(task.getFaceId());
if (face != null) {