mcwl-admin/src/main/java/com/mcwl/web/controller/resource/ModelImageController.java

@@ -50,7 +50,15 @@ public class ModelImageController {
      */
     @GetMapping("/detail/{imageId}")
     public AjaxResult detail(@PathVariable @NotNull(message = "图片id不能为空") Long imageId) {
-        ModelImageVo modelImageVo = modelImageService.getDetail(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());
+        }
         return AjaxResult.success(modelImageVo);
     }
 

mcwl-admin/src/test/java/com/mcwl/memberCenter/MemberCenterTest.java

@@ -1,26 +1,71 @@
-package com.mcwl.memberCenter;
+//package com.mcwl.memberCenter;
-
+//
-import com.mcwl.McWlApplication;
+//import com.mcwl.McWlApplication;
-import com.mcwl.common.core.domain.AjaxResult;
+//import com.mcwl.common.core.domain.AjaxResult;
-import com.mcwl.memberCenter.consumer.EmptyPointsRemindConsumer;
+//import com.mcwl.memberCenter.consumer.EmptyPointsRemindConsumer;
-import com.mcwl.memberCenter.service.MemberLevelService;
+//import com.mcwl.memberCenter.service.MemberLevelService;
-import com.mcwl.memberCenter.service.MemberService;
+//import com.mcwl.memberCenter.service.MemberService;
-import com.mcwl.memberCenter.task.UserMemberTask;
+//import com.mcwl.memberCenter.task.UserMemberTask;
-import com.mcwl.web.controller.memberCenter.MemberController;
+//import com.mcwl.web.controller.memberCenter.MemberController;
-import com.mcwl.web.controller.memberCenter.MemberLevelController;
+//import com.mcwl.web.controller.memberCenter.MemberLevelController;
-import org.junit.Test;
+//import org.junit.Test;
-import org.junit.runner.RunWith;
+//import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
+//import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
+//import org.springframework.test.context.junit4.SpringRunner;
-
+//
-
+//@RunWith(SpringRunner.class)
-public class MemberCenterTest {
+//@SpringBootTest(classes = McWlApplication.class)
-
+//public class MemberCenterTest {
-    @Test
+//
-    public void aaa() {
+//
-        String s = "1,2,3,4,";
+//    @Autowired
-        System.out.println(s.split(","));
+//    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());
+//    }
+//
+//}

mcwl-resource/src/main/java/com/mcwl/resource/domain/vo/ModelImageVo.java

@@ -2,8 +2,6 @@ package com.mcwl.resource.domain.vo;
 
 import lombok.Data;
 
-import java.util.List;
-
 @Data
 public class ModelImageVo {
     /**
@@ -49,7 +47,7 @@ public class ModelImageVo {
     /**
      * 图片标签（多个，切割）
      */
-    private List<String> tags;
+    private String tags;
     /**
      * 描述信息（最多500）
      */

mcwl-resource/src/main/java/com/mcwl/resource/service/ModelImageService.java

@@ -12,9 +12,7 @@ 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;
 
 
@@ -50,6 +48,4 @@ public interface ModelImageService extends IService<ModelImage> {
      * @return 分页数据
      */
     TableDataInfo listByPage(ModelImagePageRes imagePageRes);
-
-    ModelImageVo getDetail(@NotNull(message = "图片id不能为空") Long imageId);
 }

mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ModelImageServiceImpl.java

@@ -6,7 +6,6 @@ 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;
@@ -22,7 +21,6 @@ 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;
@@ -43,8 +41,6 @@ public class ModelImageServiceImpl extends ServiceImpl<ModelImageMapper, ModelIm
 
     private final ISysUserService sysUserService;
 
-    private final ISysDictDataService sysDictDataService;
-
     @Override
     public void comment(ModelImageCommentRes modelImageCommentRes) {
         Long parentId = modelImageCommentRes.getParentId();
@@ -199,32 +195,6 @@ public class ModelImageServiceImpl extends ServiceImpl<ModelImageMapper, ModelIm
         return modelImageCommentVo;
     }
 
-    @Override
-    public ModelImageVo getDetail(Long imageId) {
-
-        ModelImageVo modelImageVo = new ModelImageVo();
-        ModelImage modelImage = modelImageMapper.selectById(imageId);
-        if (Objects.isNull(modelImage)) {
-            return null;
-        }
-        BeanUtil.copyProperties(modelImage, modelImageVo);
-
-        // 设置标签
-        List<String> 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;
-    }
-
     /**
      * 递归查询子评论
      *