Merge branch 'dev/dev_xp' into dev/dev
This commit is contained in:
@@ -506,7 +506,7 @@ public class DesignItemServiceImpl extends ServiceImpl<DesignItemMapper, DesignI
|
||||
sketchBase64ToPath(designSingleIncludeLayersDTO);
|
||||
|
||||
// 将标注后的mask上传到minio,并将minio地址传给python端
|
||||
// todo 如何当前design使用的仍是旧的mask 则置maskUrl为null
|
||||
// todo 如果当前design使用的仍是旧的mask 则置maskUrl为null
|
||||
// 1、查询当前design item在不在history中
|
||||
UserLike userLikeDesign = userLikeService.getByDesignItemId(designItem.getId());
|
||||
Boolean setNull = Boolean.FALSE;
|
||||
@@ -517,7 +517,9 @@ public class DesignItemServiceImpl extends ServiceImpl<DesignItemMapper, DesignI
|
||||
|
||||
// 组装入参
|
||||
DesignPythonObjects objects = pythonService.covertDesignSingleParam(
|
||||
designSingleIncludeLayersDTO, design.getSingleOverall(), design.getSwitchCategory(), designLibraryModelPointVO);
|
||||
designSingleIncludeLayersDTO, design.getSingleOverall(),
|
||||
design.getSwitchCategory(), designLibraryModelPointVO,
|
||||
designSingleIncludeLayersDTO.getIsPreview() ? "preview" : "submit");
|
||||
// design
|
||||
JSONObject jsonObject = pythonService.designNew(objects);
|
||||
// preview -> 不存数据库 submit -> 存数据库
|
||||
|
||||
Reference in New Issue
Block a user