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

Merge branch 'dev/dev_xp' into dev/3.1_release_merge

Browse Source
This commit is contained in:
xupei
2026-01-14 14:28:05 +08:00
parent c5e27cd220 5bbf1326bb
commit 08b26872ff
11 changed files with 150 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2789,7 +2789,7 @@ public class PythonService {
DesignPythonObject pythonObject = new DesignPythonObject();
designPythonObjects.setProcess_id(designSingleDTO.getProcessId());
pythonObject.setItems(coverToDesignSinglePythonItem(designSingleDTO, designLibraryModelPoint, singleOverall));
pythonObject.setBasic(coverToSingleBasic(singleOverall, switchCategory, designLibraryModelPoint, previewOrSubmit));
pythonObject.setBasic(coverToSingleBasic(singleOverall, switchCategory, designLibraryModelPoint, designSingleDTO.getDesignType()));
objects.add(pythonObject);
return designPythonObjects;
}
@@ -2855,6 +2855,9 @@ public class PythonService {
designSingleItem.getPartialDesign().getPartialDesignMinioPath());
resolveDesignElement(designSingleItem.getTrims(), printToPython);
log.info("组装参数【服装：{}的maskUrl: {}】",designSingleItem.getType(), designSingleItem.getMaskUrl());
String mergeImagePath = !StringUtil.isNullOrEmpty(printToPython.getPartial())
? printToPython.getPartial() : designSingleItem.getPath();
response.add(new DesignPythonItem(
designSingleItem.getType(),
designSingleItem.getPath(),
@@ -2871,7 +2874,8 @@ public class PythonService {
gradientString,
designSingleItem.getMaskUrl(),
designSingleItem.getTranspose(),
designSingleItem.getRotate()
designSingleItem.getRotate(),
mergeImagePath
));
});
@@ -3049,7 +3053,7 @@ public class PythonService {
*/
private DesignPythonBasic coverToSingleBasic(String singleOverall, String switchCategory,
DesignLibraryModelPointVO designLibraryModelPoint,
String previewOrSubmit) {
String designType) {
DesignPythonBasic basic = new DesignPythonBasic();
basic.setSingle_overall(singleOverall);
basic.setSwitch_category(switchCategory);
@@ -3061,7 +3065,8 @@ public class PythonService {
basic.setScale_earrings(0.16);
basic.setBody_point_test(getMap(designLibraryModelPoint));
basic.setLayer_order(Boolean.TRUE);
basic.setPreview_submit(previewOrSubmit);
// basic.setPreview_submit(previewOrSubmit);
basic.setDesign_type(designType);
return basic;
}