From 88796f7f28021b96124af42c683c2a0cb2c666a6 Mon Sep 17 00:00:00 2001 From: xupei Date: Wed, 2 Apr 2025 13:32:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B7=BB=E5=8A=A0=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E6=A8=A1=E7=89=B9=E5=88=B0=E4=B8=AA=E4=BA=BAlib?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=92=8C=E4=BF=9D=E5=AD=98=E6=A8=A1=E7=89=B9?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ai/da/controller/LibraryController.java | 3 +- .../model/dto/ModifyModelProportionDTO.java | 31 ------------------- .../com/ai/da/service/LibraryService.java | 4 +-- .../impl/LibraryModelPointServiceImpl.java | 5 ++- .../da/service/impl/LibraryServiceImpl.java | 8 +++-- 5 files changed, 14 insertions(+), 37 deletions(-) diff --git a/src/main/java/com/ai/da/controller/LibraryController.java b/src/main/java/com/ai/da/controller/LibraryController.java index fa0e2bfc..fa997ac0 100644 --- a/src/main/java/com/ai/da/controller/LibraryController.java +++ b/src/main/java/com/ai/da/controller/LibraryController.java @@ -28,6 +28,7 @@ import javax.validation.Valid; import java.io.File; import java.text.ParseException; import java.util.Date; +import java.util.Map; import java.util.Objects; import java.util.UUID; @@ -205,7 +206,7 @@ public class LibraryController { @ApiOperation(value = "将系统模特添加到个人library") @GetMapping("addSysModelToLib") - public Response addSysModelToLib(@ApiParam("系统模特id") @RequestParam("sysModelId")long sysModelId){ + public Response> addSysModelToLib(@ApiParam("系统模特id") @RequestParam("sysModelId")long sysModelId){ return Response.success(libraryService.addSysModelToLib(sysModelId)); } diff --git a/src/main/java/com/ai/da/model/dto/ModifyModelProportionDTO.java b/src/main/java/com/ai/da/model/dto/ModifyModelProportionDTO.java index 508208fe..9366cad7 100644 --- a/src/main/java/com/ai/da/model/dto/ModifyModelProportionDTO.java +++ b/src/main/java/com/ai/da/model/dto/ModifyModelProportionDTO.java @@ -5,7 +5,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; @Data @@ -35,34 +34,4 @@ public class ModifyModelProportionDTO { @NotBlank(message = "modelPath type cannot be empty") private String modelPath; - /* @NotNull(message = "handLeft cannot be null") - @NotEmpty(message = "handLeft cannot be empty") - @ApiModelProperty("handLeft") - private Float[] handLeft; - - @NotNull(message = "handRight cannot be null") - @NotEmpty(message = "handRight cannot be empty") - @ApiModelProperty("handRight") - private Float[] handRight; - - @NotNull(message = "shoulderLeft cannot be null") - @NotEmpty(message = "shoulderLeft cannot be empty") - @ApiModelProperty("shoulderLeft") - private Float[] shoulderLeft; - - @NotNull(message = "shoulderRight cannot be null") - @NotEmpty(message = "shoulderRight cannot be empty") - @ApiModelProperty("shoulderRight") - private Float[] shoulderRight; - - @NotNull(message = "waistbandLeft cannot be null") - @NotEmpty(message = "waistbandLeft cannot be empty") - @ApiModelProperty("waistbandLeft") - private Float[] waistbandLeft; - - @NotNull(message = "waistbandRight cannot be null") - @NotEmpty(message = "waistbandRight cannot be empty") - @ApiModelProperty("waistbandRight") - private Float[] waistbandRight;*/ - } diff --git a/src/main/java/com/ai/da/service/LibraryService.java b/src/main/java/com/ai/da/service/LibraryService.java index 3ca76c2a..f6eb7169 100644 --- a/src/main/java/com/ai/da/service/LibraryService.java +++ b/src/main/java/com/ai/da/service/LibraryService.java @@ -8,9 +8,9 @@ import com.ai.da.model.vo.LibraryVo; import com.ai.da.model.vo.QueryLibraryPageVO; import com.baomidou.mybatisplus.extension.service.IService; -import javax.validation.Valid; import java.text.ParseException; import java.util.List; +import java.util.Map; /** * 服务类 @@ -89,5 +89,5 @@ public interface LibraryService extends IService { void moveLibraryDate() throws ParseException; - Long addSysModelToLib(long sysModelId); + Map addSysModelToLib(long sysModelId); } diff --git a/src/main/java/com/ai/da/service/impl/LibraryModelPointServiceImpl.java b/src/main/java/com/ai/da/service/impl/LibraryModelPointServiceImpl.java index 5b8107b4..496e2a08 100644 --- a/src/main/java/com/ai/da/service/impl/LibraryModelPointServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/LibraryModelPointServiceImpl.java @@ -24,6 +24,7 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import io.netty.util.internal.StringUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -69,7 +70,7 @@ public class LibraryModelPointServiceImpl extends ServiceImpl impl } @Override - public Long addSysModelToLib(long sysModelId) { + public Map addSysModelToLib(long sysModelId) { Long accountId = UserContext.getUserHolder().getId(); SysFile sysFile = sysFileMapper.selectById(sysModelId); if (Objects.isNull(sysFile)) { @@ -871,6 +872,9 @@ public class LibraryServiceImpl extends ServiceImpl impl sysModelPoint.setCreateDate(new Date()); libraryModelPointService.save(sysModelPoint); - return library.getId(); + Map resp = new HashMap<>(); + resp.put("id", library.getId().toString()); + resp.put("url", minioUtil.getPreSignedUrl(library.getUrl(), CommonConstant.MINIO_IMAGE_EXPIRE_TIME)); + return resp; } }