feats

src/main/java/com/shigongli/controller/TaMateTagGroupController.java

@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.shigongli.common.BaseController;
 import com.shigongli.common.ResponseBean;
 import com.shigongli.constants.StatusConstant;
+import com.shigongli.entity.TaMateTag;
+import com.shigongli.service.ITaMateTagService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -21,6 +23,8 @@ import com.shigongli.service.ITaMateTagGroupService;
 import com.shigongli.entity.TaMateTagGroup;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * <p>
     * 素材标签组 前端控制器
@@ -40,6 +44,9 @@ public class TaMateTagGroupController extends BaseController {
     @Autowired
     public ITaMateTagGroupService iTaMateTagGroupService;
 
+    @Autowired
+    public ITaMateTagService iTaMateTagService;
+
 
     /**
      * 分页查询列表
@@ -58,6 +65,15 @@ public class TaMateTagGroupController extends BaseController {
         queryWrapper.orderByDesc("create_date");
 
         IPage<TaMateTagGroup> result = iTaMateTagGroupService.page(pg, queryWrapper);
+
+        // 获取组下所有标签
+        if (null != result.getRecords()) {
+            for (TaMateTagGroup item: result.getRecords()) {
+                List<TaMateTag> taMateTagList = iTaMateTagService.getByGroup(item.getGroupId());
+                item.setTaMateTagList(taMateTagList);
+            }
+        }
+
         return ResponseBean.success(result);
     }
 

src/main/java/com/shigongli/entity/TaMateTagGroup.java

@@ -2,8 +2,12 @@ package com.shigongli.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
+import java.util.List;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -45,5 +49,6 @@ public class TaMateTagGroup implements Serializable {
     @ApiModelProperty(value = "创建人")
     private String userId;
 
-
+    @TableField(exist = false)
+    private List<TaMateTag> taMateTagList;
 }

src/main/java/com/shigongli/service/ITaMateTagService.java

@@ -3,6 +3,8 @@ package com.shigongli.service;
 import com.shigongli.entity.TaMateTag;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  * 素材标签 服务类
@@ -13,4 +15,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ITaMateTagService extends IService<TaMateTag> {
 
+    List<TaMateTag> getByGroup(String groupId);
 }

src/main/java/com/shigongli/service/impl/TaMateTagServiceImpl.java

@@ -1,11 +1,15 @@
 package com.shigongli.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.shigongli.constants.StatusConstant;
 import com.shigongli.entity.TaMateTag;
 import com.shigongli.mapper.TaMateTagMapper;
 import com.shigongli.service.ITaMateTagService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 素材标签 服务实现类
@@ -17,4 +21,12 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaMateTagServiceImpl extends ServiceImpl<TaMateTagMapper, TaMateTag> implements ITaMateTagService {
 
+    @Override
+    public List<TaMateTag> getByGroup(String groupId) {
+        QueryWrapper<TaMateTag> queryWrapper = new QueryWrapper<TaMateTag>()
+                .eq("group_id", groupId)
+                .eq("status", StatusConstant.NORMAL)
+                .orderByDesc("create_date");
+        return list(queryWrapper);
+    }
 }