From 90b0ef41e355cdc53dadee309b128842b1521452 Mon Sep 17 00:00:00 2001 From: xupei Date: Tue, 8 Oct 2024 15:44:01 +0800 Subject: [PATCH 1/4] =?UTF-8?q?bugfix:=E4=BF=AE=E6=94=B9=E6=8F=90=E5=8F=96?= =?UTF-8?q?=E5=87=BA=E7=9A=84sketch?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java b/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java index 1d69b0fb..11c667d8 100644 --- a/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java @@ -848,7 +848,7 @@ public class GenerateServiceImpl extends ServiceImpl i GenerateDetail originalDetail = generateDetailMapper.selectById(generateModifyDTO.getOriginalId()); Long generateDetailId = originalDetail.getId(); if (generateModifyDTO.getIsOverride()){ - path = originalDetail.getUrl(); + path = originalDetail.getUrl().replaceFirst("^[^/]+/", "");; }else { path = accountId + "/sketchboard/" + gender.toLowerCase() + "/" + category + "/" + UUID.randomUUID(); } From 3c7cbe28a1f0eca62ddcc8e71a4cfb9ac3a34ddf Mon Sep 17 00:00:00 2001 From: xupei Date: Tue, 8 Oct 2024 15:48:53 +0800 Subject: [PATCH 2/4] design single preview_submit --- src/main/java/com/ai/da/python/PythonService.java | 9 ++++++--- src/main/java/com/ai/da/python/vo/DesignPythonBasic.java | 2 ++ .../com/ai/da/service/impl/DesignItemServiceImpl.java | 6 ++++-- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/ai/da/python/PythonService.java b/src/main/java/com/ai/da/python/PythonService.java index 67e2227b..08400f45 100644 --- a/src/main/java/com/ai/da/python/PythonService.java +++ b/src/main/java/com/ai/da/python/PythonService.java @@ -2599,7 +2599,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 objects = Lists.newArrayList(); designPythonObjects.setObjects(objects); @@ -2607,7 +2608,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; } @@ -2834,7 +2835,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); @@ -2846,6 +2848,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; } diff --git a/src/main/java/com/ai/da/python/vo/DesignPythonBasic.java b/src/main/java/com/ai/da/python/vo/DesignPythonBasic.java index dbc98d63..b2d89c3c 100644 --- a/src/main/java/com/ai/da/python/vo/DesignPythonBasic.java +++ b/src/main/java/com/ai/da/python/vo/DesignPythonBasic.java @@ -16,6 +16,8 @@ public class DesignPythonBasic { private String single_overall; + private String preview_submit; + private String switch_category; /** * 排序 diff --git a/src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java b/src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java index 4c5f8d7a..49c1fe14 100644 --- a/src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java @@ -506,7 +506,7 @@ public class DesignItemServiceImpl extends ServiceImpl 不存数据库 submit -> 存数据库 From f0bfe249e08fea686b245883f1e8d521e4462857 Mon Sep 17 00:00:00 2001 From: xupei Date: Tue, 8 Oct 2024 16:17:45 +0800 Subject: [PATCH 3/4] =?UTF-8?q?bugfix:=E4=BF=AE=E6=94=B9=E6=8F=90=E5=8F=96?= =?UTF-8?q?=E7=9A=84sketch=EF=BC=8C=E5=9B=BE=E7=89=87=E5=90=8E=E7=BC=80?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java b/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java index b9304bfa..97d8f9ac 100644 --- a/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java @@ -848,7 +848,7 @@ public class GenerateServiceImpl extends ServiceImpl i GenerateDetail originalDetail = generateDetailMapper.selectById(generateModifyDTO.getOriginalId()); Long generateDetailId = originalDetail.getId(); if (generateModifyDTO.getIsOverride()){ - path = originalDetail.getUrl().replaceFirst("^[^/]+/", "");; + path = originalDetail.getUrl().replaceFirst("^[^/]+/", "").replaceFirst("\\.[^.]+$", ""); }else { path = accountId + "/sketchboard/" + gender.toLowerCase() + "/" + category + "/" + UUID.randomUUID(); } From 6256c9095862c2a7dee20e804763bc02035dc4ba Mon Sep 17 00:00:00 2001 From: xupei Date: Tue, 8 Oct 2024 16:36:48 +0800 Subject: [PATCH 4/4] =?UTF-8?q?bugfix:=E4=BF=AE=E6=94=B9=E6=8F=90=E5=8F=96?= =?UTF-8?q?=E7=9A=84sketch=EF=BC=8C=E5=9B=BE=E7=89=87=E5=90=8E=E7=BC=80?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ai/da/service/impl/GenerateServiceImpl.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java b/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java index 97d8f9ac..adccc341 100644 --- a/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java @@ -861,13 +861,18 @@ public class GenerateServiceImpl extends ServiceImpl 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);