From bc240cd2ee516a6276db526bccac8ed6ad399237 Mon Sep 17 00:00:00 2001 From: shahaibo <1023316923@qq.com> Date: Thu, 27 Jun 2024 17:36:47 +0800 Subject: [PATCH] TASK:aida; --- .../com/ai/da/model/dto/ModelsDotDTO.java | 2 ++ .../java/com/ai/da/python/PythonService.java | 28 +++++++++++-------- .../secondary/AttributeRetrievalMapper.xml | 6 ++-- 3 files changed, 21 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/ai/da/model/dto/ModelsDotDTO.java b/src/main/java/com/ai/da/model/dto/ModelsDotDTO.java index 13d05050..f6a20db7 100644 --- a/src/main/java/com/ai/da/model/dto/ModelsDotDTO.java +++ b/src/main/java/com/ai/da/model/dto/ModelsDotDTO.java @@ -71,4 +71,6 @@ public class ModelsDotDTO implements Serializable { */ private String templateUrl; + private String sex; + } diff --git a/src/main/java/com/ai/da/python/PythonService.java b/src/main/java/com/ai/da/python/PythonService.java index da8def64..26027876 100644 --- a/src/main/java/com/ai/da/python/PythonService.java +++ b/src/main/java/com/ai/da/python/PythonService.java @@ -2800,24 +2800,28 @@ public class PythonService { private List coverToModelsDotPythonItem(ModelsDotDTO modelsDotDTO) { List response = Lists.newArrayList(); - if (modelsDotDTO.getTemplateUrl().contains("female")) { -// DesignPythonItem dress = new DesignPythonItem(); -// dress.setType(SysFileLevel2TypeEnum.DRESS.getRealName()); -// dress.setColor("none"); -// dress.setIcon("none"); + if (modelsDotDTO.getSex().contains("Female")) { + DesignPythonItem dress = new DesignPythonItem(); + dress.setType(SysFileLevel2TypeEnum.BLOUSE.getRealName()); + dress.setColor("none"); + dress.setIcon("none"); DesignPythonItemPrint designPythonItemPrint = new DesignPythonItemPrint(); designPythonItemPrint.setIfSingle(false); designPythonItemPrint.setPrint_path_list(new ArrayList<>()); -// dress.setPrint(designPythonItemPrint); -// dress.setPath("aida-sys-image/images/female/blouse/blouse_p5_817.jpg"); -// response.add(dress); + dress.setPrint(designPythonItemPrint); + dress.setPath("aida-sys-image/images/female/blouse/0628001551.jpg"); + response.add(dress); DesignPythonItem skirt = new DesignPythonItem(); - skirt.setType(SysFileLevel2TypeEnum.DRESS.getRealName()); + skirt.setType(SysFileLevel2TypeEnum.SKIRT.getRealName()); skirt.setColor("none"); skirt.setIcon("none"); - skirt.setPrint(designPythonItemPrint); - skirt.setPath("aida-sys-image/images/female/dress/0628002038.jpeg"); + DesignPythonItemPrint designPythonItemPrint1 = new DesignPythonItemPrint(); + designPythonItemPrint1.setIfSingle(false); + designPythonItemPrint1.setPrint_path_list(new ArrayList<>()); + skirt.setPrint(designPythonItemPrint1); + skirt.setPath("aida-sys-image/images/female/skirt/0628000022.jpg"); +// skirt.setPath("aida-sys-image/images/female/dress/0628000000.jpg"); response.add(skirt); } else { DesignPythonItem top = new DesignPythonItem(); @@ -2839,7 +2843,7 @@ public class PythonService { designPythonItemPrint1.setIfSingle(false); designPythonItemPrint1.setPrint_path_list(new ArrayList<>()); bottom.setPrint(designPythonItemPrint1); - bottom.setPath("aida-sys-image/images/male/bottoms/mens_test_12.png"); + bottom.setPath("aida-sys-image/images/male/bottoms/mens_test_6252.png"); response.add(bottom); } diff --git a/src/main/resources/mapper/secondary/AttributeRetrievalMapper.xml b/src/main/resources/mapper/secondary/AttributeRetrievalMapper.xml index 8065dc00..bcdfa819 100644 --- a/src/main/resources/mapper/secondary/AttributeRetrievalMapper.xml +++ b/src/main/resources/mapper/secondary/AttributeRetrievalMapper.xml @@ -32,7 +32,7 @@ AND style = #{style} - AND deprecated = 0 + ORDER BY RAND() @@ -48,7 +48,7 @@ AND style = #{style} - AND deprecated = 0 + ORDER BY RAND() @@ -73,7 +73,7 @@ AND style = #{style} - AND deprecated = 0 + ORDER BY RAND()