From c50c193a4696cd77e75c5687b03cbcfb3122fdc8 Mon Sep 17 00:00:00 2001 From: shahaibo <1023316923@qq.com> Date: Mon, 21 Apr 2025 22:35:32 +0800 Subject: [PATCH] =?UTF-8?q?TASK:=E6=A8=A1=E5=9D=97=E5=8C=96=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ai/da/service/impl/DesignServiceImpl.java | 72 ++++++++----------- 1 file changed, 28 insertions(+), 44 deletions(-) diff --git a/src/main/java/com/ai/da/service/impl/DesignServiceImpl.java b/src/main/java/com/ai/da/service/impl/DesignServiceImpl.java index 187c35c0..54b7d180 100644 --- a/src/main/java/com/ai/da/service/impl/DesignServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/DesignServiceImpl.java @@ -2536,29 +2536,21 @@ public class DesignServiceImpl extends ServiceImpl impleme toProductImageResultQueryWrapper.lambda().eq(ToProductImageResult::getTaskIdBatch, query.getTaskId()); List toProductImageResultList = toProductImageResultMapper.selectList(toProductImageResultQueryWrapper); for (ToProductImageResult toProductImageResult : toProductImageResultList) { - String key = toProductImageResultKey + ":" + toProductImageResult.getTaskId(); - MagicToolResultVO magicToolResultVO = new Gson().fromJson(redisUtil.getFromString(key), MagicToolResultVO.class); - if (!Objects.isNull(magicToolResultVO) && !StringUtil.isNullOrEmpty(magicToolResultVO.getUrl())) { - String url = magicToolResultVO.getUrl(); - if (url.substring(url.lastIndexOf("/") + 1).equals("white_image.jpg")) { - magicToolResultVO.setStatus("Invalid"); - } else { - magicToolResultVO.setUrl(minioUtil.getPreSignedUrl(url, CommonConstant.MINIO_IMAGE_EXPIRE_TIME)); - magicToolResultVO.setResultType(toProductImageResult.getResultType()); - magicToolResultVO.setElementId(toProductImageResult.getElementId()); - magicToolResultVO.setElementType(toProductImageResult.getElementType()); - if (toProductImageResult.getElementType().equals("ProductElement")) { - ToProductElement toProductElement = toProductElementMapper.selectById(toProductImageResult.getElementId()); - magicToolResultVO.setSourceUrl(minioUtil.getPreSignedUrl(toProductElement.getUrl(), 24 * 60)); - }else { - TDesignPythonOutfit tDesignPythonOutfit = designPythonOutfitMapper.selectById(toProductImageResult.getElementId()); - magicToolResultVO.setSourceUrl(minioUtil.getPreSignedUrl(tDesignPythonOutfit.getDesignUrl(), 24 * 60)); - } - } - } else if (Objects.isNull(magicToolResultVO)) { - magicToolResultVO = new MagicToolResultVO(); + MagicToolResultVO magicToolResultVO = new MagicToolResultVO(); + magicToolResultVO.setId(toProductImageResult.getId()); + magicToolResultVO.setTaskId(toProductImageResult.getTaskId()); + magicToolResultVO.setStatus("Success"); + magicToolResultVO.setUrl(minioUtil.getPreSignedUrl(toProductImageResult.getUrl(), CommonConstant.MINIO_IMAGE_EXPIRE_TIME)); + magicToolResultVO.setResultType(toProductImageResult.getResultType()); + magicToolResultVO.setElementId(toProductImageResult.getElementId()); + magicToolResultVO.setElementType(toProductImageResult.getElementType()); + if (toProductImageResult.getElementType().equals("ProductElement")) { + ToProductElement toProductElement = toProductElementMapper.selectById(toProductImageResult.getElementId()); + magicToolResultVO.setSourceUrl(minioUtil.getPreSignedUrl(toProductElement.getUrl(), 24 * 60)); + }else { + TDesignPythonOutfit tDesignPythonOutfit = designPythonOutfitMapper.selectById(toProductImageResult.getElementId()); + magicToolResultVO.setSourceUrl(minioUtil.getPreSignedUrl(tDesignPythonOutfit.getDesignUrl(), 24 * 60)); } -// if (!StringUtil.isNullOrEmpty(magicToolResultVO.getStatus())) collect.add(magicToolResultVO.getStatus()); results.add(magicToolResultVO); } result.setToProductImage(results); @@ -2569,29 +2561,21 @@ public class DesignServiceImpl extends ServiceImpl impleme toProductImageResultQueryWrapper.lambda().eq(ToProductImageResult::getTaskIdBatch, query.getTaskId()); List toProductImageResultList = toProductImageResultMapper.selectList(toProductImageResultQueryWrapper); for (ToProductImageResult toProductImageResult : toProductImageResultList) { - String key = relightResultKey + ":" + toProductImageResult.getTaskId(); - MagicToolResultVO magicToolResultVO = new Gson().fromJson(redisUtil.getFromString(key), MagicToolResultVO.class); - if (!Objects.isNull(magicToolResultVO) && !StringUtil.isNullOrEmpty(magicToolResultVO.getUrl())) { - String url = magicToolResultVO.getUrl(); - if (url.substring(url.lastIndexOf("/") + 1).equals("white_image.jpg")) { - magicToolResultVO.setStatus("Invalid"); - } else { - magicToolResultVO.setUrl(minioUtil.getPreSignedUrl(url, CommonConstant.MINIO_IMAGE_EXPIRE_TIME)); - magicToolResultVO.setResultType(toProductImageResult.getResultType()); - magicToolResultVO.setElementId(toProductImageResult.getElementId()); - magicToolResultVO.setElementType(toProductImageResult.getElementType()); - if (toProductImageResult.getElementType().equals("ProductElement")) { - ToProductElement toProductElement = toProductElementMapper.selectById(toProductImageResult.getElementId()); - magicToolResultVO.setSourceUrl(minioUtil.getPreSignedUrl(toProductElement.getUrl(), 24 * 60)); - }else { - ToProductImageResult toProductImageResult1 = toProductImageResultMapper.selectById(toProductImageResult.getElementId()); - magicToolResultVO.setSourceUrl(minioUtil.getPreSignedUrl(toProductImageResult1.getUrl(), 24 * 60)); - } - } - } else if (Objects.isNull(magicToolResultVO)) { - magicToolResultVO = new MagicToolResultVO(); + MagicToolResultVO magicToolResultVO = new MagicToolResultVO(); + magicToolResultVO.setId(toProductImageResult.getId()); + magicToolResultVO.setTaskId(toProductImageResult.getTaskId()); + magicToolResultVO.setStatus("Success"); + magicToolResultVO.setUrl(minioUtil.getPreSignedUrl(toProductImageResult.getUrl(), CommonConstant.MINIO_IMAGE_EXPIRE_TIME)); + magicToolResultVO.setResultType(toProductImageResult.getResultType()); + magicToolResultVO.setElementId(toProductImageResult.getElementId()); + magicToolResultVO.setElementType(toProductImageResult.getElementType()); + if (toProductImageResult.getElementType().equals("ProductElement")) { + ToProductElement toProductElement = toProductElementMapper.selectById(toProductImageResult.getElementId()); + magicToolResultVO.setSourceUrl(minioUtil.getPreSignedUrl(toProductElement.getUrl(), 24 * 60)); + }else { + ToProductImageResult toProductImageResult1 = toProductImageResultMapper.selectById(toProductImageResult.getElementId()); + magicToolResultVO.setSourceUrl(minioUtil.getPreSignedUrl(toProductImageResult1.getUrl(), 24 * 60)); } -// if (!StringUtil.isNullOrEmpty(magicToolResultVO.getStatus())) collect.add(magicToolResultVO.getStatus()); results.add(magicToolResultVO); } result.setRelight(results);