TASK:模块化;
This commit is contained in:
@@ -2536,29 +2536,21 @@ public class DesignServiceImpl extends ServiceImpl<DesignMapper, Design> impleme
|
|||||||
toProductImageResultQueryWrapper.lambda().eq(ToProductImageResult::getTaskIdBatch, query.getTaskId());
|
toProductImageResultQueryWrapper.lambda().eq(ToProductImageResult::getTaskIdBatch, query.getTaskId());
|
||||||
List<ToProductImageResult> toProductImageResultList = toProductImageResultMapper.selectList(toProductImageResultQueryWrapper);
|
List<ToProductImageResult> toProductImageResultList = toProductImageResultMapper.selectList(toProductImageResultQueryWrapper);
|
||||||
for (ToProductImageResult toProductImageResult : toProductImageResultList) {
|
for (ToProductImageResult toProductImageResult : toProductImageResultList) {
|
||||||
String key = toProductImageResultKey + ":" + toProductImageResult.getTaskId();
|
MagicToolResultVO magicToolResultVO = new MagicToolResultVO();
|
||||||
MagicToolResultVO magicToolResultVO = new Gson().fromJson(redisUtil.getFromString(key), MagicToolResultVO.class);
|
magicToolResultVO.setId(toProductImageResult.getId());
|
||||||
if (!Objects.isNull(magicToolResultVO) && !StringUtil.isNullOrEmpty(magicToolResultVO.getUrl())) {
|
magicToolResultVO.setTaskId(toProductImageResult.getTaskId());
|
||||||
String url = magicToolResultVO.getUrl();
|
magicToolResultVO.setStatus("Success");
|
||||||
if (url.substring(url.lastIndexOf("/") + 1).equals("white_image.jpg")) {
|
magicToolResultVO.setUrl(minioUtil.getPreSignedUrl(toProductImageResult.getUrl(), CommonConstant.MINIO_IMAGE_EXPIRE_TIME));
|
||||||
magicToolResultVO.setStatus("Invalid");
|
magicToolResultVO.setResultType(toProductImageResult.getResultType());
|
||||||
} else {
|
magicToolResultVO.setElementId(toProductImageResult.getElementId());
|
||||||
magicToolResultVO.setUrl(minioUtil.getPreSignedUrl(url, CommonConstant.MINIO_IMAGE_EXPIRE_TIME));
|
magicToolResultVO.setElementType(toProductImageResult.getElementType());
|
||||||
magicToolResultVO.setResultType(toProductImageResult.getResultType());
|
if (toProductImageResult.getElementType().equals("ProductElement")) {
|
||||||
magicToolResultVO.setElementId(toProductImageResult.getElementId());
|
ToProductElement toProductElement = toProductElementMapper.selectById(toProductImageResult.getElementId());
|
||||||
magicToolResultVO.setElementType(toProductImageResult.getElementType());
|
magicToolResultVO.setSourceUrl(minioUtil.getPreSignedUrl(toProductElement.getUrl(), 24 * 60));
|
||||||
if (toProductImageResult.getElementType().equals("ProductElement")) {
|
}else {
|
||||||
ToProductElement toProductElement = toProductElementMapper.selectById(toProductImageResult.getElementId());
|
TDesignPythonOutfit tDesignPythonOutfit = designPythonOutfitMapper.selectById(toProductImageResult.getElementId());
|
||||||
magicToolResultVO.setSourceUrl(minioUtil.getPreSignedUrl(toProductElement.getUrl(), 24 * 60));
|
magicToolResultVO.setSourceUrl(minioUtil.getPreSignedUrl(tDesignPythonOutfit.getDesignUrl(), 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();
|
|
||||||
}
|
}
|
||||||
// if (!StringUtil.isNullOrEmpty(magicToolResultVO.getStatus())) collect.add(magicToolResultVO.getStatus());
|
|
||||||
results.add(magicToolResultVO);
|
results.add(magicToolResultVO);
|
||||||
}
|
}
|
||||||
result.setToProductImage(results);
|
result.setToProductImage(results);
|
||||||
@@ -2569,29 +2561,21 @@ public class DesignServiceImpl extends ServiceImpl<DesignMapper, Design> impleme
|
|||||||
toProductImageResultQueryWrapper.lambda().eq(ToProductImageResult::getTaskIdBatch, query.getTaskId());
|
toProductImageResultQueryWrapper.lambda().eq(ToProductImageResult::getTaskIdBatch, query.getTaskId());
|
||||||
List<ToProductImageResult> toProductImageResultList = toProductImageResultMapper.selectList(toProductImageResultQueryWrapper);
|
List<ToProductImageResult> toProductImageResultList = toProductImageResultMapper.selectList(toProductImageResultQueryWrapper);
|
||||||
for (ToProductImageResult toProductImageResult : toProductImageResultList) {
|
for (ToProductImageResult toProductImageResult : toProductImageResultList) {
|
||||||
String key = relightResultKey + ":" + toProductImageResult.getTaskId();
|
MagicToolResultVO magicToolResultVO = new MagicToolResultVO();
|
||||||
MagicToolResultVO magicToolResultVO = new Gson().fromJson(redisUtil.getFromString(key), MagicToolResultVO.class);
|
magicToolResultVO.setId(toProductImageResult.getId());
|
||||||
if (!Objects.isNull(magicToolResultVO) && !StringUtil.isNullOrEmpty(magicToolResultVO.getUrl())) {
|
magicToolResultVO.setTaskId(toProductImageResult.getTaskId());
|
||||||
String url = magicToolResultVO.getUrl();
|
magicToolResultVO.setStatus("Success");
|
||||||
if (url.substring(url.lastIndexOf("/") + 1).equals("white_image.jpg")) {
|
magicToolResultVO.setUrl(minioUtil.getPreSignedUrl(toProductImageResult.getUrl(), CommonConstant.MINIO_IMAGE_EXPIRE_TIME));
|
||||||
magicToolResultVO.setStatus("Invalid");
|
magicToolResultVO.setResultType(toProductImageResult.getResultType());
|
||||||
} else {
|
magicToolResultVO.setElementId(toProductImageResult.getElementId());
|
||||||
magicToolResultVO.setUrl(minioUtil.getPreSignedUrl(url, CommonConstant.MINIO_IMAGE_EXPIRE_TIME));
|
magicToolResultVO.setElementType(toProductImageResult.getElementType());
|
||||||
magicToolResultVO.setResultType(toProductImageResult.getResultType());
|
if (toProductImageResult.getElementType().equals("ProductElement")) {
|
||||||
magicToolResultVO.setElementId(toProductImageResult.getElementId());
|
ToProductElement toProductElement = toProductElementMapper.selectById(toProductImageResult.getElementId());
|
||||||
magicToolResultVO.setElementType(toProductImageResult.getElementType());
|
magicToolResultVO.setSourceUrl(minioUtil.getPreSignedUrl(toProductElement.getUrl(), 24 * 60));
|
||||||
if (toProductImageResult.getElementType().equals("ProductElement")) {
|
}else {
|
||||||
ToProductElement toProductElement = toProductElementMapper.selectById(toProductImageResult.getElementId());
|
ToProductImageResult toProductImageResult1 = toProductImageResultMapper.selectById(toProductImageResult.getElementId());
|
||||||
magicToolResultVO.setSourceUrl(minioUtil.getPreSignedUrl(toProductElement.getUrl(), 24 * 60));
|
magicToolResultVO.setSourceUrl(minioUtil.getPreSignedUrl(toProductImageResult1.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();
|
|
||||||
}
|
}
|
||||||
// if (!StringUtil.isNullOrEmpty(magicToolResultVO.getStatus())) collect.add(magicToolResultVO.getStatus());
|
|
||||||
results.add(magicToolResultVO);
|
results.add(magicToolResultVO);
|
||||||
}
|
}
|
||||||
result.setRelight(results);
|
result.setRelight(results);
|
||||||
|
|||||||
Reference in New Issue
Block a user