Merge remote-tracking branch 'origin/dev/dev' into dev/dev

src/main/java/com/ai/da/model/dto/GenerateThroughImageTextDTO.java

@@ -58,4 +58,7 @@ public class GenerateThroughImageTextDTO {
 
     @ApiModelProperty("种子 取值范围 0~500")
     private String seed;
+
+    @ApiModelProperty("年龄区间 Adult || Child")
+    private String ageGroup = "Adult";
 }

src/main/java/com/ai/da/model/dto/ToProductImageDTO.java

@@ -17,4 +17,5 @@ public class ToProductImageDTO {
     private BigDecimal imageStrengthMin;
     private BigDecimal imageStrengthMax;
     private String modelName;
+    private String ageGroup;
 }

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

@@ -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:
         }

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

@@ -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");
                 }