From e6234213f01bc646a1083a9812660c7c1fcd1086 Mon Sep 17 00:00:00 2001 From: shahaibo <1023316923@qq.com> Date: Thu, 27 Mar 2025 13:33:09 +0800 Subject: [PATCH] =?UTF-8?q?TASK:=E6=A8=A1=E5=9D=97=E5=8C=96=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SavedCollectionController.java | 6 ++++++ .../com/ai/da/model/dto/BrandDNAQueryDTO.java | 8 ++++++++ .../java/com/ai/da/model/vo/BrandDNAVO.java | 9 +++++++++ .../ai/da/service/UserLikeGroupService.java | 3 +++ .../service/impl/UserLikeGroupServiceImpl.java | 18 ++++++++++++++++++ 5 files changed, 44 insertions(+) create mode 100644 src/main/java/com/ai/da/model/dto/BrandDNAQueryDTO.java create mode 100644 src/main/java/com/ai/da/model/vo/BrandDNAVO.java diff --git a/src/main/java/com/ai/da/controller/SavedCollectionController.java b/src/main/java/com/ai/da/controller/SavedCollectionController.java index 19d8e595..12808186 100644 --- a/src/main/java/com/ai/da/controller/SavedCollectionController.java +++ b/src/main/java/com/ai/da/controller/SavedCollectionController.java @@ -265,6 +265,12 @@ public class SavedCollectionController { return Response.success(userLikeGroupService.brandDNASaveOrUpdate(brandDNADTO)); } + @ApiOperation(value = "brandDNAPage") + @PostMapping("/brandDNAPage") + public Response> brandDNAPage(@Valid @RequestBody BrandDNAQueryDTO brandDNAQueryDTO) { + return Response.success(userLikeGroupService.brandDNAPage(brandDNAQueryDTO)); + } + @ApiOperation(value = "brandLogoUpload") @PostMapping("/brandLogoUpload") public Response brandDNASaveOrUpdate(@RequestParam("file") MultipartFile file) { diff --git a/src/main/java/com/ai/da/model/dto/BrandDNAQueryDTO.java b/src/main/java/com/ai/da/model/dto/BrandDNAQueryDTO.java new file mode 100644 index 00000000..8f41a3f9 --- /dev/null +++ b/src/main/java/com/ai/da/model/dto/BrandDNAQueryDTO.java @@ -0,0 +1,8 @@ +package com.ai.da.model.dto; + +import com.ai.da.model.vo.PageQueryBaseVo; +import lombok.Data; + +@Data +public class BrandDNAQueryDTO extends PageQueryBaseVo { +} diff --git a/src/main/java/com/ai/da/model/vo/BrandDNAVO.java b/src/main/java/com/ai/da/model/vo/BrandDNAVO.java new file mode 100644 index 00000000..fefbc1c5 --- /dev/null +++ b/src/main/java/com/ai/da/model/vo/BrandDNAVO.java @@ -0,0 +1,9 @@ +package com.ai.da.model.vo; + +import com.ai.da.mapper.primary.entity.BrandDNA; +import lombok.Data; + +@Data +public class BrandDNAVO extends BrandDNA { + private String minioUrl; +} diff --git a/src/main/java/com/ai/da/service/UserLikeGroupService.java b/src/main/java/com/ai/da/service/UserLikeGroupService.java index 174d9ada..b126cb16 100644 --- a/src/main/java/com/ai/da/service/UserLikeGroupService.java +++ b/src/main/java/com/ai/da/service/UserLikeGroupService.java @@ -1,5 +1,6 @@ package com.ai.da.service; +import com.ai.da.common.response.PageBaseResponse; import com.ai.da.mapper.primary.entity.*; import com.ai.da.model.dto.*; import com.ai.da.model.vo.*; @@ -86,4 +87,6 @@ public interface UserLikeGroupService extends IService { Boolean brandDNASaveOrUpdate(BrandDNADTO brandDNADTO); String brandDNAUpload(MultipartFile file, Long brandId) throws IOException; + + PageBaseResponse brandDNAPage(BrandDNAQueryDTO brandDNAQueryDTO); } diff --git a/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java b/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java index 0dbcdabf..d6a972b4 100644 --- a/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java @@ -7,6 +7,7 @@ import com.ai.da.common.context.UserContext; import com.ai.da.common.enums.CollectionLevel1TypeEnum; import com.ai.da.common.enums.CreditsEventsEnum; import com.ai.da.common.enums.DesignTypeEnum; +import com.ai.da.common.response.PageBaseResponse; import com.ai.da.common.response.ResultEnum; import com.ai.da.common.utils.*; import com.ai.da.mapper.primary.*; @@ -1917,4 +1918,21 @@ public class UserLikeGroupServiceImpl extends ServiceImpl brandDNAPage(BrandDNAQueryDTO brandDNAQueryDTO) { + AuthPrincipalVo userHolder = UserContext.getUserHolder(); + QueryWrapper qw = new QueryWrapper<>(); + qw.lambda().eq(BrandDNA::getAccountId, userHolder.getId()); + IPage page = brandDNAMapper.selectPage(new Page<>(brandDNAQueryDTO.getPage(), brandDNAQueryDTO.getSize()), qw); + IPage convert = page.convert((Function) brand -> { + if (Objects.nonNull(brand)) { + BrandDNAVO brandDNAVO = CopyUtil.copyObject(brand, BrandDNAVO.class); + brandDNAVO.setMinioUrl(minioUtil.getPreSignedUrl(brandDNAVO.getBrandLogo(), 24 * 60)); + return brandDNAVO; + } + return null; + }); + return PageBaseResponse.success(convert); + } }