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-08 17:07:43 +08:00
parent bc1815ae1b 6256c90958
commit 5098f6f4a1
4 changed files with 19 additions and 7 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;
/**
* 排序

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

@@ -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 -> 存数据库

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

@@ -848,7 +848,7 @@ public class GenerateServiceImpl extends ServiceImpl<GenerateMapper, Generate> i
GenerateDetail originalDetail = generateDetailMapper.selectById(generateModifyDTO.getOriginalId());
Long generateDetailId = originalDetail.getId();
if (generateModifyDTO.getIsOverride()){
path = originalDetail.getUrl();
path = originalDetail.getUrl().replaceFirst("^[^/]+/", "").replaceFirst("\\.[^.]+$", "");
}else {
path = accountId + "/sketchboard/" + gender.toLowerCase() + "/" + category + "/" + UUID.randomUUID();
}
@@ -861,13 +861,18 @@ public class GenerateServiceImpl extends ServiceImpl<GenerateMapper, Generate> i
if (!generateModifyDTO.getIsOverride()){
GenerateDetail generateDetail = new GenerateDetail();
generateDetail.setGenerateId(originalDetail.getGenerateId());
generateDetail.setUrl(path);
generateDetail.setUrl(minioPath);
generateDetail.setIsLike((byte)0);
generateDetail.setMd5(MD5Utils.encryptFile(minioUtil.getPreSignedUrl(minioPath, CommonConstant.MINIO_IMAGE_EXPIRE_TIME, true), Boolean.FALSE));
generateDetail.setCreateDate(LocalDateTime.now());
generateDetailMapper.insert(generateDetail);
generateDetailId = generateDetail.getId();
}else {
GenerateDetail generateDetail = new GenerateDetail();
generateDetail.setUrl(minioPath);
generateDetail.setId(generateDetailId);
generateDetailMapper.updateById(generateDetail);
}
return new GenerateResultVO(generateDetailId, minioUtil.getPreSignedUrl(minioPath, CommonConstant.MINIO_IMAGE_EXPIRE_TIME, true), "Success", category);