diff --git a/src/main/java/com/ai/da/model/vo/GenerateResultVO.java b/src/main/java/com/ai/da/model/vo/GenerateResultVO.java index 3f28fc59..3071c0fa 100644 --- a/src/main/java/com/ai/da/model/vo/GenerateResultVO.java +++ b/src/main/java/com/ai/da/model/vo/GenerateResultVO.java @@ -3,10 +3,12 @@ package com.ai.da.model.vo; import io.swagger.annotations.ApiModel; import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; @Data @ApiModel("generate result 响应") @AllArgsConstructor +@NoArgsConstructor public class GenerateResultVO { private String taskId; diff --git a/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java b/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java index 6f35de66..97529300 100644 --- a/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java @@ -520,16 +520,19 @@ public class GenerateServiceImpl extends ServiceImpl i @Override public List getGenerateResultList(List taskIdList) { List results = new ArrayList<>(); + Set collect = new HashSet<>(); taskIdList.forEach(taskId -> { String key = generateResultKey + ":" + taskId; GenerateResultVO generateResultVO = new Gson().fromJson(redisUtil.getFromString(key), GenerateResultVO.class); if (!Objects.isNull(generateResultVO) && !StringUtil.isNullOrEmpty(generateResultVO.getUrl())) { 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); }); // todo - Set collect = results.stream().map(GenerateResultVO::getStatus).collect(Collectors.toSet()); if (taskIdList.size() == 4 && collect.size() == 1 && collect.contains("Fail")){ throw new BusinessException("generate.interface.error"); }