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-02-14 18:18:21 +08:00
parent b4b6d93e2f
commit cfb9392068
26 changed files with 404 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -316,8 +316,8 @@ public class TaskFaceServiceImpl implements TaskFaceService {
listFaceEntitiesRequest.setOrder("asc");
try {
IAcsClient client = getClient();
AtomicBoolean flag = new AtomicBoolean(false);
while (true) {
AtomicBoolean flag = new AtomicBoolean(false);
ListFaceEntitiesResponse listFaceEntitiesResponse = client.getAcsResponse(listFaceEntitiesRequest);
if (listFaceEntitiesResponse == null || listFaceEntitiesResponse.getData() == null || listFaceEntitiesResponse.getData().getEntities() == null || listFaceEntitiesResponse.getData().getEntities().isEmpty()) {
break;
@@ -346,6 +346,8 @@ public class TaskFaceServiceImpl implements TaskFaceService {
});
if (!flag.get()) {
break;
} else {
flag.set(false);
}
}
} catch (Exception ignored) {

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

@@ -438,6 +438,8 @@ public class TaskTaskServiceImpl implements TaskService {
}
List<SourceEntity> videoSourceList = sourceMapper.listVideoByScenicFaceRelation(face.getScenicId(), faceId);
Map<String, List<SourceEntity>> sourcesMap = videoSourceList.stream()
.filter(Objects::nonNull)
.filter(item -> Objects.nonNull(item.getVideoUrl()))
.peek(item -> item.setUrl(item.getVideoUrl()))
.filter(item -> {
DeviceEntity device = deviceRepository.getDevice(item.getDeviceId());
@@ -555,6 +557,7 @@ public class TaskTaskServiceImpl implements TaskService {
video.setDuration(req.getVideoInfo().getDuration());
}
videoMapper.update(video);
videoRepository.clearVideoCache(video.getId());
} else {
video = new VideoEntity();
video.setId(SnowFlakeUtil.getLongId());