diff --git a/src/main/java/com/ai/da/model/enums/SketchGenerateType.java b/src/main/java/com/ai/da/model/enums/SketchGenerateType.java new file mode 100644 index 00000000..ea92b547 --- /dev/null +++ b/src/main/java/com/ai/da/model/enums/SketchGenerateType.java @@ -0,0 +1,18 @@ +package com.ai.da.model.enums; + +public enum SketchGenerateType implements IEnumDisplay{ + GENERATE("generate"), + + EXTRACT("extract"),; + + private String value; + + SketchGenerateType(String value) { + this.value = value; + } + + @Override + public String getValue() { + return value; + } +} diff --git a/src/main/java/com/ai/da/model/enums/SketchStyle.java b/src/main/java/com/ai/da/model/enums/SketchStyle.java index 364ded96..475b3a01 100644 --- a/src/main/java/com/ai/da/model/enums/SketchStyle.java +++ b/src/main/java/com/ai/da/model/enums/SketchStyle.java @@ -2,11 +2,11 @@ package com.ai.da.model.enums; public enum SketchStyle implements IEnumDisplay{ - THICK("Thick"), + THICK("1"), - MEDIUM("Medium"), + MEDIUM("2"), - THIN("Thin"); + THIN("3"); private String value; diff --git a/src/main/java/com/ai/da/python/PythonService.java b/src/main/java/com/ai/da/python/PythonService.java index bb660a9a..fd702db0 100644 --- a/src/main/java/com/ai/da/python/PythonService.java +++ b/src/main/java/com/ai/da/python/PythonService.java @@ -3463,8 +3463,8 @@ public class PythonService { map.put("sketch_bucket", bucket); map.put("sketch_name", objectName); - log.info("ImageToSketch请求python 参数:####{}", map); String param = JSON.toJSONString(map, SerializerFeature.WriteNullStringAsEmpty); + log.info("ImageToSketch请求python 参数:####{}", param); RequestBody body = RequestBody.create(paramMap, param); Request request = new Request.Builder() .url(accessPythonIp + ":" + accessPythonPort + "/api/image2sketch") 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 1e035e78..54b5878e 100644 --- a/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java @@ -774,6 +774,7 @@ public class GenerateServiceImpl extends ServiceImpl i public GenerateResultVO imageToSketch(ImageToSketchDTO imageToSketchDTO) { String bucket = userBucket; Long accountId = UserContext.getUserHolder().getId(); + log.info("imageToSketch parameter : {}", imageToSketchDTO); CollectionElement collectionElement = collectionElementService.getById(imageToSketchDTO.getElementId()); String imagePath = collectionElement.getUrl(); @@ -790,7 +791,7 @@ public class GenerateServiceImpl extends ServiceImpl i CollectionElement styleElement = collectionElementService.getById(imageToSketchDTO.getElementId()); styleImage = styleElement.getUrl(); } else { - styleImage = null; + styleImage = ""; } String sketchPath = pythonService.imageToSketch(imagePath, bucket, objectName, styleCode, styleImage); diff --git a/src/main/resources/messages_en.properties b/src/main/resources/messages_en.properties index 4f977ea5..8985db45 100644 --- a/src/main/resources/messages_en.properties +++ b/src/main/resources/messages_en.properties @@ -212,4 +212,7 @@ POCKET=Pocket THICK=Thick Lines MEDIUM=Medium Lines -THIN=Thin lines \ No newline at end of file +THIN=Thin lines + +GENERATE=Generate Sketch +EXTRACT=Extract Sketch \ No newline at end of file diff --git a/src/main/resources/messages_zh.properties b/src/main/resources/messages_zh.properties index 582db728..78656c87 100644 --- a/src/main/resources/messages_zh.properties +++ b/src/main/resources/messages_zh.properties @@ -205,4 +205,7 @@ POCKET=口袋 THICK=粗线条 MEDIUM=中线条 -THIN=细线条 \ No newline at end of file +THIN=细线条 + +GENERATE=生成线稿 +EXTRACT=提取线稿 \ No newline at end of file