张延森 4 gadus atpakaļ
vecāks
revīzija
875b0a9305

+ 16
- 0
src/main/java/com/shigongli/controller/TaMateTagGroupController.java Parādīt failu

6
 import com.shigongli.common.BaseController;
6
 import com.shigongli.common.BaseController;
7
 import com.shigongli.common.ResponseBean;
7
 import com.shigongli.common.ResponseBean;
8
 import com.shigongli.constants.StatusConstant;
8
 import com.shigongli.constants.StatusConstant;
9
+import com.shigongli.entity.TaMateTag;
10
+import com.shigongli.service.ITaMateTagService;
9
 import io.swagger.annotations.Api;
11
 import io.swagger.annotations.Api;
10
 import io.swagger.annotations.ApiOperation;
12
 import io.swagger.annotations.ApiOperation;
11
 import io.swagger.annotations.ApiParam;
13
 import io.swagger.annotations.ApiParam;
21
 import com.shigongli.entity.TaMateTagGroup;
23
 import com.shigongli.entity.TaMateTagGroup;
22
 import org.springframework.web.bind.annotation.RestController;
24
 import org.springframework.web.bind.annotation.RestController;
23
 
25
 
26
+import java.util.List;
27
+
24
 /**
28
 /**
25
  * <p>
29
  * <p>
26
     * 素材标签组 前端控制器
30
     * 素材标签组 前端控制器
40
     @Autowired
44
     @Autowired
41
     public ITaMateTagGroupService iTaMateTagGroupService;
45
     public ITaMateTagGroupService iTaMateTagGroupService;
42
 
46
 
47
+    @Autowired
48
+    public ITaMateTagService iTaMateTagService;
49
+
43
 
50
 
44
     /**
51
     /**
45
      * 分页查询列表
52
      * 分页查询列表
58
         queryWrapper.orderByDesc("create_date");
65
         queryWrapper.orderByDesc("create_date");
59
 
66
 
60
         IPage<TaMateTagGroup> result = iTaMateTagGroupService.page(pg, queryWrapper);
67
         IPage<TaMateTagGroup> result = iTaMateTagGroupService.page(pg, queryWrapper);
68
+
69
+        // 获取组下所有标签
70
+        if (null != result.getRecords()) {
71
+            for (TaMateTagGroup item: result.getRecords()) {
72
+                List<TaMateTag> taMateTagList = iTaMateTagService.getByGroup(item.getGroupId());
73
+                item.setTaMateTagList(taMateTagList);
74
+            }
75
+        }
76
+
61
         return ResponseBean.success(result);
77
         return ResponseBean.success(result);
62
     }
78
     }
63
 
79
 

+ 6
- 1
src/main/java/com/shigongli/entity/TaMateTagGroup.java Parādīt failu

2
 
2
 
3
 import com.baomidou.mybatisplus.annotation.IdType;
3
 import com.baomidou.mybatisplus.annotation.IdType;
4
 import java.time.LocalDateTime;
4
 import java.time.LocalDateTime;
5
+
6
+import com.baomidou.mybatisplus.annotation.TableField;
5
 import com.baomidou.mybatisplus.annotation.TableId;
7
 import com.baomidou.mybatisplus.annotation.TableId;
6
 import java.io.Serializable;
8
 import java.io.Serializable;
9
+import java.util.List;
10
+
7
 import io.swagger.annotations.ApiModel;
11
 import io.swagger.annotations.ApiModel;
8
 import io.swagger.annotations.ApiModelProperty;
12
 import io.swagger.annotations.ApiModelProperty;
9
 import lombok.Data;
13
 import lombok.Data;
45
     @ApiModelProperty(value = "创建人")
49
     @ApiModelProperty(value = "创建人")
46
     private String userId;
50
     private String userId;
47
 
51
 
48
-
52
+    @TableField(exist = false)
53
+    private List<TaMateTag> taMateTagList;
49
 }
54
 }

+ 3
- 0
src/main/java/com/shigongli/service/ITaMateTagService.java Parādīt failu

3
 import com.shigongli.entity.TaMateTag;
3
 import com.shigongli.entity.TaMateTag;
4
 import com.baomidou.mybatisplus.extension.service.IService;
4
 import com.baomidou.mybatisplus.extension.service.IService;
5
 
5
 
6
+import java.util.List;
7
+
6
 /**
8
 /**
7
  * <p>
9
  * <p>
8
  * 素材标签 服务类
10
  * 素材标签 服务类
13
  */
15
  */
14
 public interface ITaMateTagService extends IService<TaMateTag> {
16
 public interface ITaMateTagService extends IService<TaMateTag> {
15
 
17
 
18
+    List<TaMateTag> getByGroup(String groupId);
16
 }
19
 }

+ 12
- 0
src/main/java/com/shigongli/service/impl/TaMateTagServiceImpl.java Parādīt failu

1
 package com.shigongli.service.impl;
1
 package com.shigongli.service.impl;
2
 
2
 
3
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
4
+import com.shigongli.constants.StatusConstant;
3
 import com.shigongli.entity.TaMateTag;
5
 import com.shigongli.entity.TaMateTag;
4
 import com.shigongli.mapper.TaMateTagMapper;
6
 import com.shigongli.mapper.TaMateTagMapper;
5
 import com.shigongli.service.ITaMateTagService;
7
 import com.shigongli.service.ITaMateTagService;
6
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
8
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
7
 import org.springframework.stereotype.Service;
9
 import org.springframework.stereotype.Service;
8
 
10
 
11
+import java.util.List;
12
+
9
 /**
13
 /**
10
  * <p>
14
  * <p>
11
  * 素材标签 服务实现类
15
  * 素材标签 服务实现类
17
 @Service
21
 @Service
18
 public class TaMateTagServiceImpl extends ServiceImpl<TaMateTagMapper, TaMateTag> implements ITaMateTagService {
22
 public class TaMateTagServiceImpl extends ServiceImpl<TaMateTagMapper, TaMateTag> implements ITaMateTagService {
19
 
23
 
24
+    @Override
25
+    public List<TaMateTag> getByGroup(String groupId) {
26
+        QueryWrapper<TaMateTag> queryWrapper = new QueryWrapper<TaMateTag>()
27
+                .eq("group_id", groupId)
28
+                .eq("status", StatusConstant.NORMAL)
29
+                .orderByDesc("create_date");
30
+        return list(queryWrapper);
31
+    }
20
 }
32
 }