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
2024-10-08 15:49:39 +08:00
parent c834aacf3a 3c7cbe28a1
commit 7bbfd7c506
3 changed files with 12 additions and 5 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

@@ -2585,7 +2585,8 @@ public class PythonService {
* @return
*/
public DesignPythonObjects covertDesignSingleParam(DesignSingleIncludeLayersDTO designSingleDTO, String singleOverall,
String switchCategory, DesignLibraryModelPointVO designLibraryModelPoint) {
String switchCategory, DesignLibraryModelPointVO designLibraryModelPoint,
String previewOrSubmit) {
DesignPythonObjects designPythonObjects = new DesignPythonObjects();
List<DesignPythonObject> objects = Lists.newArrayList();
designPythonObjects.setObjects(objects);
@@ -2593,7 +2594,7 @@ public class PythonService {
DesignPythonObject pythonObject = new DesignPythonObject();
designPythonObjects.setProcess_id(designSingleDTO.getProcessId());
pythonObject.setItems(coverToDesignSinglePythonItem(designSingleDTO, designLibraryModelPoint));
pythonObject.setBasic(coverToSingleBasic(singleOverall, switchCategory, designLibraryModelPoint));
pythonObject.setBasic(coverToSingleBasic(singleOverall, switchCategory, designLibraryModelPoint, previewOrSubmit));
objects.add(pythonObject);
return designPythonObjects;
}
@@ -2820,7 +2821,8 @@ public class PythonService {
* @return
*/
private DesignPythonBasic coverToSingleBasic(String singleOverall, String switchCategory,
DesignLibraryModelPointVO designLibraryModelPoint) {
DesignLibraryModelPointVO designLibraryModelPoint,
String previewOrSubmit) {
DesignPythonBasic basic = new DesignPythonBasic();
basic.setSingle_overall(singleOverall);
basic.setSwitch_category(switchCategory);
@@ -2832,6 +2834,7 @@ public class PythonService {
basic.setScale_earrings(0.16);
basic.setBody_point_test(getMap(designLibraryModelPoint));
basic.setLayer_order(Boolean.TRUE);
basic.setPreview_submit(previewOrSubmit);
return basic;
}

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

@@ -16,6 +16,8 @@ public class DesignPythonBasic {
private String single_overall;
private String preview_submit;
private String switch_category;
/**
* 排序