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
2025-02-25 14:02:58 +08:00
parent 285f956caa abd68f2dc8
commit c061045466
5 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2714,7 +2714,8 @@ public class PythonService {
gradientString = JSONObject.toJSONString(designSingleItem.getGradient());
}
PrintToPython printToPython = resolveDesignSinglePrint(designSingleItem.getPrintObject().getPrints());
PrintToPython printToPython = resolveDesignSinglePrint(designSingleItem.getPrintObject().getPrints(),
designSingleItem.getPartialDesignDTO().getPartialDesignMinioPath());
resolveDesignElement(designSingleItem.getTrims(), printToPython);
response.add(new DesignPythonItem(
designSingleItem.getType(),
@@ -2731,8 +2732,7 @@ public class PythonService {
minioPath,
gradientString,
/*designSingleItem.getMaskUrl()*/
null,
designSingleItem.getPartialDesignDTO().getPartialDesignMinioPath()
null
));
});
@@ -2750,12 +2750,13 @@ public class PythonService {
}
private PrintToPython resolveDesignSinglePrint(List<DesignSinglePrint> printObject) {
private PrintToPython resolveDesignSinglePrint(List<DesignSinglePrint> printObject, String partialDesign) {
PrintToPython printToPython = new PrintToPython();
DesignPythonItemPrint printSingle = new DesignPythonItemPrint();
DesignPythonItemPrint printOverall = new DesignPythonItemPrint();
printToPython.setSingle(printSingle);
printToPython.setOverall(printOverall);
printToPython.setPartial(StringUtil.isNullOrEmpty(partialDesign) ? null : partialDesign);
if (Objects.isNull(printObject) || printObject.isEmpty()){
return printToPython;
}

8
src/main/java/com/ai/da/python/vo/DesignPythonItem.java
View File

@@ -87,11 +87,6 @@ public class DesignPythonItem {
*/
private String seg_mask_url;
/**
* 局部design
*/
private String partial_design;
public static List<String> OUTWEAR_DRESS_BLOUSE = Arrays.asList(CollectionLevel2TypeEnum.OUTWEAR.getRealName(),
CollectionLevel2TypeEnum.DRESS.getRealName(), CollectionLevel2TypeEnum.BLOUSE.getRealName());
@@ -145,7 +140,7 @@ public class DesignPythonItem {
public DesignPythonItem(String type, String path, String color, PrintToPython print, Long businessId,
Long image_id, List<Long> offset, Float[] resize_scale, Integer priority, String gradient,
String gradientString, String seg_mask_url, String partial_design) {
String gradientString, String seg_mask_url) {
this.type = type;
this.path = path;
this.color = color;
@@ -159,7 +154,6 @@ public class DesignPythonItem {
this.gradient = gradient;
this.gradientString = gradientString;
this.seg_mask_url = seg_mask_url;
this.partial_design = partial_design;
}
public DesignPythonItem(String type, String path, String color, PrintToPython print, String icon, Long businessId, Long image_id) {

1
src/main/java/com/ai/da/python/vo/PrintToPython.java
View File

@@ -11,6 +11,7 @@ public class PrintToPython {
private DesignPythonItemPrint single;
private DesignPythonItemPrint overall;
private DesignPythonItemElement element;
private String partial;
public PrintToPython(DesignPythonItemPrint overall) {
this.overall = new DesignPythonItemPrint(overall.getPrint_path_list(),Boolean.TRUE);

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

@@ -358,7 +358,7 @@ public class DesignItemServiceImpl extends ServiceImpl<DesignItemMapper, DesignI
}
designItemDetail.setIconPath(detail.getIcon());
designItemDetail.setUndividedLayer(categoryAndUndividedLayer.get(detail.getType().toLowerCase()));
designItemDetail.setPartialDesign(detail.getPartial_design());
designItemDetail.setPartialDesign(Objects.isNull(detail.getPrint()) ? null : detail.getPrint().getPartial());
designItemDetails.add(designItemDetail);
});
// businessId 来自t_sys_file或者t_library

2
src/main/java/com/ai/da/service/impl/DesignServiceImpl.java
View File

@@ -1394,6 +1394,8 @@ public class DesignServiceImpl extends ServiceImpl<DesignMapper, Design> impleme
// 有印花
d.setTrims(convertToDesignSinglePrintDTO(trims, o.getPath()));
}
String preSigned = StringUtil.isNullOrEmpty(o.getPartialDesign()) ? null : minioUtil.getPreSignedUrl(o.getPartialDesign(), CommonConstant.MINIO_IMAGE_EXPIRE_TIME);
d.setPartialDesign(new PartialDesignDTO(o.getPartialDesign(), preSigned));
}));
//single 和 Models(模特)时候 系统元素为空
List<DesignItemDetail> filterDetail2 = designItemDetails.stream()