From 6b62cf7299207109a1462779d0faf2ef8abdcd73 Mon Sep 17 00:00:00 2001 From: xupei Date: Thu, 20 Mar 2025 17:42:16 +0800 Subject: [PATCH] =?UTF-8?q?PoseTransformation-=E5=88=9D=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../da/common/RabbitMQ/GenerateConsumer.java | 59 +++++++- .../common/RabbitMQ/RabbitMQProperties.java | 1 + .../ai/da/common/constant/CommonConstant.java | 2 + .../ai/da/common/enums/CreditsEventsEnum.java | 1 + .../ai/da/controller/GenerateController.java | 27 +++- .../primary/PoseTransformationMapper.java | 7 + .../primary/SketchReconstructionMapper.java | 7 + .../primary/entity/PoseTransformation.java | 33 +++++ .../primary/entity/SketchReconstruction.java | 22 +++ .../com/ai/da/model/dto/ImageToSketchDTO.java | 9 ++ .../da/model/dto/SketchReconstructionDTO.java | 32 ++++ .../ai/da/model/vo/PoseTransformationVO.java | 25 ++++ .../java/com/ai/da/python/PythonService.java | 58 ++++++++ .../com/ai/da/service/GenerateService.java | 6 + .../da/service/impl/GenerateServiceImpl.java | 138 ++++++++++++++++++ src/main/resources/application-dev.properties | 1 + .../resources/application-prod.properties | 1 + 17 files changed, 425 insertions(+), 4 deletions(-) create mode 100644 src/main/java/com/ai/da/mapper/primary/PoseTransformationMapper.java create mode 100644 src/main/java/com/ai/da/mapper/primary/SketchReconstructionMapper.java create mode 100644 src/main/java/com/ai/da/mapper/primary/entity/PoseTransformation.java create mode 100644 src/main/java/com/ai/da/mapper/primary/entity/SketchReconstruction.java create mode 100644 src/main/java/com/ai/da/model/dto/SketchReconstructionDTO.java create mode 100644 src/main/java/com/ai/da/model/vo/PoseTransformationVO.java diff --git a/src/main/java/com/ai/da/common/RabbitMQ/GenerateConsumer.java b/src/main/java/com/ai/da/common/RabbitMQ/GenerateConsumer.java index b3aee7cd..23fb9496 100644 --- a/src/main/java/com/ai/da/common/RabbitMQ/GenerateConsumer.java +++ b/src/main/java/com/ai/da/common/RabbitMQ/GenerateConsumer.java @@ -1,24 +1,22 @@ package com.ai.da.common.RabbitMQ; -import com.ai.da.common.config.exception.BusinessException; import com.ai.da.common.constant.CommonConstant; import com.ai.da.common.utils.RedisUtil; import com.ai.da.model.dto.GenerateThroughImageTextDTO; import com.ai.da.model.vo.GenerateResultVO; +import com.ai.da.model.vo.PoseTransformationVO; import com.ai.da.service.GenerateService; import com.ai.da.service.UserLikeGroupService; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; import com.rabbitmq.client.Channel; import lombok.extern.slf4j.Slf4j; -import org.apache.tomcat.jni.Time; import org.springframework.amqp.core.Message; import org.springframework.amqp.rabbit.annotation.RabbitHandler; import org.springframework.amqp.rabbit.annotation.RabbitListener; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; -import org.springframework.util.StringUtils; import javax.annotation.Resource; import java.io.IOException; @@ -258,6 +256,55 @@ public class GenerateConsumer { log.info("============ProcessRelightResult End listening=========="); } + public void processPoseTransformResult(Message msg, Channel channel) { + log.info("============ProcessPoseTransformResult listening=========="); + long start = System.currentTimeMillis(); + + Map generateResult = JSONObject.parseObject(msg.getBody(), Map.class); + log.info("PoseTransformation response : {}", generateResult); + + try { + log.info("tasks_id : {} start ", generateResult.get("tasks_id")); + if (generateResult.get("status").equals("SUCCESS")) { + String gifUrl = generateResult.get("gif_url"); + String taskId = generateResult.get("tasks_id"); + String videoUrl = generateResult.get("video_url"); + String imageUrl = generateResult.get("image_url"); + generateService.processPoseTransformResult(taskId, gifUrl, videoUrl, imageUrl); + } else { + // 修改redis中的数据状态为exception + String key = generateResultKey + ":" + generateResult.get("tasks_id"); + redisUtil.addToString(key, new Gson().toJson(new PoseTransformationVO(null, generateResult.get("tasks_id"),null, null, null, (byte)0, "Fail")), CommonConstant.GENERATE_RESULT_EXPIRE_TIME); + // 将异常信息存到exception中 + HashMap exceptionInfo = new HashMap<>(); + exceptionInfo.put(generateResult.get("tasks_id"), generateResult.get("message")); + // 存redis + redisUtil.addToMap(exceptionMapKey, exceptionInfo); + } + } catch (Exception e) { + log.error(e.getMessage()); + try { + channel.basicAck(msg.getMessageProperties().getDeliveryTag(), false); + // 将消息从redis排队队列中删除,需保证被消费的消息存储到db之后再从redis删除 + redisUtil.removeFromZSet(consumptionOrderKey, generateResult.get("tasks_id")); + } catch (IOException exception) { + log.error("手动确认，取消返回队列，不再重新消费"); + } + // 将入参和错误信息存入数据库 + String exceptionMessage = JSONObject.toJSONString(generateResult) + + " Exception message ： " + e.getMessage(); + HashMap exceptionInfo = new HashMap<>(); + exceptionInfo.put(String.valueOf(generateResult.get("tasks_id")), exceptionMessage); + // 存redis + redisUtil.addToMap(exceptionMapKey, exceptionInfo); + } + + long end = System.currentTimeMillis(); + log.info("tasks_id : {}, end , message : {}, 执行时长： {} 毫秒", generateResult.get("tasks_id"), generateResult.get("message"), (end - start)); + log.info("============ProcessPoseTransformResult End listening=========="); + + } + @RabbitListener(queues = "#{rabbitMQProperties.queues.generate}") @RabbitHandler public void generateConsumer1(Message msg, Channel channel) { @@ -329,4 +376,10 @@ public class GenerateConsumer { public void getRelightResult(Message msg, Channel channel) { processRelightResult(msg, channel); } + + @RabbitListener(queues = "#{rabbitMQProperties.queues.poseTransform}") + @RabbitHandler + public void getPoseTransformationResult(Message msg, Channel channel) { + processPoseTransformResult(msg, channel); + } } diff --git a/src/main/java/com/ai/da/common/RabbitMQ/RabbitMQProperties.java b/src/main/java/com/ai/da/common/RabbitMQ/RabbitMQProperties.java index 29a2e1de..55990193 100644 --- a/src/main/java/com/ai/da/common/RabbitMQ/RabbitMQProperties.java +++ b/src/main/java/com/ai/da/common/RabbitMQ/RabbitMQProperties.java @@ -20,6 +20,7 @@ public class RabbitMQProperties { private String generateResult; private String toProductImageResult; private String relightResult; + private String poseTransform; } @Data diff --git a/src/main/java/com/ai/da/common/constant/CommonConstant.java b/src/main/java/com/ai/da/common/constant/CommonConstant.java index b5dabb24..8b790c52 100644 --- a/src/main/java/com/ai/da/common/constant/CommonConstant.java +++ b/src/main/java/com/ai/da/common/constant/CommonConstant.java @@ -30,6 +30,8 @@ public class CommonConstant { public static final String GENERATE_LOGO_SINGLE_CANCEL = "/api/generate_single_logo_cancel/"; + public static final String POSE_TRANSFORMATION_CANCEL = "/api/pose_transform_cancel/"; + public static final String PYTHON_PORT_9996 = "9996"; public static final String PYTHON_PORT_9997 = "9997"; diff --git a/src/main/java/com/ai/da/common/enums/CreditsEventsEnum.java b/src/main/java/com/ai/da/common/enums/CreditsEventsEnum.java index e8565984..2711d04b 100644 --- a/src/main/java/com/ai/da/common/enums/CreditsEventsEnum.java +++ b/src/main/java/com/ai/da/common/enums/CreditsEventsEnum.java @@ -35,6 +35,7 @@ public enum CreditsEventsEnum { RELIGHT("Relight","5"), QUESTIONNAIRE("Questionnaire","100"), IMAGE_TO_SKETCH("ImageToSketch","5"), + POSE_TRANSFORMATION("PoseTransformation","10"), OTHER("Other","5"); diff --git a/src/main/java/com/ai/da/controller/GenerateController.java b/src/main/java/com/ai/da/controller/GenerateController.java index 94a0da8a..f1e633ad 100644 --- a/src/main/java/com/ai/da/controller/GenerateController.java +++ b/src/main/java/com/ai/da/controller/GenerateController.java @@ -16,7 +16,6 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.validation.Valid; import java.util.List; - /** * @author XP */ @@ -98,4 +97,30 @@ public class GenerateController { return Response.success(generateService.modifySketch(generateModifyDTO)); } + @ApiOperation(value = "请求poseTransform，异步获取结果") + @PostMapping("/poseTransform") + public Response poseTransform(@ApiParam("projectId") @RequestParam Long projectId, + @ApiParam("productImage") @RequestParam String productImage, + @ApiParam("poseId") @RequestParam int poseId) { + return Response.success(generateService.poseTransform(projectId, productImage, poseId)); + } + + @ApiOperation(value = "获取pose transformation生成结果") + @PostMapping("/poseTransformResult") + public Response getPoseTransformationResults(@ApiParam("taskId") @RequestParam String taskId) { + PoseTransformationVO generateResult = generateService.getPoseTransformationResult(taskId); + return Response.success(generateResult); + } + + public Response modifyModelProportion(){ + return null; + } + + public Response sketchReconstruction(){ + return null; + } + + + + } diff --git a/src/main/java/com/ai/da/mapper/primary/PoseTransformationMapper.java b/src/main/java/com/ai/da/mapper/primary/PoseTransformationMapper.java new file mode 100644 index 00000000..4c6da51b --- /dev/null +++ b/src/main/java/com/ai/da/mapper/primary/PoseTransformationMapper.java @@ -0,0 +1,7 @@ +package com.ai.da.mapper.primary; + +import com.ai.da.common.config.mybatis.plus.CommonMapper; +import com.ai.da.mapper.primary.entity.PoseTransformation; + +public interface PoseTransformationMapper extends CommonMapper { +} diff --git a/src/main/java/com/ai/da/mapper/primary/SketchReconstructionMapper.java b/src/main/java/com/ai/da/mapper/primary/SketchReconstructionMapper.java new file mode 100644 index 00000000..712191b0 --- /dev/null +++ b/src/main/java/com/ai/da/mapper/primary/SketchReconstructionMapper.java @@ -0,0 +1,7 @@ +package com.ai.da.mapper.primary; + +import com.ai.da.mapper.primary.entity.SketchReconstruction; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +public interface SketchReconstructionMapper extends BaseMapper { +} diff --git a/src/main/java/com/ai/da/mapper/primary/entity/PoseTransformation.java b/src/main/java/com/ai/da/mapper/primary/entity/PoseTransformation.java new file mode 100644 index 00000000..55c95939 --- /dev/null +++ b/src/main/java/com/ai/da/mapper/primary/entity/PoseTransformation.java @@ -0,0 +1,33 @@ +package com.ai.da.mapper.primary.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; + +@EqualsAndHashCode(callSuper = true) +@TableName("t_pose_transformation") +@Data +public class PoseTransformation extends BaseEntity { + + private Long projectId; + + private Long accountId; + + private String uniqueId; + + private String productImage; + + private int poseId; + + private String gifUrl; + + private String videoUrl; + // GIF第一帧截图 + private String imageUrl; + + private byte isLiked; + + private byte isDeleted; + + +} diff --git a/src/main/java/com/ai/da/mapper/primary/entity/SketchReconstruction.java b/src/main/java/com/ai/da/mapper/primary/entity/SketchReconstruction.java new file mode 100644 index 00000000..24a46ea4 --- /dev/null +++ b/src/main/java/com/ai/da/mapper/primary/entity/SketchReconstruction.java @@ -0,0 +1,22 @@ +package com.ai.da.mapper.primary.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; + +@EqualsAndHashCode(callSuper = true) +@Data +@TableName("t_sketch_reconstruction") +public class SketchReconstruction extends BaseEntity{ + + private Long projectId; + + private Long elementId; + + // upload、library、generate + private String elementSource; + + private String path; + + +} diff --git a/src/main/java/com/ai/da/model/dto/ImageToSketchDTO.java b/src/main/java/com/ai/da/model/dto/ImageToSketchDTO.java index 983172c9..e356a7d1 100644 --- a/src/main/java/com/ai/da/model/dto/ImageToSketchDTO.java +++ b/src/main/java/com/ai/da/model/dto/ImageToSketchDTO.java @@ -19,4 +19,13 @@ public class ImageToSketchDTO { @ApiModelProperty("性别") private String gender; + + public ImageToSketchDTO() { + } + + public ImageToSketchDTO(Long elementId, String style, String gender) { + this.elementId = elementId; + this.style = style; + this.gender = gender; + } } diff --git a/src/main/java/com/ai/da/model/dto/SketchReconstructionDTO.java b/src/main/java/com/ai/da/model/dto/SketchReconstructionDTO.java new file mode 100644 index 00000000..ba665441 --- /dev/null +++ b/src/main/java/com/ai/da/model/dto/SketchReconstructionDTO.java @@ -0,0 +1,32 @@ +package com.ai.da.model.dto; + +import lombok.Data; +import org.springframework.web.multipart.MultipartFile; + +import java.util.List; + +@Data +public class SketchReconstructionDTO { + private Long projectId; + + private String collagePicture; + + private List elements; + + private MultipartFile file; + + // like到library时分类用 + private String gender; + + private boolean Save; + + + @Data + public static class Element{ + private Long elementId; + + private String elementSource; + + private String path; + } +} diff --git a/src/main/java/com/ai/da/model/vo/PoseTransformationVO.java b/src/main/java/com/ai/da/model/vo/PoseTransformationVO.java new file mode 100644 index 00000000..fb7e57b5 --- /dev/null +++ b/src/main/java/com/ai/da/model/vo/PoseTransformationVO.java @@ -0,0 +1,25 @@ +package com.ai.da.model.vo; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@NoArgsConstructor +@AllArgsConstructor +public class PoseTransformationVO { + + private Long id; + + private String taskId; + + private String gifUrl; + + private String videoUrl; + // GIF第一帧截图 + private String imageUrl; + + private byte isLiked; + + private String status; +} diff --git a/src/main/java/com/ai/da/python/PythonService.java b/src/main/java/com/ai/da/python/PythonService.java index f67e7916..2ed86455 100644 --- a/src/main/java/com/ai/da/python/PythonService.java +++ b/src/main/java/com/ai/da/python/PythonService.java @@ -3799,4 +3799,62 @@ public class PythonService { throw new BusinessException("design.interface.exception"); } + public Boolean poseTransformation(String productImage, int poseId, String taskId) { + 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"); + Map content = Maps.newHashMap(); + content.put("image_url", productImage); + content.put("tasks_id", taskId); + content.put("pose_id", String.valueOf(poseId)); + RequestBody body = RequestBody.create(mediaType, JSON.toJSONString(content)); + + log.info("poseTransformation 请求地址： {}", accessPythonIp + ":" + accessPythonPort + "/api/pose_transform"); + Request request = new Request.Builder() + .url(accessPythonIp + ":" + accessPythonPort + "/api/pose_transform") + .method("POST", body) + .addHeader("Content-Type", "application/json") + .build(); + Response response = null; + String bodyString; + try { + log.info("poseTransformation请求入参content###{}", JSON.toJSONString(content)); + response = client.newCall(request).execute(); + } catch (IOException ioException) { + log.error("PythonService##poseTransformation异常###{}", ExceptionUtil.getThrowableList(ioException)); + throw new BusinessException(ioException.getMessage()); + } + + // 判断是否生成失败 + if (Objects.isNull(response.body())) { + log.error("PythonService##poseTransformation异常###{}", "response or body is empty!"); + throw new BusinessException("PythonService##poseTransformation异常###: response or body is empty!"); + } else if (response.code() != HttpURLConnection.HTTP_OK) { + log.error("PythonService##poseTransformation异常###{}", "Response error!Response code ## " + response.code() + " ##"); + throw new BusinessException("PythonService##poseTransformation异常### Response error!Response code ## " + response.code() + " ##"); + } else { + try { + bodyString = response.body().string(); + } catch (IOException e) { + log.error(e.getMessage()); + throw new BusinessException(e.getMessage()); + } + } + JSONObject jsonObject = JSON.parseObject(bodyString); + Boolean result = JSON.parseObject(JSON.toJSONString(response)).getBoolean("successful"); + + if (result && jsonObject.get("code").equals(200)) { + log.info("poseTransformation##responseObject###{}", jsonObject); + return Boolean.TRUE; + } else { + log.info("poseTransformation失败###{}", jsonObject); + log.info("poseTransformation Exception! Code : {}", jsonObject.get("code")); + return Boolean.FALSE; + } + } + } diff --git a/src/main/java/com/ai/da/service/GenerateService.java b/src/main/java/com/ai/da/service/GenerateService.java index dda193e6..1872314c 100644 --- a/src/main/java/com/ai/da/service/GenerateService.java +++ b/src/main/java/com/ai/da/service/GenerateService.java @@ -47,4 +47,10 @@ public interface GenerateService extends IService { GenerateResultVO imageToSketch(ImageToSketchDTO imageToSketchDTO); GenerateResultVO modifySketch(GenerateModifyDTO generateModifyDTO); + + String poseTransform(Long projectId, String productImage, int poseId); + + void processPoseTransformResult(String taskId, String gifUrl, String videoUrl, String imageUrl); + + PoseTransformationVO getPoseTransformationResult(String taskId); } diff --git a/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java b/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java index cbe440a2..e15ceebf 100644 --- a/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java @@ -59,6 +59,8 @@ public class GenerateServiceImpl extends ServiceImpl i private RedisUtil redisUtil; @Resource private GenerateCancelMapper generateCancelMapper; + @Resource + private SketchReconstructionMapper sketchReconstructionMapper; @Value("${redis.key.orderForGenerate}") private String consumptionOrderKey; @@ -715,6 +717,8 @@ public class GenerateServiceImpl extends ServiceImpl i String path; if (type.equals("Logo")) { path = CommonConstant.GENERATE_LOGO_SINGLE_CANCEL; + } else if(type.equals("PoseTransformation")){ + path =CommonConstant.POSE_TRANSFORMATION_CANCEL; } else { path = CommonConstant.GENERATE_CANCEL; } @@ -920,4 +924,138 @@ public class GenerateServiceImpl extends ServiceImpl i return new GenerateResultVO(generateDetailId, minioUtil.getPreSignedUrl(minioPath, CommonConstant.MINIO_IMAGE_EXPIRE_TIME, true), "Success", category); } + + public String poseTransform(Long projectId, String productImage, int poseId){ + Long accountId = UserContext.getUserHolder().getId(); + + // 1、判断用户当前积分是否够本次生成消耗 + CreditsEventsEnum creditsEventsEnum = CreditsEventsEnum.POSE_TRANSFORMATION; + Boolean preDeduction = creditsService.creditsPreDeduction(creditsEventsEnum, 1); + if (!preDeduction) { + throw new BusinessException("remaining.credits.insufficient", ResultEnum.WARNING.getCode()); + } + + // 3、生成唯一id 使用uuid,由于uuid重复的几率很小，故取消对uuid重复性的校验 + String uuid = UUID.randomUUID().toString(); + String taskId = uuid + "-" + accountId; + + PoseTransformation poseTransformation = new PoseTransformation(); + poseTransformation.setProjectId(projectId); + poseTransformation.setAccountId(accountId); + poseTransformation.setUniqueId(taskId); + poseTransformation.setProductImage(productImage); + poseTransformation.setPoseId(poseId); + poseTransformation.setCreateTime(LocalDateTime.now()); + poseTransformationMapper.insert(poseTransformation); + + Boolean b = pythonService.poseTransformation(productImage, poseId, taskId); + if (b){ + // 6、添加预扣除积分到redis + creditsService.addRecordToCreditsDeduction(accountId, uuid, creditsEventsEnum); + // 6.1 添加积分扣除记录到db + creditsService.preInsert(accountId, creditsEventsEnum.getName(), uuid, Boolean.TRUE, null); + return taskId; + } + throw new BusinessException("pose transformation error", ResultEnum.ERROR.getCode()); + } + + @Resource + private PoseTransformationMapper poseTransformationMapper; + + public void processPoseTransformResult(String taskId, String gifUrl, String videoUrl, String imageUrl){ + // 1、存储模型返回的数据 + PoseTransformation poseTransformation; + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("unique_id", taskId); + List poseTransformations = poseTransformationMapper.selectList(qw); + if (poseTransformations != null && poseTransformations.size() > 1){ + log.warn("通过taskId {} 查询到的PoseTransformation的结果不止一条", taskId); + }else if (poseTransformations == null || poseTransformations.isEmpty()){ + return ; + } + poseTransformation = poseTransformations.get(0); + poseTransformation.setGifUrl(gifUrl); + poseTransformation.setVideoUrl(videoUrl); + poseTransformation.setImageUrl(imageUrl); + poseTransformation.setUpdateTime(LocalDateTime.now()); + poseTransformationMapper.updateById(poseTransformation); + + String key = generateResultKey + ":" + taskId; + PoseTransformationVO poseTransformationVO = new PoseTransformationVO( + poseTransformation.getId(), taskId, gifUrl, videoUrl, imageUrl, (byte) 0, "Success"); + + // 2、更新redis + redisUtil.addToString(key, new Gson().toJson(poseTransformationVO), CommonConstant.GENERATE_RESULT_EXPIRE_TIME); + + // 3、执行积分扣除 + String accountId = taskId.substring(taskId.lastIndexOf("-") + 1); + String uuid = taskId.substring(0, taskId.lastIndexOf("-")); + Boolean flag = creditsService.taskCreditsDeduction(Long.parseLong(accountId), uuid); + if (flag) creditsService.updateChangedCredits(accountId, uuid); + } + + public PoseTransformationVO getPoseTransformationResult(String taskId){ + String key = generateResultKey + ":" + taskId; + String resultJson = redisUtil.getFromString(key); + + if (!StringUtil.isNullOrEmpty(resultJson)){ + PoseTransformationVO poseTransformationVO = new Gson().fromJson(redisUtil.getFromString(key), PoseTransformationVO.class); + if (poseTransformationVO.getStatus().equals("Success")){ + poseTransformationVO.setGifUrl(minioUtil.getPreSignedUrl(poseTransformationVO.getGifUrl(), CommonConstant.MINIO_IMAGE_EXPIRE_TIME)); + poseTransformationVO.setVideoUrl(minioUtil.getPreSignedUrl(poseTransformationVO.getVideoUrl(), CommonConstant.MINIO_IMAGE_EXPIRE_TIME)); + poseTransformationVO.setImageUrl(minioUtil.getPreSignedUrl(poseTransformationVO.getImageUrl(), CommonConstant.MINIO_IMAGE_EXPIRE_TIME)); + } + return poseTransformationVO; + }else { + return new PoseTransformationVO(); + } + } + + /** + * String collagePicture(Base64) + * List elements + * File file + * @return + */ + public String sketchReconstruction(SketchReconstructionDTO sketchReconstructionDTO){ + Long accountId = UserContext.getUserHolder().getId(); + // 1、线稿生成 + String collagePictureBase64 = sketchReconstructionDTO.getCollagePicture(); + String path = accountId + "/CollagePicture/" + UUID.randomUUID(); + String minioPath = minioUtil.base64UploadToPath(collagePictureBase64, userBucket, path); + CollectionElement collectionElement = new CollectionElement(); + collectionElement.setAccountId(accountId); + collectionElement.setLevel1Type(SKETCH_BOARD.getRealName()); + collectionElement.setUrl(minioPath); + collectionElement.setMd5(MD5Utils.encryptFile(minioPath, false)); + collectionElement.setCreateDate(new Date()); + collectionElementService.save(collectionElement); + GenerateResultVO generateResultVO = imageToSketch(new ImageToSketchDTO(collectionElement.getId(), "2", sketchReconstructionDTO.getGender())); + // 2、以文件形式保存元素，同时还要将使用的元素单独存储 + + if (sketchReconstructionDTO.isSave() && !sketchReconstructionDTO.getElements().isEmpty()){ + // 将使用的元素全部都保存到新建表 + // 先判断该project下有没有数据，无 --> 直接保存；有 --> 先删除，再保存 + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("project_id", sketchReconstructionDTO.getProjectId()); + List sketchReconstructions = sketchReconstructionMapper.selectList(qw); + if (!sketchReconstructions.isEmpty()){ + sketchReconstructionMapper.delete(qw); + } + sketchReconstructionDTO.getElements().forEach(element -> { + SketchReconstruction sketchReconstruction = new SketchReconstruction(); + sketchReconstruction.setProjectId(sketchReconstructionDTO.getProjectId()); + sketchReconstruction.setElementId(element.getElementId()); + sketchReconstruction.setElementSource(element.getElementSource()); + sketchReconstruction.setPath(element.getPath()); + sketchReconstructionMapper.insert(sketchReconstruction); + }); + + // 将画布文件上传到minio,地址保存到project表中 + String canvasPath = minioUtil.upload("aida-users", accountId + "/CollagePicture/CanvasFile", sketchReconstructionDTO.getFile()); + } + + // 需要返回哪些信息呢？ + return null; + } } diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties index 9fcc04d6..a45b62e2 100644 --- a/src/main/resources/application-dev.properties +++ b/src/main/resources/application-dev.properties @@ -105,6 +105,7 @@ rabbitmq.queues.srResult=SuperResolution-dev rabbitmq.queues.generateResult=GenerateImage-dev rabbitmq.queues.toProductImageResult=ToProductImage-dev rabbitmq.queues.relightResult=Relight-dev +rabbitmq.queues.poseTransform=PoseTransform-dev rabbitmq.exchange.generate=generate-exchange orderList.link=https://develop.aida.com.hk/home/homePage?order= diff --git a/src/main/resources/application-prod.properties b/src/main/resources/application-prod.properties index eacfd054..9c4a1e76 100644 --- a/src/main/resources/application-prod.properties +++ b/src/main/resources/application-prod.properties @@ -107,6 +107,7 @@ rabbitmq.queues.srResult=SuperResolution-prod rabbitmq.queues.generateResult=GenerateImage-prod rabbitmq.queues.toProductImageResult=ToProductImage-prod rabbitmq.queues.relightResult=Relight-prod +rabbitmq.queues.poseTransform=PoseTransform-prod rabbitmq.exchange.generate=generate-exchange orderList.link=https://aida.com.hk/home/homePage?order=