slogan

src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java

@@ -142,6 +142,7 @@ public class GenerateServiceImpl extends ServiceImpl<GenerateMapper, Generate> i
         String category = generateThroughImageTextDTO.getLevel1Type().equals(SKETCH_BOARD.getRealName()) ? "sketch" :
                 generateThroughImageTextDTO.getLevel1Type().equals(PRINT_BOARD.getRealName()) ? "print" : "moodboard";
         String path = CommonConstant.GENERATE_PATH;
+        String port = CommonConstant.PYTHON_PORT_9996;
         String jsonString = "";
         HashMap<String, String> params = new HashMap<>();
         // 3.1 确定不同类型的印花分别调哪个接口
@@ -156,9 +157,11 @@ public class GenerateServiceImpl extends ServiceImpl<GenerateMapper, Generate> i
                     break;
                 case "Slogan":
                     path = CommonConstant.GENERATE_SLOGAN;
+                    port = CommonConstant.PYTHON_PORT_9997;
+                    params.put("num_point","16");
                     params.put("tasks_id",generateThroughImageTextDTO.getUniqueId());
                     params.put("prompt", text);
-                    params.put("svg", collectionElement.getUrl());
+                    params.put("image_url", collectionElement.getUrl());
                     jsonString = JSON.toJSONString(params, SerializerFeature.WriteMapNullValue);
                     break;
                 case "Pattern":
@@ -172,7 +175,7 @@ public class GenerateServiceImpl extends ServiceImpl<GenerateMapper, Generate> i
             jsonString = JSON.toJSONString(generateToPythonDTO, SerializerFeature.WriteMapNullValue);
         }
 
-        Boolean requestResult = pythonService.generateSketchOrPrint(jsonString, path);
+        Boolean requestResult = pythonService.generateSketchOrPrint(jsonString, port, path);
 
         // 4、将请求信息落库,将本次generate的请求信息添加到t_generate表中
         save(generate);
@@ -524,8 +527,10 @@ public class GenerateServiceImpl extends ServiceImpl<GenerateMapper, Generate> i
                     throw new BusinessException("Slogan can not be empty!");
                 }
 
+                times = 1;
                 // 将图片上传到图片服务器
                 String path = minioUtil.base64UploadToPath(generateThroughImageTextDTO.getSloganBase64(), sloganBucket, null);
+//                String path = "test/7c9114f93d08a702e00da928e66f321.png";
                 String name = path.substring(path.lastIndexOf("/") + 1, path.lastIndexOf("."));
                 // 保存到db,collection-element
                 CollectionElement collectionElement = new CollectionElement();