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

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
shahaibo
2023-10-05 12:11:25 +08:00
parent 54bbf0b9b3 7a1652ac60
commit 9d1d555032
5 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,4 +30,6 @@ public interface LibraryModelPointService extends IService<LibraryModelPoint> {
*/
String modelsDot( ModelsDotDTO modelsDotDTO );
LibraryModelPoint getByRelationId(Long relationId,String modelType);
}

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

@@ -404,7 +404,7 @@ public class DesignItemServiceImpl extends ServiceImpl<DesignItemMapper, DesignI
high = libFile.getHigh();
width = libFile.getWidth();
}
LibraryModelPoint modelPoint = libraryModelPointService.getById(design.getTemplateId());
LibraryModelPoint modelPoint = libraryModelPointService.getByRelationId(design.getTemplateId(),design.getModelType());
Assert.notNull(modelPoint,"The model has not been tagged");
designLibraryModelPointVO = collectionElementService.calculateTemplatePoint(modelPoint,high,width,modelUrl);
@@ -413,6 +413,7 @@ public class DesignItemServiceImpl extends ServiceImpl<DesignItemMapper, DesignI
// 组装入参
DesignPythonObjects objects =pythonService.covertDesignSingleParam(
designSingleIncludeLayersDTO,design.getSingleOverall(),design.getSwitchCategory(),designLibraryModelPointVO);
// design
JSONObject jsonObject = pythonService.designNew(objects);
// preview -> 不存数据库 submit -> 存数据库
List<TDesignPythonOutfitDetail> tDesignPythonOutfitDetails;
@@ -586,9 +587,9 @@ public class DesignItemServiceImpl extends ServiceImpl<DesignItemMapper, DesignI
}
private List<OutfitDetailPythonItem> convertToOutfitDetailPythonItemList(List<DesignPythonOutfitVO> layers){
ArrayList<OutfitDetailPythonItem> composeLayerPythonItem = new ArrayList<>();
List<OutfitDetailPythonItem> composeLayerPythonItem = Arrays.asList(new OutfitDetailPythonItem[layers.size()]);
layers.forEach(layer -> {
composeLayerPythonItem.add(layers.size() - layer.getPriority(),new OutfitDetailPythonItem(layer.getImageCategory(),
composeLayerPythonItem.set(layer.getPriority() - 1,new OutfitDetailPythonItem(layer.getImageCategory(),
layer.getPosition(),
layer.getImageSize(),
layer.getScale(),

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

@@ -978,7 +978,6 @@ public class DesignServiceImpl extends ServiceImpl<DesignMapper, Design> impleme
}else {
designSinglePrintDTO.setIfSingle(Boolean.TRUE);
designSinglePrint.setLocation(JSONArray.parseArray(detailPrint.getPosition(),Double.class));
designSinglePrint.setScale(detailPrint.getScale());
designSinglePrint.setAngle(detailPrint.getAngle());
designSinglePrint.setPriority(detailPrint.getPriority());
}

9
src/main/java/com/ai/da/service/impl/LibraryModelPointServiceImpl.java
View File

@@ -114,4 +114,13 @@ public class LibraryModelPointServiceImpl extends ServiceImpl<LibraryModelPointM
return objects.getObjects().get(0).getBasic().getSave_name();
}
@Override
public LibraryModelPoint getByRelationId(Long relationId,String modelType){
QueryWrapper<LibraryModelPoint> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("relation_id", relationId)
.eq("model_type",modelType);
return baseMapper.selectOne(queryWrapper);
}
}