From ce384dbba9b59c4287f3fac78f7654d303019fb0 Mon Sep 17 00:00:00 2001 From: shahaibo <1023316923@qq.com> Date: Tue, 2 Jul 2024 13:48:53 +0800 Subject: [PATCH] BUGFIX:aida; --- .../com/ai/da/model/dto/ToProductImageDTO.java | 2 ++ .../java/com/ai/da/model/vo/PortfolioVO.java | 2 ++ .../com/ai/da/model/vo/UserLikeGroupVO.java | 4 ++++ .../java/com/ai/da/python/PythonService.java | 7 +++++-- .../da/service/impl/PortfolioServiceImpl.java | 6 ++++++ .../service/impl/UserLikeGroupServiceImpl.java | 18 +++++++++++++----- 6 files changed, 32 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/ai/da/model/dto/ToProductImageDTO.java b/src/main/java/com/ai/da/model/dto/ToProductImageDTO.java index 25af4ec5..e51f5fd7 100644 --- a/src/main/java/com/ai/da/model/dto/ToProductImageDTO.java +++ b/src/main/java/com/ai/da/model/dto/ToProductImageDTO.java @@ -3,6 +3,7 @@ package com.ai.da.model.dto; import com.ai.da.model.vo.ToProductImageVO; import lombok.Data; +import java.math.BigDecimal; import java.util.List; @Data @@ -10,4 +11,5 @@ public class ToProductImageDTO { private Long userLikeGroupId; private List toProductImageVOList; private String prompt; + private BigDecimal imageStrength; } diff --git a/src/main/java/com/ai/da/model/vo/PortfolioVO.java b/src/main/java/com/ai/da/model/vo/PortfolioVO.java index 12e9199b..de059c3c 100644 --- a/src/main/java/com/ai/da/model/vo/PortfolioVO.java +++ b/src/main/java/com/ai/da/model/vo/PortfolioVO.java @@ -18,4 +18,6 @@ public class PortfolioVO extends Portfolio { private Long viewNums; private String userName; + + private String originalUserName; } diff --git a/src/main/java/com/ai/da/model/vo/UserLikeGroupVO.java b/src/main/java/com/ai/da/model/vo/UserLikeGroupVO.java index a796d902..8f35521b 100644 --- a/src/main/java/com/ai/da/model/vo/UserLikeGroupVO.java +++ b/src/main/java/com/ai/da/model/vo/UserLikeGroupVO.java @@ -22,6 +22,10 @@ public class UserLikeGroupVO { @ApiModelProperty("创建者") private String author; + private Integer original; + + private Long originalAccountId; + @ApiModelProperty("更新时间") private Long updateDate; diff --git a/src/main/java/com/ai/da/python/PythonService.java b/src/main/java/com/ai/da/python/PythonService.java index 26027876..f9a48575 100644 --- a/src/main/java/com/ai/da/python/PythonService.java +++ b/src/main/java/com/ai/da/python/PythonService.java @@ -3311,7 +3311,7 @@ public class PythonService { return text; } - public Boolean toProductImage(String url, String taskId, String prompt) { + public Boolean toProductImage(String url, String taskId, String prompt, BigDecimal imageStrength) { // todo 限流校验 // AccessLimitUtils.validate("design",5); OkHttpClient client = new OkHttpClient().newBuilder() @@ -3322,12 +3322,14 @@ public class PythonService { .build(); MediaType mediaType = MediaType.parse("application/json"); //关闭FastJson的引用检测 防止出现$ref 现象 - Map map = new HashMap<>(); + Map map = new HashMap<>(); map.put("tasks_id", taskId); map.put("image_url", url); map.put("prompt", prompt); + map.put("image_strength", imageStrength); log.info("toProductImage请求python 参数:####{}", map); String param = JSON.toJSONString(map, SerializerFeature.WriteNullStringAsEmpty); + System.out.println(param); RequestBody body = RequestBody.create(mediaType, param); Request request = new Request.Builder() // .url(accessPythonIp + ":" + accessPythonPort + "/api/generate_product_image") @@ -3370,6 +3372,7 @@ public class PythonService { map.put("prompt", prompt); log.info("relightImage请求python 参数:####{}", map); String param = JSON.toJSONString(map, SerializerFeature.WriteNullStringAsEmpty); + log.info(param); RequestBody body = RequestBody.create(mediaType, param); Request request = new Request.Builder() // .url(accessPythonIp + ":" + accessPythonPort + "/api/generate_product_image") diff --git a/src/main/java/com/ai/da/service/impl/PortfolioServiceImpl.java b/src/main/java/com/ai/da/service/impl/PortfolioServiceImpl.java index 664e73de..3144ed5b 100644 --- a/src/main/java/com/ai/da/service/impl/PortfolioServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/PortfolioServiceImpl.java @@ -408,6 +408,9 @@ public class PortfolioServiceImpl extends ServiceImpl