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

参数名统一

Browse Source
This commit is contained in:
xupei
2025-02-25 14:24:15 +08:00
parent 7693de93dc
commit df2547ff81
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/ai/da/python/PythonService.java
View File

@@ -2715,7 +2715,7 @@ public class PythonService {
} }
PrintToPython printToPython = resolveDesignSinglePrint(designSingleItem.getPrintObject().getPrints(), PrintToPython printToPython = resolveDesignSinglePrint(designSingleItem.getPrintObject().getPrints(),
designSingleItem.getPartialDesignDTO().getPartialDesignMinioPath()); designSingleItem.getPartialDesign().getPartialDesignMinioPath());
resolveDesignElement(designSingleItem.getTrims(), printToPython); resolveDesignElement(designSingleItem.getTrims(), printToPython);
response.add(new DesignPythonItem( response.add(new DesignPythonItem(
designSingleItem.getType(), designSingleItem.getType(),

18
src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java
View File

@@ -448,10 +448,10 @@ public class DesignItemServiceImpl extends ServiceImpl<DesignItemMapper, DesignI
log.info("set labelingMask为空，便于日志打印"); log.info("set labelingMask为空，便于日志打印");
i.setMaskUrl(null); i.setMaskUrl(null);
} }
if (!Objects.isNull(i.getPartialDesignDTO()) && if (!Objects.isNull(i.getPartialDesign()) &&
!StringUtil.isNullOrEmpty(i.getPartialDesignDTO().getPartialDesignBase64())){ !StringUtil.isNullOrEmpty(i.getPartialDesign().getPartialDesignBase64())){
log.info("set partialDesignBase64为空，便于日志打印"); log.info("set partialDesignBase64为空，便于日志打印");
i.getPartialDesignDTO().setPartialDesignBase64(null); i.getPartialDesign().setPartialDesignBase64(null);
} }
}); });
@@ -628,9 +628,9 @@ public class DesignItemServiceImpl extends ServiceImpl<DesignItemMapper, DesignI
private void partialDesignBase64ToImage(DesignSingleIncludeLayersDTO designSingleIncludeLayersDTO, Long accountId){ private void partialDesignBase64ToImage(DesignSingleIncludeLayersDTO designSingleIncludeLayersDTO, Long accountId){
designSingleIncludeLayersDTO.getDesignSingleItemDTOList().forEach(item -> { designSingleIncludeLayersDTO.getDesignSingleItemDTOList().forEach(item -> {
PartialDesignDTO partialDesignDTO = item.getPartialDesignDTO(); PartialDesignDTO partialDesignDTO = item.getPartialDesign();
if (!Objects.isNull(item.getPartialDesignDTO()) if (!Objects.isNull(item.getPartialDesign())
&& !StringUtil.isNullOrEmpty(item.getPartialDesignDTO().getPartialDesignBase64())){ && !StringUtil.isNullOrEmpty(item.getPartialDesign().getPartialDesignBase64())){
String path ; String path ;
if (!StringUtil.isNullOrEmpty(partialDesignDTO.getPartialDesignMinioPath())){ if (!StringUtil.isNullOrEmpty(partialDesignDTO.getPartialDesignMinioPath())){
String sourcePath = partialDesignDTO.getPartialDesignMinioPath(); String sourcePath = partialDesignDTO.getPartialDesignMinioPath();
@@ -644,9 +644,9 @@ public class DesignItemServiceImpl extends ServiceImpl<DesignItemMapper, DesignI
log.error("局部design图片上传失败"); log.error("局部design图片上传失败");
throw new BusinessException("partial.design.failed"); throw new BusinessException("partial.design.failed");
} }
item.getPartialDesignDTO().setPartialDesignMinioPath(newPath); item.getPartialDesign().setPartialDesignMinioPath(newPath);
}else { }else {
item.setPartialDesignDTO(new PartialDesignDTO(null)); item.setPartialDesign(new PartialDesignDTO(null));
} }
}); });
} }
@@ -788,7 +788,7 @@ public class DesignItemServiceImpl extends ServiceImpl<DesignItemMapper, DesignI
&& (flag ? Boolean.TRUE : singleItem.getPriority().equals(layers.getPriority()))) && (flag ? Boolean.TRUE : singleItem.getPriority().equals(layers.getPriority())))
).collect(Collectors.toList())); ).collect(Collectors.toList()));
designItemClothesDetailVO.setGradient(singleItem.getGradient()); designItemClothesDetailVO.setGradient(singleItem.getGradient());
String partialDesignMinioPath = singleItem.getPartialDesignDTO().getPartialDesignMinioPath(); String partialDesignMinioPath = singleItem.getPartialDesign().getPartialDesignMinioPath();
String preSignedUrl = StringUtil.isNullOrEmpty(partialDesignMinioPath) ? null : minioUtil.getPreSignedUrl(partialDesignMinioPath, CommonConstant.MINIO_IMAGE_EXPIRE_TIME, true); String preSignedUrl = StringUtil.isNullOrEmpty(partialDesignMinioPath) ? null : minioUtil.getPreSignedUrl(partialDesignMinioPath, CommonConstant.MINIO_IMAGE_EXPIRE_TIME, true);
designItemClothesDetailVO.setPartialDesign(new PartialDesignDTO(partialDesignMinioPath, preSignedUrl)); designItemClothesDetailVO.setPartialDesign(new PartialDesignDTO(partialDesignMinioPath, preSignedUrl));
if (categoryAndUndividedLayer.containsKey(singleItem.getType().toLowerCase())) designItemClothesDetailVO.setUndividedLayer(minioUtil.getPreSignedUrl(categoryAndUndividedLayer.get(singleItem.getType().toLowerCase()), CommonConstant.MINIO_IMAGE_EXPIRE_TIME, true)); if (categoryAndUndividedLayer.containsKey(singleItem.getType().toLowerCase())) designItemClothesDetailVO.setUndividedLayer(minioUtil.getPreSignedUrl(categoryAndUndividedLayer.get(singleItem.getType().toLowerCase()), CommonConstant.MINIO_IMAGE_EXPIRE_TIME, true));