From ab5cc0378616ac956409a63ffad19cc85679350e Mon Sep 17 00:00:00 2001 From: yang <2119157836@qq.com> Date: Tue, 14 Jan 2025 18:53:46 +0800 Subject: [PATCH] =?UTF-8?q?refactor(mcwl):=20=E9=87=8D=E6=9E=84=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E6=A8=A1=E5=9E=8B=E5=9B=BE=E7=89=87=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增 ModelImageService 接口的 getDetail 方法 - 实现 getDetail 方法，封装模型图片详情信息- 更新 ModelImageController 中的 detail 方法，使用新的 getDetail 接口 - 修改 ModelImageVo 中的 tags 字段类型，从 String 改为 List --- .../resource/ModelImageController.java | 10 +- .../mcwl/memberCenter/MemberCenterTest.java | 97 +++++-------------- .../mcwl/resource/domain/vo/ModelImageVo.java | 4 +- .../resource/service/ModelImageService.java | 4 + .../service/impl/ModelImageServiceImpl.java | 30 ++++++ 5 files changed, 64 insertions(+), 81 deletions(-) diff --git a/mcwl-admin/src/main/java/com/mcwl/web/controller/resource/ModelImageController.java b/mcwl-admin/src/main/java/com/mcwl/web/controller/resource/ModelImageController.java index 3e0ab9a..13f1fb8 100644 --- a/mcwl-admin/src/main/java/com/mcwl/web/controller/resource/ModelImageController.java +++ b/mcwl-admin/src/main/java/com/mcwl/web/controller/resource/ModelImageController.java @@ -50,15 +50,7 @@ public class ModelImageController { */ @GetMapping("/detail/{imageId}") public AjaxResult detail(@PathVariable @NotNull(message = "图片id不能为空") Long imageId) { - ModelImageVo modelImageVo = new ModelImageVo(); - ModelImage modelImage = modelImageService.getById(imageId); - if (Objects.nonNull(modelImage)) { - BeanUtil.copyProperties(modelImage, modelImageVo); - SysUser sysUser = sysUserService.selectUserById(modelImage.getUserId()); - modelImageVo.setUserId(SecurityUtils.getUserId()); - modelImageVo.setUserName(SecurityUtils.getUsername()); - modelImageVo.setUserAvatar(sysUser.getAvatar()); - } + ModelImageVo modelImageVo = modelImageService.getDetail(imageId); return AjaxResult.success(modelImageVo); } diff --git a/mcwl-admin/src/test/java/com/mcwl/memberCenter/MemberCenterTest.java b/mcwl-admin/src/test/java/com/mcwl/memberCenter/MemberCenterTest.java index 44cda14..113ee70 100644 --- a/mcwl-admin/src/test/java/com/mcwl/memberCenter/MemberCenterTest.java +++ b/mcwl-admin/src/test/java/com/mcwl/memberCenter/MemberCenterTest.java @@ -1,71 +1,26 @@ -//package com.mcwl.memberCenter; -// -//import com.mcwl.McWlApplication; -//import com.mcwl.common.core.domain.AjaxResult; -//import com.mcwl.memberCenter.consumer.EmptyPointsRemindConsumer; -//import com.mcwl.memberCenter.service.MemberLevelService; -//import com.mcwl.memberCenter.service.MemberService; -//import com.mcwl.memberCenter.task.UserMemberTask; -//import com.mcwl.web.controller.memberCenter.MemberController; -//import com.mcwl.web.controller.memberCenter.MemberLevelController; -//import org.junit.Test; -//import org.junit.runner.RunWith; -//import org.springframework.beans.factory.annotation.Autowired; -//import org.springframework.boot.test.context.SpringBootTest; -//import org.springframework.test.context.junit4.SpringRunner; -// -//@RunWith(SpringRunner.class) -//@SpringBootTest(classes = McWlApplication.class) -//public class MemberCenterTest { -// -// -// @Autowired -// private MemberLevelService memberLevelService; -// -// @Autowired -// private MemberController memberController; -// -// @Autowired -// private MemberService memberService; -// -// @Autowired -// private UserMemberTask userMemberTask; -// -// @Autowired -// private MemberLevelController memberLevelController; -// -// @Autowired -// private EmptyPointsRemindConsumer emptyPointsRemindConsumer; -// @Test -// public void createUserMember() { -// System.out.println(memberService.createUserMember(1L, 1013L, "wechat",1L)); -// } -// -// @Test -// public void emptyPointsTaskTest() { -// userMemberTask.emptyPointsTsk(); -// } -// -// @Test -// public void updateSubscriptionStatusTaskTest() { -// userMemberTask.updateSubscriptionStatusTask(); -// } -// -// -// @Test -// public void memberServiceTest() { -// System.out.println(memberLevelService.list()); -// } -// -// @Test -// public void getPointsTest() { -// AjaxResult points = memberController.getPoints(); -// System.out.println("points = " + points); -// } -// -// @Test -// public void getMemberLevelListTest() { -// System.out.println("memberLevelController.getMemberBenefitList() = " + memberLevelController.getMemberBenefitList()); -// } -// -//} +package com.mcwl.memberCenter; + +import com.mcwl.McWlApplication; +import com.mcwl.common.core.domain.AjaxResult; +import com.mcwl.memberCenter.consumer.EmptyPointsRemindConsumer; +import com.mcwl.memberCenter.service.MemberLevelService; +import com.mcwl.memberCenter.service.MemberService; +import com.mcwl.memberCenter.task.UserMemberTask; +import com.mcwl.web.controller.memberCenter.MemberController; +import com.mcwl.web.controller.memberCenter.MemberLevelController; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + + +public class MemberCenterTest { + + @Test + public void aaa() { + String s = "1,2,3,4,"; + System.out.println(s.split(",")); + } + +} diff --git a/mcwl-resource/src/main/java/com/mcwl/resource/domain/vo/ModelImageVo.java b/mcwl-resource/src/main/java/com/mcwl/resource/domain/vo/ModelImageVo.java index e79b106..a76e53f 100644 --- a/mcwl-resource/src/main/java/com/mcwl/resource/domain/vo/ModelImageVo.java +++ b/mcwl-resource/src/main/java/com/mcwl/resource/domain/vo/ModelImageVo.java @@ -2,6 +2,8 @@ package com.mcwl.resource.domain.vo; import lombok.Data; +import java.util.List; + @Data public class ModelImageVo { /** @@ -47,7 +49,7 @@ public class ModelImageVo { /** * 图片标签（多个，切割） */ - private String tags; + private List tags; /** * 描述信息（最多500） */ diff --git a/mcwl-resource/src/main/java/com/mcwl/resource/service/ModelImageService.java b/mcwl-resource/src/main/java/com/mcwl/resource/service/ModelImageService.java index 7059eb4..3da3c81 100644 --- a/mcwl-resource/src/main/java/com/mcwl/resource/service/ModelImageService.java +++ b/mcwl-resource/src/main/java/com/mcwl/resource/service/ModelImageService.java @@ -12,7 +12,9 @@ import com.mcwl.resource.domain.dto.ModelImagePageRes; import com.mcwl.resource.domain.dto.ModelImageRes; import com.mcwl.resource.domain.vo.MallProductVo; import com.mcwl.resource.domain.vo.ModelImageCommentVo; +import com.mcwl.resource.domain.vo.ModelImageVo; +import javax.validation.constraints.NotNull; import java.util.List; @@ -48,4 +50,6 @@ public interface ModelImageService extends IService { * @return 分页数据 */ TableDataInfo listByPage(ModelImagePageRes imagePageRes); + + ModelImageVo getDetail(@NotNull(message = "图片id不能为空") Long imageId); } diff --git a/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ModelImageServiceImpl.java b/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ModelImageServiceImpl.java index 25c6af0..615d671 100644 --- a/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ModelImageServiceImpl.java +++ b/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ModelImageServiceImpl.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.OrderItem; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.mcwl.common.constant.HttpStatus; +import com.mcwl.common.core.domain.entity.SysDictData; import com.mcwl.common.core.domain.entity.SysUser; import com.mcwl.common.core.page.PageDomain; import com.mcwl.common.core.page.TableDataInfo; @@ -21,6 +22,7 @@ import com.mcwl.resource.domain.vo.ModelImageVo; import com.mcwl.resource.mapper.ModelImageCommentMapper; import com.mcwl.resource.mapper.ModelImageMapper; import com.mcwl.resource.service.ModelImageService; +import com.mcwl.system.service.ISysDictDataService; import com.mcwl.system.service.ISysUserService; import lombok.RequiredArgsConstructor; import org.jetbrains.annotations.NotNull; @@ -41,6 +43,8 @@ public class ModelImageServiceImpl extends ServiceImpl tags = new ArrayList<>(); + if (StringUtils.isNotEmpty(modelImage.getTags())) { + String[] tagValueList = modelImage.getTags().split(","); + for (String tagIdStr : tagValueList) { + } + } + modelImageVo.setTags(tags); + + SysUser sysUser = sysUserService.selectUserById(modelImage.getUserId()); + modelImageVo.setUserId(SecurityUtils.getUserId()); + modelImageVo.setUserName(SecurityUtils.getUsername()); + modelImageVo.setUserAvatar(sysUser.getAvatar()); + return modelImageVo; + } + /** * 递归查询子评论 *