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
2025-06-17 14:53:52 +08:00
parent c1c50cb28b 3f13f64ab9
commit 5e066995e8
4 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -175,7 +175,7 @@ public class GenerateServiceImpl extends ServiceImpl<GenerateMapper, Generate> i
Long elementId = generateThroughImageTextDTO.getCollectionElementId();
// validateGeneraType(generate, text, elementId);
if (!StringUtil.isNullOrEmpty(text)) {
text = modifyPrompt(text, generate, generateThroughImageTextDTO.getLevel1Type());
text = modifyPrompt(text, generate, generateThroughImageTextDTO.getLevel1Type(), generateThroughImageTextDTO.getAgeGroup());
}
// todo 这一步现在还是有必要的吗？
@@ -354,7 +354,7 @@ public class GenerateServiceImpl extends ServiceImpl<GenerateMapper, Generate> i
}
private String modifyPrompt(String userInput, Generate generate, String level1Type) {
private String modifyPrompt(String userInput, Generate generate, String level1Type, String ageGroup) {
String text = "";
String prefix = "";
if (userInput.startsWith("Painting Style")
@@ -386,6 +386,9 @@ public class GenerateServiceImpl extends ServiceImpl<GenerateMapper, Generate> i
case "Sketchboard":
// text = "clear lines, simple outlines monochrome white vector image of " + translated + ", no background, sketch flat, front view display, best quality, ultra-high resolution 8k";
text = "a single item of sketch of " + translated + ", 4k, white background";
if (!StringUtil.isNullOrEmpty(ageGroup) && ageGroup.equals("Child")){
text = text + ", Children's clothing";
}
// generate.setText(text);
default:
}

4
src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java
View File

@@ -455,6 +455,10 @@ public class UserLikeGroupServiceImpl extends ServiceImpl<UserLikeGroupMapper, U
toProductImageResult.setResultType("ToProductImage");
} else {
// 走模型
if (!StringUtil.isNullOrEmpty(toProductImageDTO.getAgeGroup())
&& toProductImageDTO.getAgeGroup().equals("Child")){
sb.append(", Children's face");
}
pythonService.toProductImage(tDesignPythonOutfit.getDesignUrl(), taskId, sb.toString(), toProductImageDTO.getImageStrength(), productType);
toProductImageResult.setModelName("local");
}