aidlab/aida_back
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev/dev_xp' into dev/dev

Browse Source
This commit is contained in:
xupei
2024-04-23 18:34:13 +08:00
parent 93b3cd9660 c44fc14796
commit 3afd67e680
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/ai/da/model/vo/GenerateResultVO.java
View File

@@ -3,10 +3,12 @@ package com.ai.da.model.vo;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor;
@Data @Data
@ApiModel("generate result 响应") @ApiModel("generate result 响应")
@AllArgsConstructor @AllArgsConstructor
@NoArgsConstructor
public class GenerateResultVO { public class GenerateResultVO {
private String taskId; private String taskId;

5
src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java
View File

@@ -520,16 +520,19 @@ public class GenerateServiceImpl extends ServiceImpl<GenerateMapper, Generate> i
@Override @Override
public List<GenerateResultVO> getGenerateResultList(List<String> taskIdList) { public List<GenerateResultVO> getGenerateResultList(List<String> taskIdList) {
List<GenerateResultVO> results = new ArrayList<>(); List<GenerateResultVO> results = new ArrayList<>();
Set<String> collect = new HashSet<>();
taskIdList.forEach(taskId -> { taskIdList.forEach(taskId -> {
String key = generateResultKey + ":" + taskId; String key = generateResultKey + ":" + taskId;
GenerateResultVO generateResultVO = new Gson().fromJson(redisUtil.getFromString(key), GenerateResultVO.class); GenerateResultVO generateResultVO = new Gson().fromJson(redisUtil.getFromString(key), GenerateResultVO.class);
if (!Objects.isNull(generateResultVO) && !StringUtil.isNullOrEmpty(generateResultVO.getUrl())) { if (!Objects.isNull(generateResultVO) && !StringUtil.isNullOrEmpty(generateResultVO.getUrl())) {
generateResultVO.setUrl(minioUtil.getPresignedUrl(generateResultVO.getUrl(), CommonConstant.MINIO_IMAGE_EXPIRE_TIME)); generateResultVO.setUrl(minioUtil.getPresignedUrl(generateResultVO.getUrl(), CommonConstant.MINIO_IMAGE_EXPIRE_TIME));
if (!StringUtil.isNullOrEmpty(generateResultVO.getStatus())) collect.add(generateResultVO.getStatus());
}else if (Objects.isNull(generateResultVO)){
generateResultVO = new GenerateResultVO();
} }
results.add(generateResultVO); results.add(generateResultVO);
}); });
// todo // todo
Set<String> collect = results.stream().map(GenerateResultVO::getStatus).collect(Collectors.toSet());
if (taskIdList.size() == 4 && collect.size() == 1 && collect.contains("Fail")){ if (taskIdList.size() == 4 && collect.size() == 1 && collect.contains("Fail")){
throw new BusinessException("generate.interface.error"); throw new BusinessException("generate.interface.error");
} }