diff --git a/src/main/java/com/ai/da/common/RabbitMQ/MQConfig.java b/src/main/java/com/ai/da/common/RabbitMQ/MQConfig.java index b44bea8c..7f9e4b18 100644 --- a/src/main/java/com/ai/da/common/RabbitMQ/MQConfig.java +++ b/src/main/java/com/ai/da/common/RabbitMQ/MQConfig.java @@ -26,9 +26,9 @@ public class MQConfig { // public static final String GENERATE_RESULT_QUEUE = "GenerateImage-local"; public static final String GENERATE_RESULT_QUEUE = "GenerateImage-dev"; - public static final String TO_PRODUCT_IMAGE_RESULT_QUEUE = "ToProductImage-local"; + public static final String TO_PRODUCT_IMAGE_RESULT_QUEUE = "ToProductImage-dev"; - public static final String RELIGHT_RESULT_QUEUE = "Relight-local"; + public static final String RELIGHT_RESULT_QUEUE = "Relight-dev"; public MQConfig() { } diff --git a/src/main/java/com/ai/da/common/RabbitMQ/SRConsumer.java b/src/main/java/com/ai/da/common/RabbitMQ/SRConsumer.java index b8ba32f2..6ad261bd 100644 --- a/src/main/java/com/ai/da/common/RabbitMQ/SRConsumer.java +++ b/src/main/java/com/ai/da/common/RabbitMQ/SRConsumer.java @@ -218,17 +218,17 @@ public class SRConsumer { taskListService.updateTaskStatusOrOutputRedis(uniqueId, "fail", null); } -// @RabbitListener(queues = MQConfig.SR_QUEUE) -// @RabbitHandler -// public void SRConsumer1(Message msg, Channel channel) { -// superResolution(msg, channel, "consumer 1"); -// } -// -// -// @RabbitListener(queues = MQConfig.SR_RESULT_QUEUE) -// @RabbitHandler -// public void SRResultConsumer1(Message msg, Channel channel) { -// getSRResult(msg, channel, "consumer 1"); -// } + @RabbitListener(queues = MQConfig.SR_QUEUE) + @RabbitHandler + public void SRConsumer1(Message msg, Channel channel) { + superResolution(msg, channel, "consumer 1"); + } + + + @RabbitListener(queues = MQConfig.SR_RESULT_QUEUE) + @RabbitHandler + public void SRResultConsumer1(Message msg, Channel channel) { + getSRResult(msg, channel, "consumer 1"); + } } diff --git a/src/main/java/com/ai/da/common/config/MyTaskScheduler.java b/src/main/java/com/ai/da/common/config/MyTaskScheduler.java index 6fb19b5a..3473f597 100644 --- a/src/main/java/com/ai/da/common/config/MyTaskScheduler.java +++ b/src/main/java/com/ai/da/common/config/MyTaskScheduler.java @@ -1,5 +1,6 @@ package com.ai.da.common.config; +import com.ai.da.common.utils.ExcelReader; import com.ai.da.common.utils.MinioUtil; import com.ai.da.common.utils.SendEmailUtil; import com.ai.da.mapper.primary.*; @@ -26,6 +27,9 @@ import java.time.LocalDate; import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.List; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; @Component @@ -34,6 +38,7 @@ public class MyTaskScheduler { @PostConstruct public void test() { // clearMinio(); +// addSystemFileStyle(); } @Resource @@ -214,30 +219,104 @@ public class MyTaskScheduler { private AttributeRetrievalMapper attributeRetrievalMapper; public void addSystemFileStyle() { - String directoryPath = "C:\\Users\\10233\\Downloads\\blouse done\\blouse done\\废土风"; - List fileNames = getFileNames(directoryPath); - for (String fileName : fileNames) { - String tableName = "female_top"; - String style = "feitufeng"; - Long idByFileName = attributeRetrievalMapper.getIdByFileName(fileName, tableName); - attributeRetrievalMapper.updateStyleById(idByFileName, style, tableName); + ExecutorService executorService = Executors.newFixedThreadPool(5); + + try { + String[] filePaths = { + "C:\\Users\\10233\\Documents\\WeChat Files\\wxid_h7l9im0r8ql922\\FileStorage\\File\\2024-06\\style\\Blouse style output updated25.6.2024.xlsx", + "C:\\Users\\10233\\Documents\\WeChat Files\\wxid_h7l9im0r8ql922\\FileStorage\\File\\2024-06\\style\\Dress style output updated25.6.2024.xlsx", + "C:\\Users\\10233\\Documents\\WeChat Files\\wxid_h7l9im0r8ql922\\FileStorage\\File\\2024-06\\style\\Outerwear style output.xlsx", + "C:\\Users\\10233\\Documents\\WeChat Files\\wxid_h7l9im0r8ql922\\FileStorage\\File\\2024-06\\style\\Skirt style output .xlsx", + "C:\\Users\\10233\\Documents\\WeChat Files\\wxid_h7l9im0r8ql922\\FileStorage\\File\\2024-06\\style\\Trousers style output.xlsx" + }; + + for (String filePath : filePaths) { + executorService.submit(() -> processExcelFile(filePath)); + } + } finally { + executorService.shutdown(); + try { + if (!executorService.awaitTermination(60, TimeUnit.MINUTES)) { + executorService.shutdownNow(); + } + } catch (InterruptedException e) { + executorService.shutdownNow(); + } } } - public static List getFileNames(String directoryPath) { - List fileNames = new ArrayList<>(); - Path path = Paths.get(directoryPath); + private void processExcelFile(String filePath) { + System.out.println("线程开始"); + try { + List> excelData = ExcelReader.readExcel(filePath); + String tableName = getTableNameFromFilePath(filePath); + String prefix = getPrefixFromFilePath(filePath); - try (DirectoryStream stream = Files.newDirectoryStream(path)) { - for (Path entry : stream) { - if (Files.isRegularFile(entry)) { - fileNames.add(entry.getFileName().toString()); + for (List columnData : excelData) { + String style = columnData.get(0); + for (int i = 1; i < columnData.size(); i++) { + String fileName = columnData.get(i); + if (StringUtils.isBlank(fileName)) { + continue; + } + if ("X".equals(style)) { + attributeRetrievalMapper.updateStyleByFileName("X", prefix + fileName, tableName); + System.out.println(fileName); + } else { + attributeRetrievalMapper.updateStyleByFileName(style, prefix + fileName, tableName); + System.out.println(fileName); + } } } } catch (IOException e) { - System.err.println("Error reading directory: " + e.getMessage()); + e.printStackTrace(); } - - return fileNames; } + + private String getTableNameFromFilePath(String filePath) { + if (filePath.contains("Blouse")) { + return "female_top"; + } else if (filePath.contains("Dress")) { + return "female_dress"; + } else if (filePath.contains("Outerwear")) { + return "female_outwear"; + } else if (filePath.contains("Skirt")) { + return "female_skirt"; + } else if (filePath.contains("Trousers")) { + return "female_pants"; + } + return ""; + } + + private String getPrefixFromFilePath(String filePath) { + if (filePath.contains("Blouse")) { + return "blouse/"; + } else if (filePath.contains("Dress")) { + return "dress/"; + } else if (filePath.contains("Outerwear")) { + return "outwear/"; + } else if (filePath.contains("Skirt")) { + return "skirt/"; + } else if (filePath.contains("Trousers")) { + return "trousers/"; + } + return ""; + } + +// public static List getFileNames(String directoryPath) { +// List fileNames = new ArrayList<>(); +// Path path = Paths.get(directoryPath); +// +// try (DirectoryStream stream = Files.newDirectoryStream(path)) { +// for (Path entry : stream) { +// if (Files.isRegularFile(entry)) { +// fileNames.add(entry.getFileName().toString()); +// } +// } +// } catch (IOException e) { +// System.err.println("Error reading directory: " + e.getMessage()); +// } +// +// return fileNames; +// } } diff --git a/src/main/java/com/ai/da/common/utils/ExcelReader.java b/src/main/java/com/ai/da/common/utils/ExcelReader.java new file mode 100644 index 00000000..d053b1e9 --- /dev/null +++ b/src/main/java/com/ai/da/common/utils/ExcelReader.java @@ -0,0 +1,33 @@ +package com.ai.da.common.utils; + +import lombok.Data; +import org.apache.poi.ss.usermodel.Row; +import org.apache.poi.ss.usermodel.Sheet; +import org.apache.poi.ss.usermodel.Workbook; +import org.apache.poi.xssf.usermodel.XSSFWorkbook; + +import java.io.FileInputStream; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; + +@Data +public class ExcelReader { + public static List> readExcel(String filePath) throws IOException { + List> data = new ArrayList<>(); + try (FileInputStream fis = new FileInputStream(filePath); + Workbook workbook = new XSSFWorkbook(fis)) { + Sheet sheet = workbook.getSheetAt(0); + int numberOfColumns = sheet.getRow(0).getLastCellNum(); + + for (int i = 0; i < numberOfColumns; i++) { + List columnData = new ArrayList<>(); + for (Row row : sheet) { + columnData.add(row.getCell(i).getStringCellValue()); + } + data.add(columnData); + } + } + return data; + } +} diff --git a/src/main/java/com/ai/da/common/utils/MinioUtil.java b/src/main/java/com/ai/da/common/utils/MinioUtil.java index 581c6d0e..17a7173c 100644 --- a/src/main/java/com/ai/da/common/utils/MinioUtil.java +++ b/src/main/java/com/ai/da/common/utils/MinioUtil.java @@ -405,6 +405,22 @@ public class MinioUtil { } } + public String getPresignedUrl(String path, int expiry, boolean resetCache) { + if (resetCache || LocalCacheUtils.getPresignedUrlCache(path) == null) { + if (!path.contains("/")) { + throw new BusinessException("The path is error!"); + } + int index = path.indexOf("/"); + String bucketName = path.substring(0, index); + String fileName = path.substring(index + 1); + String presignedUrl = getPresignedUrl(bucketName, fileName, expiry); + LocalCacheUtils.setPresignedUrlCache(path, presignedUrl); + return presignedUrl; + } else { + return LocalCacheUtils.getPresignedUrlCache(path); + } + } + /** * 将桶名、文件名从url中分离出来 * diff --git a/src/main/java/com/ai/da/controller/PortfolioController.java b/src/main/java/com/ai/da/controller/PortfolioController.java index d2c2fcfd..09e8bd39 100644 --- a/src/main/java/com/ai/da/controller/PortfolioController.java +++ b/src/main/java/com/ai/da/controller/PortfolioController.java @@ -32,6 +32,12 @@ public class PortfolioController { return Response.success(portfolioService.publish(canvas, data)); } + @ApiOperation(value = "删除作品集") + @GetMapping("/delete") + public Response delete(@RequestParam("id") Long id) { + return Response.success(portfolioService.delete(id)); + } + @CrossOrigin @ApiOperation(value = "作品集page") @PostMapping("/page") diff --git a/src/main/java/com/ai/da/controller/SavedCollectionController.java b/src/main/java/com/ai/da/controller/SavedCollectionController.java index 334c0037..f5147a7c 100644 --- a/src/main/java/com/ai/da/controller/SavedCollectionController.java +++ b/src/main/java/com/ai/da/controller/SavedCollectionController.java @@ -49,6 +49,8 @@ public class SavedCollectionController { private MinioUtil minioUtil; @Resource private ClassificationService classificationService; + @Resource + private PortfolioService portfolioService; @ApiOperation(value = "History用户分页分组列表") @PostMapping("/queryUserGroup") @@ -122,6 +124,10 @@ public class SavedCollectionController { } userLikeGroupVO.setGroupDetails(details); userLikeGroupVO.setSketchCount(CollectionUtils.isEmpty(details) ? 0 : details.size()); + if (userLikeGroupVO.getOriginal() == 0) { + userLikeGroupVO.setOriginalAccountName(accountService.getById(userLikeGroupVO.getOriginalAccountId()).getUserName()); + userLikeGroupVO.setOriginalPortfolioName(portfolioService.getById(userLikeGroupVO.getOriginalPortfolioId()).getPortfolioName()); + } return userLikeGroupVO; } return null; @@ -209,7 +215,7 @@ public class SavedCollectionController { @ApiOperation("productImageLikeList") @PostMapping("/productImageLikeList") - public Response> productImageLikeList(@Valid @RequestBody ToProductImageDTO toProductImageDTO) { + public Response> productImageLikeList(@Valid @RequestBody ToProductImageDTO toProductImageDTO) { return Response.success(userLikeGroupService.productImageLikeList(toProductImageDTO)); } diff --git a/src/main/java/com/ai/da/mapper/primary/entity/Portfolio.java b/src/main/java/com/ai/da/mapper/primary/entity/Portfolio.java index 8f15354a..258012f1 100644 --- a/src/main/java/com/ai/da/mapper/primary/entity/Portfolio.java +++ b/src/main/java/com/ai/da/mapper/primary/entity/Portfolio.java @@ -47,6 +47,12 @@ public class Portfolio implements Serializable { @ApiModelProperty(value = "是否允许二次创作1允许0不允许") private Integer openSource; + private Integer original; + + private Long originalAccountId; + + private Long originalPortfolioId; + @ApiModelProperty(value = "作品集作者ID") private Long accountId; diff --git a/src/main/java/com/ai/da/mapper/primary/entity/UserLikeGroup.java b/src/main/java/com/ai/da/mapper/primary/entity/UserLikeGroup.java index 2aa8cc0e..4f3867ca 100644 --- a/src/main/java/com/ai/da/mapper/primary/entity/UserLikeGroup.java +++ b/src/main/java/com/ai/da/mapper/primary/entity/UserLikeGroup.java @@ -43,6 +43,12 @@ public class UserLikeGroup implements Serializable { */ private String name; + private Integer original; + + private Long originalAccountId; + + private Long originalPortfolioId; + /** * 创建时间 */ diff --git a/src/main/java/com/ai/da/mapper/secondary/AttributeRetrievalMapper.java b/src/main/java/com/ai/da/mapper/secondary/AttributeRetrievalMapper.java index 6b74dc9e..1c3be31b 100644 --- a/src/main/java/com/ai/da/mapper/secondary/AttributeRetrievalMapper.java +++ b/src/main/java/com/ai/da/mapper/secondary/AttributeRetrievalMapper.java @@ -17,13 +17,15 @@ import java.util.List; public interface AttributeRetrievalMapper { - List getSystemSketchPool(@Param("attributeRetrievalAttrDict") AttributeRetrieval attributeRetrievalAttrDict, @Param("tableName") String tableName, @Param("poolNum") int poolNum); + List getSystemSketchPool(@Param("attributeRetrievalAttrDict") AttributeRetrieval attributeRetrievalAttrDict, @Param("tableName") String tableName, @Param("poolNum") int poolNum, @Param("style") String style); - AttributeRetrieval getSystemRandom(String tableName); + AttributeRetrieval getSystemRandom(String tableName, String style); - List getSystemSketchPoolBySameCategory(AttributeRetrieval attributeRetrievalAttrDict, String tableName); + List getSystemSketchPoolBySameCategory(AttributeRetrieval attributeRetrievalAttrDict, String tableName, String style); Long getIdByFileName(String fileName, String tableName); void updateStyleById(Long idByFileName, String style, String tableName); + + void updateStyleByFileName(String style, String fileName, String tableName); } diff --git a/src/main/java/com/ai/da/model/dto/DesignCollectionPrintElementDTO.java b/src/main/java/com/ai/da/model/dto/DesignCollectionPrintElementDTO.java index 18853d95..50d4f679 100644 --- a/src/main/java/com/ai/da/model/dto/DesignCollectionPrintElementDTO.java +++ b/src/main/java/com/ai/da/model/dto/DesignCollectionPrintElementDTO.java @@ -14,6 +14,8 @@ public class DesignCollectionPrintElementDTO { @ApiModelProperty("design类型 用户design生成时候区别library和collection") private String designType; + private String level2Type; + @ApiModelProperty("是否pin 1 pin 0 不pin") private Byte isPin; 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/model/dto/ToProductImageDTO.java b/src/main/java/com/ai/da/model/dto/ToProductImageDTO.java index 25af4ec5..93263027 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,6 @@ public class ToProductImageDTO { private Long userLikeGroupId; private List toProductImageVOList; private String prompt; + private BigDecimal imageStrength; + private String direction; } diff --git a/src/main/java/com/ai/da/model/vo/MagicToolResultVO.java b/src/main/java/com/ai/da/model/vo/MagicToolResultVO.java index 2aabb67d..fb313f1a 100644 --- a/src/main/java/com/ai/da/model/vo/MagicToolResultVO.java +++ b/src/main/java/com/ai/da/model/vo/MagicToolResultVO.java @@ -22,4 +22,6 @@ public class MagicToolResultVO { private String category; private String sourceUrl; + + private String resultType; } 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..fb7b7366 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,8 @@ public class PortfolioVO extends Portfolio { private Long viewNums; private String userName; + + private String originalUserName; + + private String originalPortfolioName; } diff --git a/src/main/java/com/ai/da/model/vo/SysFileVO.java b/src/main/java/com/ai/da/model/vo/SysFileVO.java index 339d2902..dd03260d 100644 --- a/src/main/java/com/ai/da/model/vo/SysFileVO.java +++ b/src/main/java/com/ai/da/model/vo/SysFileVO.java @@ -33,4 +33,6 @@ public class SysFileVO implements Serializable { */ private String md5; + private String level3Type; + } diff --git a/src/main/java/com/ai/da/model/vo/ToProductImageResultVO.java b/src/main/java/com/ai/da/model/vo/ToProductImageResultVO.java new file mode 100644 index 00000000..c0c495c0 --- /dev/null +++ b/src/main/java/com/ai/da/model/vo/ToProductImageResultVO.java @@ -0,0 +1,9 @@ +package com.ai.da.model.vo; + +import com.ai.da.mapper.primary.entity.ToProductImageResult; +import lombok.Data; + +@Data +public class ToProductImageResultVO extends ToProductImageResult { + private String sourceUrl; +} 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..34d207b6 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,12 @@ public class UserLikeGroupVO { @ApiModelProperty("创建者") private String author; + private Integer original; + + private Long originalAccountId; + + private Long originalPortfolioId; + @ApiModelProperty("更新时间") private Long updateDate; @@ -31,4 +37,7 @@ public class UserLikeGroupVO { @ApiModelProperty("分组对应的详情 一次行带出来") private List groupDetails; + private String originalAccountName; + private String originalPortfolioName; + } diff --git a/src/main/java/com/ai/da/model/vo/ValidateElementVO.java b/src/main/java/com/ai/da/model/vo/ValidateElementVO.java index 563c4ab1..f2cb87a1 100644 --- a/src/main/java/com/ai/da/model/vo/ValidateElementVO.java +++ b/src/main/java/com/ai/da/model/vo/ValidateElementVO.java @@ -45,4 +45,6 @@ public class ValidateElementVO { //透传sysFileVo用(attribute_retrieval 接口限定sysFile范围) List sysFileVo; private String modelSex; + + private String style; } diff --git a/src/main/java/com/ai/da/python/PythonService.java b/src/main/java/com/ai/da/python/PythonService.java index 754c7ade..c5c5132e 100644 --- a/src/main/java/com/ai/da/python/PythonService.java +++ b/src/main/java/com/ai/da/python/PythonService.java @@ -602,7 +602,7 @@ public class PythonService { } else if (systemScale.compareTo(BigDecimal.ONE) != 0) { BigDecimal collectNoPinSize = BigDecimal.valueOf(collectionNoPinSize); poolNum = collectNoPinSize.divide(systemScale, 0, RoundingMode.DOWN).intValue(); - List list = getSystemSketchPool(attributeRecognition, styleCategory, elementVO.getModelSex(), poolNum); + List list = getSystemSketchPool(attributeRecognition, styleCategory, elementVO.getModelSex(), poolNum, elementVO.getStyle()); collectionElements.addAll(list); int randomNum = RandomsUtil.randomSysFile(collectionElements.size()); if (randomNum < collectionNoPinSize) { @@ -612,7 +612,7 @@ public class PythonService { } } } - List list = getSystemSketchPool(attributeRecognition, styleCategory, elementVO.getModelSex(), poolNum); + List list = getSystemSketchPool(attributeRecognition, styleCategory, elementVO.getModelSex(), poolNum, elementVO.getStyle()); int randomNum = RandomsUtil.randomSysFile(list.size()); return coverSketchToDesignPythonItem(null, list.get(randomNum), elementVO); } @@ -622,7 +622,7 @@ public class PythonService { } private DesignPythonItem processAttributeRecognitionBySameCategory(JSONObject attributeRecognition, ValidateElementVO elementVO, String styleCategory) { - List list = getSystemSketchPoolBySameCategory(attributeRecognition, styleCategory, elementVO.getModelSex()); + List list = getSystemSketchPoolBySameCategory(attributeRecognition, styleCategory, elementVO.getModelSex(), elementVO.getStyle()); int randomNum = RandomsUtil.randomSysFile(list.size()); return coverSketchToDesignPythonItem(null, list.get(randomNum), elementVO); } @@ -630,7 +630,7 @@ public class PythonService { @Resource private AttributeRetrievalMapper attributeRetrievalMapper; - private List getSystemSketchPool(JSONObject attributeRecognition, String styleCategory, String modelSex, int poolNum) { + private List getSystemSketchPool(JSONObject attributeRecognition, String styleCategory, String modelSex, int poolNum, String style) { /** * female trousers->female_pants * female blouse->female_top @@ -644,19 +644,19 @@ public class PythonService { AttributeRetrieval attributeRetrievalAttrDict = toAttrDict(attrDictJSON); String tableName; tableName = getTableName(modelSex, styleCategory); - List attributeRetrievalList = attributeRetrievalMapper.getSystemSketchPool(attributeRetrievalAttrDict, tableName, poolNum); + List attributeRetrievalList = attributeRetrievalMapper.getSystemSketchPool(attributeRetrievalAttrDict, tableName, poolNum, style); if (CollectionUtil.isEmpty(attributeRetrievalList) || attributeRetrievalList.size() < poolNum) { attributeRetrievalAttrDict.setDesign(null); - attributeRetrievalList = attributeRetrievalMapper.getSystemSketchPool(attributeRetrievalAttrDict, tableName, poolNum); + attributeRetrievalList = attributeRetrievalMapper.getSystemSketchPool(attributeRetrievalAttrDict, tableName, poolNum, style); } if (CollectionUtil.isEmpty(attributeRetrievalList) || attributeRetrievalList.size() < poolNum) { attributeRetrievalAttrDict.setSilhouette(null); - attributeRetrievalList = attributeRetrievalMapper.getSystemSketchPool(attributeRetrievalAttrDict, tableName, poolNum); + attributeRetrievalList = attributeRetrievalMapper.getSystemSketchPool(attributeRetrievalAttrDict, tableName, poolNum, style); } return toColoectionElementList(attributeRetrievalList, styleCategory, modelSex); } - private List getSystemSketchPoolBySameCategory(JSONObject attributeRecognition, String styleCategory, String modelSex) { + private List getSystemSketchPoolBySameCategory(JSONObject attributeRecognition, String styleCategory, String modelSex, String style) { /** * female trousers->female_pants * female blouse->female_top @@ -712,7 +712,7 @@ public class PythonService { } } - List attributeRetrievalList = attributeRetrievalMapper.getSystemSketchPoolBySameCategory(attributeRetrievalAttrDict, tableName); + List attributeRetrievalList = attributeRetrievalMapper.getSystemSketchPoolBySameCategory(attributeRetrievalAttrDict, tableName, style); if (CollectionUtil.isEmpty(attributeRetrievalList)) { System.out.println(attributeRetrievalAttrDict); System.out.println(tableName); @@ -935,7 +935,7 @@ public class PythonService { Integer randomNum = RandomsUtil.randomSysFile(dressings.size()); String category = dressings.get(randomNum).getStyleCategory(); String tableName = getTableName(validateElementVO.getModelSex(), category); - AttributeRetrieval attributeRetrieval = attributeRetrievalMapper.getSystemRandom(tableName); + AttributeRetrieval attributeRetrieval = attributeRetrievalMapper.getSystemRandom(tableName, validateElementVO.getStyle()); CollectionElement collectionElement = toCollectionElement(attributeRetrieval, category, validateElementVO.getModelSex()); return coverSketchToDesignPythonItem(null, collectionElement, validateElementVO); } @@ -975,7 +975,7 @@ public class PythonService { Integer randomNum = RandomsUtil.randomSysFile(dressings.size()); String category = dressings.get(randomNum).getStyleCategory(); String tableName = getTableName(validateElementVO.getModelSex(), category); - AttributeRetrieval attributeRetrieval = attributeRetrievalMapper.getSystemRandom(tableName); + AttributeRetrieval attributeRetrieval = attributeRetrievalMapper.getSystemRandom(tableName, validateElementVO.getStyle()); CollectionElement collectionElement = toCollectionElement(attributeRetrieval, category, validateElementVO.getModelSex()); return coverSketchToDesignPythonItem(null, collectionElement, validateElementVO); } @@ -2800,24 +2800,28 @@ public class PythonService { private List coverToModelsDotPythonItem(ModelsDotDTO modelsDotDTO) { List response = Lists.newArrayList(); - if (modelsDotDTO.getTemplateUrl().contains("female")) { + if (modelsDotDTO.getSex().contains("Female")) { DesignPythonItem dress = new DesignPythonItem(); - dress.setType(SysFileLevel2TypeEnum.DRESS.getRealName()); + 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"); + dress.setPath("aida-sys-image/images/female/blouse/0628001551.jpg"); response.add(dress); DesignPythonItem skirt = new DesignPythonItem(); - skirt.setType(SysFileLevel2TypeEnum.TROUSERS.getRealName()); + skirt.setType(SysFileLevel2TypeEnum.SKIRT.getRealName()); skirt.setColor("none"); skirt.setIcon("none"); - skirt.setPrint(designPythonItemPrint); - skirt.setPath("aida-sys-image/images/female/trousers/trousers_974.jpg"); + 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_10007.png"); + bottom.setPath("aida-sys-image/images/male/bottoms/mens_test_6252.png"); response.add(bottom); } @@ -3307,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() @@ -3318,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") @@ -3348,4 +3354,48 @@ public class PythonService { //生成失败 throw new BusinessException("toProductImage.interface.exception"); } + + public Boolean relight(String url, String taskId, String prompt, String direction) { + // todo 限流校验 +// AccessLimitUtils.validate("design",5); + OkHttpClient client = new OkHttpClient().newBuilder() + .connectTimeout(30, TimeUnit.SECONDS) + .pingInterval(5, TimeUnit.SECONDS)//websocket轮训间隔(单位:秒) + .readTimeout(60, TimeUnit.SECONDS)//读取超时(单位:秒) + .writeTimeout(60, TimeUnit.SECONDS)//写入超时(单位:秒) + .build(); + MediaType mediaType = MediaType.parse("application/json"); + //关闭FastJson的引用检测 防止出现$ref 现象 + Map map = new HashMap<>(); + map.put("tasks_id", taskId); + map.put("image_url", url); + map.put("prompt", prompt); + map.put("direction", direction); + 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") +// .url(accessPythonIp + ":9996/api/generate_product_image") + .url(accessPythonIp + ":9996/api/generate_relight_image") + .method("POST", body) + .addHeader("Authorization", "Basic YWlkbGFiOjEyMw==") + .addHeader("Content-Type", "application/json") + .build(); + Response response; + String responseBody; + try { + response = client.newCall(request).execute(); + } catch (IOException ioException) { + log.error("PythonService##relightImage异常###{}", ExceptionUtil.getThrowableList(ioException)); + throw new BusinessException("relightImage.interface.exception"); + } + if (response.isSuccessful()) { + return Boolean.TRUE; + } + log.error("PythonService##relightImage异常response###{}", response); + //生成失败 + throw new BusinessException("relightImage.interface.exception"); + } } diff --git a/src/main/java/com/ai/da/service/PortfolioService.java b/src/main/java/com/ai/da/service/PortfolioService.java index bd7fcbb4..86191a69 100644 --- a/src/main/java/com/ai/da/service/PortfolioService.java +++ b/src/main/java/com/ai/da/service/PortfolioService.java @@ -37,4 +37,6 @@ public interface PortfolioService extends IService { Long viewsGet(Long id); Boolean commentDelete(CommentDTO commentDTO); + + Boolean delete(Long id); } diff --git a/src/main/java/com/ai/da/service/UserLikeGroupService.java b/src/main/java/com/ai/da/service/UserLikeGroupService.java index 9ebc1527..d50214b0 100644 --- a/src/main/java/com/ai/da/service/UserLikeGroupService.java +++ b/src/main/java/com/ai/da/service/UserLikeGroupService.java @@ -53,7 +53,7 @@ public interface UserLikeGroupService extends IService { CanvasElementUpload canvasElementUpload(MultipartFile file); - List productImageLikeList(ToProductImageDTO toProductImageDTO); + List productImageLikeList(ToProductImageDTO toProductImageDTO); Boolean productImageUnLike(ProductImageLikeDTO productImageLikeDTO); diff --git a/src/main/java/com/ai/da/service/impl/CollectionElementServiceImpl.java b/src/main/java/com/ai/da/service/impl/CollectionElementServiceImpl.java index 8cda2182..49d4cd64 100644 --- a/src/main/java/com/ai/da/service/impl/CollectionElementServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/CollectionElementServiceImpl.java @@ -13,6 +13,7 @@ import com.ai.da.mapper.primary.entity.*; import com.ai.da.model.dto.*; import com.ai.da.model.enums.ModelType; import com.ai.da.model.enums.Sex; +import com.ai.da.model.enums.StyleEnum; import com.ai.da.model.vo.*; import com.ai.da.python.PythonService; import com.ai.da.python.vo.DesignPythonItem; @@ -578,6 +579,9 @@ public class CollectionElementServiceImpl extends ServiceImpl impleme .collect(Collectors.toList()); response.setClothes(CopyUtil.copyList(filterDetail, DesignItemClothesDetailVO.class, (o, d) -> { d.setId(o.getId()); - d.setPath(minioUtil.getPreSignedUrl(o.getPath(), 24 * 60)); + d.setPath(minioUtil.getPreSignedUrl(o.getPath(), 24 * 60, true)); d.setMinIOPath(o.getPath()); d.setLevel1Type(converTypeToLevel1(o.getType())); d.setGradient(JSONObject.parseObject(o.getGradientString(), Gradient.class)); diff --git a/src/main/java/com/ai/da/service/impl/LibraryServiceImpl.java b/src/main/java/com/ai/da/service/impl/LibraryServiceImpl.java index 39af9761..2c237cf9 100644 --- a/src/main/java/com/ai/da/service/impl/LibraryServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/LibraryServiceImpl.java @@ -278,6 +278,7 @@ public class LibraryServiceImpl extends ServiceImpl impl path = "models/" + libraryUploadDTO.getModelSex().toLowerCase(); String filePath = minioUtil.upload(bucketName, path, libraryUploadDTO.getFile()); String newFilePath = processMannequins(filePath); +// String newFilePath = filePath; Library library = resolveData(libraryUploadDTO, userInfo, newFilePath); LibraryUpdateVo libraryUpdateVo = CopyUtil.copyObject(library, LibraryUpdateVo.class); libraryUpdateVo.setMinIOPath(libraryUpdateVo.getUrl()); 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 fa5ddf71..356ca744 100644 --- a/src/main/java/com/ai/da/service/impl/PortfolioServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/PortfolioServiceImpl.java @@ -25,6 +25,7 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; import org.springframework.web.multipart.MultipartFile; +import sun.security.krb5.internal.crypto.Des; import javax.annotation.Resource; import java.math.BigDecimal; @@ -94,10 +95,33 @@ public class PortfolioServiceImpl extends ServiceImpl existSameNameQw = new QueryWrapper<>(); + existSameNameQw.lambda().eq(Portfolio::getPortfolioName, portfolioDTO.getPortfolioName()); + existSameNameQw.lambda().eq(Portfolio::getAccountId, authPrincipalVo.getId()); + List portfoliosSameName = portfolioMapper.selectList(existSameNameQw); + if (!CollectionUtils.isEmpty(portfoliosSameName)) { + throw new BusinessException("The title of the published work has been used."); + } if (file != null && file.getOriginalFilename() != null) { String upload = minioUtil.upload("aida-canvas", String.valueOf(authPrincipalVo.getId()), file); Canvas canvas = new Canvas(); @@ -108,14 +132,21 @@ public class PortfolioServiceImpl extends ServiceImpl designQueryWrapper = new QueryWrapper<>(); + designQueryWrapper.lambda().eq(Design::getCollectionId, collectionIdOld); + Design designOld = designMapper.selectOne(designQueryWrapper); Collection collectionOld = collectionMapper.selectById(collectionIdOld); List collectionElementListOld = collectionElementService.getByCollectionId(collectionIdOld); collectionOld.setId(null); collectionMapper.insert(collectionOld); Long collectionIdNew = collectionOld.getId(); + designOld.setCollectionId(collectionIdNew); + designOld.setId(null); + designMapper.insert(designOld); userLikeGroupNew.setCollectionId(collectionIdNew); userLikeGroupMapper.insert(userLikeGroupNew); for (CollectionElement element : collectionElementListOld) { @@ -135,6 +166,14 @@ public class PortfolioServiceImpl extends ServiceImpl userLikeList = userLikeService.getUserLikeList(portfolioDTO.getUserLikeGroupId()); -// Long coverIdNew = null; -// Boolean flag = false; for (UserLike userLike : userLikeList) { Long designOutfitIdOld = userLike.getDesignOutfitId(); TDesignPythonOutfit designPythonOutfit = designPythonOutfitMapper.selectById(designOutfitIdOld); designPythonOutfit.setDesignId(-1L); designPythonOutfit.setDesignItemId(-1L); designPythonOutfit.setCollectionId(collectionIdNew); -// if (designPythonOutfit.getId().equals(coverIdOld)) { -// flag = true; -// } designPythonOutfit.setId(null); Long designItemIdOld = userLike.getDesignItemId(); DesignItem designItemOld = designItemMapper.selectById(designItemIdOld); @@ -183,21 +217,12 @@ public class PortfolioServiceImpl extends ServiceImpl tDesignPythonOutfitDetails = designPythonOutfitDetailMapper.selectList(qw); for (TDesignPythonOutfitDetail tDesignPythonOutfitDetail : tDesignPythonOutfitDetails) { -// Long designPythonOutfitDetailIdOld = tDesignPythonOutfitDetail.getId(); tDesignPythonOutfitDetail.setId(null); tDesignPythonOutfitDetail.setDesignId(-1L); tDesignPythonOutfitDetail.setDesignPythonOutfitId(designOutfitIdNew); designPythonOutfitDetailMapper.insert(tDesignPythonOutfitDetail); } -// if (flag) { -// coverIdNew = designOutfitIdNew; -// portfolio.setCoverId(coverIdNew); -// portfolioMapper.updateById(portfolio); -// flag = false; -// } -// designPythonOutfitMapper.updateById(designPythonOutfit); - userLike.setDesignItemId(designItemIdNew); userLike.setId(null); userLike.setDesignId(-1L); @@ -232,6 +257,15 @@ public class PortfolioServiceImpl extends ServiceImpl existSameNameQw = new QueryWrapper<>(); + existSameNameQw.lambda().ne(Portfolio::getId, portfolioDTO.getId()); + existSameNameQw.lambda().eq(Portfolio::getPortfolioName, portfolioDTO.getPortfolioName()); + existSameNameQw.lambda().eq(Portfolio::getAccountId, authPrincipalVo.getId()); + List portfoliosSameName = portfolioMapper.selectList(existSameNameQw); + if (!CollectionUtils.isEmpty(portfoliosSameName)) { + throw new BusinessException("The title of the published work has been used."); + } if (portfolioDTO.getPortfolioType().equals("History")) { - AuthPrincipalVo authPrincipalVo = UserContext.getUserHolder(); UserLikeGroup userLikeGroup = userLikeGroupMapper.selectById(portfolioDTO.getUserLikeGroupId()); UserLikeGroup userLikeGroupNew = userLikeGroup.setId(null); userLikeGroupNew.setAccountId(-1L); @@ -396,6 +439,11 @@ public class PortfolioServiceImpl extends ServiceImpl collectionElementRelationListNew = new ArrayList<>(); for (CollectionElement element : collectionElementListOld) { @@ -563,6 +634,117 @@ public class PortfolioServiceImpl extends ServiceImpl getWorkspaceQw = new QueryWrapper<>(); + getWorkspaceQw.lambda().eq(Design::getCollectionId, collectionId); + List designs = designMapper.selectList(getWorkspaceQw); + if (!CollectionUtils.isEmpty(designs)) { + Design design1 = designs.get(0); + Long accountId = authPrincipalVo.getId(); + QueryWrapper currentWorkspaceQw = new QueryWrapper<>(); + currentWorkspaceQw.lambda().eq(Workspace::getAccountId, accountId); + currentWorkspaceQw.lambda().eq(Workspace::getIsLastIndex, 1); + List workspaces = workspaceMapper.selectList(currentWorkspaceQw); + if (!CollectionUtils.isEmpty(workspaces)) { + Workspace workspace1 = workspaces.get(0); + workspace1.setIsLastIndex(0); + workspaceMapper.updateById(workspace1); + Workspace workspaceNew = new Workspace(); + workspaceNew.setWorkSpaceName("workspace of " + portfolio.getPortfolioName()); + workspaceNew.setAccountId(accountId); + workspaceNew.setIsDeleted(0); + workspaceNew.setIsLastIndex(1); + workspaceNew.setCreateTime(LocalDateTime.now()); + workspaceNew.setSystemDesignerPercentage((design1.getSystemScale().multiply(BigDecimal.valueOf(100)).intValue())); + if (design1.getSingleOverall().equals("overall")) { + workspaceNew.setPosition("Overall"); + }else { + workspaceNew.setPosition(design1.getSwitchCategory()); + } + workspaceMapper.insert(workspaceNew); + if (design1.getModelType().equals("System")) { + SysFile sysFile = sysFileMapper.selectById(design1.getTemplateId()); + if (sysFile.getLevel2Type().equals("Female")) { + workspaceNew.setSex("Female"); + workspaceNew.setMannequinFemaleId(design1.getTemplateId()); + workspaceNew.setMannequinFemaleType("System"); + QueryWrapper getAnotherOneQw = new QueryWrapper<>(); + getAnotherOneQw.lambda().eq(SysFile::getLevel1Type, "Models"); + getAnotherOneQw.lambda().eq(SysFile::getLevel2Type, "Male"); + if (!StringUtils.isEmpty(sysFile.getLevel3Type())) { + getAnotherOneQw.lambda().eq(SysFile::getLevel3Type, sysFile.getLevel3Type()); + QueryWrapper