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

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

Browse Source
This commit is contained in:
shahaibo
2024-10-20 10:52:24 +08:00
parent ebd596d0d2 04ce95caa4
commit 7f889b54e0
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2670,7 +2670,10 @@ public class PythonService {
designSingleItem.getPriority(), designSingleItem.getPriority(),
minioPath, minioPath,
gradientString, gradientString,
designSingleItem.getMaskUrl())); /*designSingleItem.getMaskUrl()*/
null
));
}); });

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

@@ -508,12 +508,13 @@ public class DesignItemServiceImpl extends ServiceImpl<DesignItemMapper, DesignI
// 将标注后的mask上传到minio,并将minio地址传给python端 // 将标注后的mask上传到minio,并将minio地址传给python端
// todo 如果当前design使用的仍是旧的mask 则置maskUrl为null // todo 如果当前design使用的仍是旧的mask 则置maskUrl为null
// 1、查询当前design item在不在history中 // 1、查询当前design item在不在history中
UserLike userLikeDesign = userLikeService.getByDesignItemId(designItem.getId()); /* UserLike userLikeDesign = userLikeService.getByDesignItemId(designItem.getId());
Boolean setNull = Boolean.FALSE; Boolean setNull = Boolean.FALSE;
if (!Objects.isNull(userLikeDesign) && userLikeDesign.getConverted() == 0){ if (!Objects.isNull(userLikeDesign) && userLikeDesign.getConverted() == 0){
setNull = Boolean.TRUE; setNull = Boolean.TRUE;
} }*/
maskBase64ToPath(designSingleIncludeLayersDTO, setNull); // maskBase64ToPath(designSingleIncludeLayersDTO, setNull);
maskBase64ToPath(designSingleIncludeLayersDTO, Boolean.TRUE);
// 组装入参 // 组装入参
DesignPythonObjects objects = pythonService.covertDesignSingleParam( DesignPythonObjects objects = pythonService.covertDesignSingleParam(