feat(business): 新增类目与标签合并管理功能

- 新增 CategoryTag 实体类，支持类目与标签统一管理
- 新增 CategoryTagBo 业务对象，用于接收和校验请求参数
- 新增 CategoryTagVo 视图对象，用于返回响应数据及 Excel 导出
- 新增 CategoryTagController 控制器，实现增删改查及导出接口
- 新增 CategoryTagMapper 及 XML 映射文件，支持数据库操作
- 新增 CategoryTagServiceImpl 服务实现类，封装业务逻辑
- 新增 TournamentCategoryTag 相关实体、BO、VO 和 Mapper，用于赛事关联管理
- 实现唯一性校验，防止重复名称和类型组合
- 支持软删除机制，保障数据安全
- 提供分页查询、列表查询和详情查询功能
- 支持通过 Excel 导出类目与标签数据
- 使用 MyBatis Plus 提升开发效率和代码一致性

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/business/controller/CategoryTagController.java

@@ -0,0 +1,105 @@
+package org.dromara.business.controller;
+
+import java.util.List;
+
+import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.dromara.business.domain.bo.CategoryTagBo;
+import org.dromara.business.domain.vo.CategoryTagVo;
+import org.dromara.business.service.ICategoryTagService;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 类目与标签合并
+ *
+ * @author Lion Li
+ * @date 2025-12-12
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/business/tag")
+public class CategoryTagController extends BaseController {
+
+    private final ICategoryTagService categoryTagService;
+
+    /**
+     * 查询类目与标签合并列表
+     */
+    @SaCheckPermission("business:tag:list")
+    @GetMapping("/list")
+    public TableDataInfo<CategoryTagVo> list(CategoryTagBo bo, PageQuery pageQuery) {
+        return categoryTagService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出类目与标签合并列表
+     */
+    @SaCheckPermission("business:tag:export")
+    @Log(title = "类目与标签合并", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(CategoryTagBo bo, HttpServletResponse response) {
+        List<CategoryTagVo> list = categoryTagService.queryList(bo);
+        ExcelUtil.exportExcel(list, "类目与标签合并", CategoryTagVo.class, response);
+    }
+
+    /**
+     * 获取类目与标签合并详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("business:tag:query")
+    @GetMapping("/{id}")
+    public R<CategoryTagVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long id) {
+        return R.ok(categoryTagService.queryById(id));
+    }
+
+    /**
+     * 新增类目与标签合并
+     */
+    @SaCheckPermission("business:tag:add")
+    @Log(title = "类目与标签合并", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody CategoryTagBo bo) {
+        return toAjax(categoryTagService.insertByBo(bo));
+    }
+
+    /**
+     * 修改类目与标签合并
+     */
+    @SaCheckPermission("business:tag:edit")
+    @Log(title = "类目与标签合并", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody CategoryTagBo bo) {
+        return toAjax(categoryTagService.updateByBo(bo));
+    }
+
+    /**
+     * 删除类目与标签合并
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("business:tag:remove")
+    @Log(title = "类目与标签合并", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(categoryTagService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/business/domain/CategoryTag.java

@@ -0,0 +1,63 @@
+package org.dromara.business.domain;
+
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.io.Serial;
+
+/**
+ * 类目与标签合并对象 category_tag
+ *
+ * @author Lion Li
+ * @date 2025-12-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("category_tag")
+public class CategoryTag extends BaseEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 名称，最多50字
+     */
+    private String name;
+
+    /**
+     * 类型：CATEGORY=类目，TAG=标签
+     */
+    private String type;
+
+    /**
+     * 图标URL，仅类目使用
+     */
+    private String iconUrl;
+
+    /**
+     * 排序权重，数值越小越靠前
+     */
+    private Long sortWeight;
+
+    /**
+     * 应用状态：1=启用，0=禁用
+     */
+    private Long status;
+
+    /**
+     * 软删除时间
+     */
+    private Date deletedAt;
+
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/business/domain/TournamentCategoryTag.java

@@ -0,0 +1,35 @@
+package org.dromara.business.domain;
+
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+
+/**
+ * 赛事与类目/标签关联对象 tournament_category_tag
+ *
+ * @author Lion Li
+ * @date 2025-12-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("tournament_category_tag")
+public class TournamentCategoryTag extends BaseEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 赛事ID，关联 tournaments.id
+     */
+    private Long tournamentId;
+
+    /**
+      * 类目/标ID，关联 category_tag.id
+     */
+    private Long categoryTagId;
+
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/business/domain/bo/CategoryTagBo.java

@@ -0,0 +1,65 @@
+package org.dromara.business.domain.bo;
+
+import org.dromara.business.domain.CategoryTag;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
+import java.util.Date;
+
+/**
+ * 类目与标签合并业务对象 category_tag
+ *
+ * @author Lion Li
+ * @date 2025-12-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = CategoryTag.class, reverseConvertGenerate = false)
+public class CategoryTagBo extends BaseEntity {
+
+    /**
+     * 主键ID
+     */
+    @NotNull(message = "主键ID不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 名称，最多50字
+     */
+    @NotBlank(message = "名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String name;
+
+    /**
+     * 类型：CATEGORY=类目，TAG=标签
+     */
+    @NotBlank(message = "类型：CATEGORY=类目，TAG=标签不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String type;
+
+    /**
+     * 图标URL，仅类目使用
+     */
+    private String iconUrl;
+
+    /**
+     * 排序权重，数值越小越靠前
+     */
+    //@NotNull(message = "排序权重，数值越小越靠前不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long sortWeight;
+
+    /**
+     * 应用状态：1=启用，0=禁用
+     */
+    @NotNull(message = "应用状态：1=启用，0=禁用不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long status;
+
+    /**
+     * 软删除时间
+     */
+    private Date deletedAt;
+
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/business/domain/bo/TournamentCategoryTagBo.java

@@ -0,0 +1,35 @@
+package org.dromara.business.domain.bo;
+
+import org.dromara.business.domain.TournamentCategoryTag;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.common.core.validate.EditGroup;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
+
+/**
+ * 赛事与类目/标签关联业务对象 tournament_category_tag
+ *
+ * @author Lion Li
+ * @date 2025-12-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = TournamentCategoryTag.class, reverseConvertGenerate = false)
+public class TournamentCategoryTagBo extends BaseEntity {
+
+    /**
+     * 赛事ID，关联 tournaments.id
+     */
+    @NotNull(message = "赛事ID，关联 tournaments.id不能为空", groups = { EditGroup.class })
+    private Long tournamentId;
+
+    /**
+     * 类目/标ID，关联 category_tag.id
+     */
+    @NotNull(message = "类目/标ID，关联 category_tag.id不能为空", groups = { EditGroup.class })
+    private Long categoryTagId;
+
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/business/domain/vo/CategoryTagVo.java

@@ -0,0 +1,72 @@
+package org.dromara.business.domain.vo;
+
+import java.util.Date;
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.business.domain.CategoryTag;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+
+
+/**
+ * 类目与标签合并视图对象 category_tag
+ *
+ * @author Lion Li
+ * @date 2025-12-12
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = CategoryTag.class)
+public class CategoryTagVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @ExcelProperty(value = "主键ID")
+    private Long id;
+
+    /**
+     * 名称，最多50字
+     */
+    @ExcelProperty(value = "名称，最多50字")
+    private String name;
+
+    /**
+     * 类型：CATEGORY=类目，TAG=标签
+     */
+    @ExcelProperty(value = "类型：CATEGORY=类目，TAG=标签")
+    private String type;
+
+    /**
+     * 图标URL，仅类目使用
+     */
+    @ExcelProperty(value = "图标URL，仅类目使用")
+    private String iconUrl;
+
+    /**
+     * 排序权重，数值越小越靠前
+     */
+    @ExcelProperty(value = "排序权重，数值越小越靠前")
+    private Long sortWeight;
+
+    /**
+     * 应用状态：1=启用，0=禁用
+     */
+    @ExcelProperty(value = "应用状态：1=启用，0=禁用")
+    private Long status;
+
+    /**
+     * 软删除时间
+     */
+    @ExcelProperty(value = "软删除时间")
+    private Date deletedAt;
+
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/business/domain/vo/TournamentCategoryTagVo.java

@@ -0,0 +1,41 @@
+package org.dromara.business.domain.vo;
+
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.business.domain.TournamentCategoryTag;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+
+
+/**
+ * 赛事与类目/标签关联视图对象 tournament_category_tag
+ *
+ * @author Lion Li
+ * @date 2025-12-12
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = TournamentCategoryTag.class)
+public class TournamentCategoryTagVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 赛事ID，关联 tournaments.id
+     */
+    @ExcelProperty(value = "赛事ID，关联 tournaments.id")
+    private Long tournamentId;
+
+    /**
+     * 类目/标ID，关联 category_tag.id
+     */
+    @ExcelProperty(value = "类目/标ID，关联 category_tag.id")
+    private Long categoryTagId;
+
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/business/mapper/CategoryTagMapper.java

@@ -0,0 +1,45 @@
+package org.dromara.business.mapper;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
+import org.dromara.business.domain.CategoryTag;
+import org.dromara.business.domain.vo.CategoryTagVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 类目与标签合并Mapper接口
+ *
+ * @author Lion Li
+ * @date 2025-12-12
+ */
+@DS("mysql2")
+public interface CategoryTagMapper extends BaseMapperPlus<CategoryTag, CategoryTagVo> {
+
+    @InterceptorIgnore(tenantLine = "true")
+    Page<CategoryTagVo> selectCategoryTagPage(@Param("page") Page<CategoryTag> page, @Param("ew") Wrapper<CategoryTag> wrapper);
+
+    @InterceptorIgnore(tenantLine = "true")
+    int insertCategoryTag(CategoryTag categoryTag);
+
+    @InterceptorIgnore(tenantLine = "true")
+    int updateCategoryTagById(CategoryTag categoryTag);
+
+    @InterceptorIgnore(tenantLine = "true")
+    int deleteCategoryTagById(@Param("ids") Collection<Long> ids);
+
+    @InterceptorIgnore(tenantLine = "true")
+    CategoryTagVo selectCategoryTagById(Long id);
+
+    @InterceptorIgnore(tenantLine = "true")
+    List<CategoryTagVo> selectCategoryTagList(@Param("ew") Wrapper<CategoryTag> wrapper);
+
+    @InterceptorIgnore(tenantLine = "true")
+    CategoryTagVo selectCategoryTagExit(@Param("id") Long id, @Param("name") String name, @Param("type") String type);
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/business/mapper/TournamentCategoryTagMapper.java

@@ -0,0 +1,28 @@
+package org.dromara.business.mapper;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
+import org.apache.ibatis.annotations.Param;
+import org.dromara.business.domain.TournamentCategoryTag;
+import org.dromara.business.domain.vo.TournamentCategoryTagVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 赛事与类目/标签关联Mapper接口
+ *
+ * @author Lion Li
+ * @date 2025-12-12
+ */
+@DS("mysql2")
+public interface TournamentCategoryTagMapper extends BaseMapperPlus<TournamentCategoryTag, TournamentCategoryTagVo> {
+
+    @InterceptorIgnore(tenantLine = "true")
+    int insertTournamentCategoryTag(TournamentCategoryTag categoryTag);
+
+    @InterceptorIgnore(tenantLine = "true")
+    int deleteByTournamentCategoryTagTournamentId(@Param("tournamentId") Long tournamentId);
+
+    @InterceptorIgnore(tenantLine = "true")
+    int deleteTournamentCategoryTagByIds(@Param("tournamentId") Long tournamentId, @Param("categoryTagId") Long categoryTagId);
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/business/service/ICategoryTagService.java

@@ -0,0 +1,68 @@
+package org.dromara.business.service;
+
+import org.dromara.business.domain.bo.CategoryTagBo;
+import org.dromara.business.domain.vo.CategoryTagVo;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 类目与标签合并Service接口
+ *
+ * @author Lion Li
+ * @date 2025-12-12
+ */
+public interface ICategoryTagService {
+
+    /**
+     * 查询类目与标签合并
+     *
+     * @param id 主键
+     * @return 类目与标签合并
+     */
+    CategoryTagVo queryById(Long id);
+
+    /**
+     * 分页查询类目与标签合并列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 类目与标签合并分页列表
+     */
+    TableDataInfo<CategoryTagVo> queryPageList(CategoryTagBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的类目与标签合并列表
+     *
+     * @param bo 查询条件
+     * @return 类目与标签合并列表
+     */
+    List<CategoryTagVo> queryList(CategoryTagBo bo);
+
+    /**
+     * 新增类目与标签合并
+     *
+     * @param bo 类目与标签合并
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(CategoryTagBo bo);
+
+    /**
+     * 修改类目与标签合并
+     *
+     * @param bo 类目与标签合并
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(CategoryTagBo bo);
+
+    /**
+     * 校验并批量删除类目与标签合并信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/business/service/impl/CategoryTagServiceImpl.java

@@ -0,0 +1,144 @@
+package org.dromara.business.service.impl;
+
+import org.dromara.business.domain.CategoryTag;
+import org.dromara.business.domain.bo.CategoryTagBo;
+import org.dromara.business.domain.vo.CategoryTagVo;
+import org.dromara.business.mapper.CategoryTagMapper;
+import org.dromara.business.service.ICategoryTagService;
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 类目与标签合并Service业务层处理
+ *
+ * @author Lion Li
+ * @date 2025-12-12
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class CategoryTagServiceImpl implements ICategoryTagService {
+
+    private final CategoryTagMapper baseMapper;
+
+    /**
+     * 查询类目与标签合并
+     *
+     * @param id 主键
+     * @return 类目与标签合并
+     */
+    @Override
+    public CategoryTagVo queryById(Long id){
+        return baseMapper.selectCategoryTagById(id);
+    }
+
+    /**
+     * 分页查询类目与标签合并列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 类目与标签合并分页列表
+     */
+    @Override
+    public TableDataInfo<CategoryTagVo> queryPageList(CategoryTagBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<CategoryTag> lqw = buildQueryWrapper(bo);
+        Page<CategoryTagVo> result = baseMapper.selectCategoryTagPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的类目与标签合并列表
+     *
+     * @param bo 查询条件
+     * @return 类目与标签合并列表
+     */
+    @Override
+    public List<CategoryTagVo> queryList(CategoryTagBo bo) {
+        LambdaQueryWrapper<CategoryTag> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<CategoryTag> buildQueryWrapper(CategoryTagBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<CategoryTag> lqw = Wrappers.lambdaQuery();
+        lqw.orderByAsc(CategoryTag::getId);
+        lqw.like(StringUtils.isNotBlank(bo.getName()), CategoryTag::getName, bo.getName());
+        lqw.eq(StringUtils.isNotBlank(bo.getType()), CategoryTag::getType, bo.getType());
+        lqw.eq(StringUtils.isNotBlank(bo.getIconUrl()), CategoryTag::getIconUrl, bo.getIconUrl());
+        lqw.eq(bo.getSortWeight() != null, CategoryTag::getSortWeight, bo.getSortWeight());
+        lqw.eq(bo.getStatus() != null, CategoryTag::getStatus, bo.getStatus());
+        lqw.eq(bo.getDeletedAt() != null, CategoryTag::getDeletedAt, bo.getDeletedAt());
+        return lqw;
+    }
+
+    /**
+     * 新增类目与标签合并
+     *
+     * @param bo 类目与标签合并
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(CategoryTagBo bo) {
+        CategoryTag add = MapstructUtils.convert(bo, CategoryTag.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insertCategoryTag(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改类目与标签合并
+     *
+     * @param bo 类目与标签合并
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(CategoryTagBo bo) {
+        CategoryTag update = MapstructUtils.convert(bo, CategoryTag.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateCategoryTagById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(CategoryTag entity){
+        //TODO 做一些数据校验,如唯一约束
+
+        CategoryTagVo categoryTagVo = baseMapper.selectCategoryTagExit(entity.getId(), entity.getName(), entity.getType());
+        if (categoryTagVo != null && !categoryTagVo.getId().equals(entity.getId())) {
+            throw new ServiceException("该名称重复");
+        }
+
+    }
+
+    /**
+     * 校验并批量删除类目与标签合并信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteCategoryTagById(ids) > 0;
+    }
+}

ruoyi-modules/ruoyi-system/src/main/resources/mapper/business/CategoryTagMapper.xml

@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.business.mapper.CategoryTagMapper">
+
+
+    <!-- 列出所有字段（用于 SELECT） -->
+    <sql id="Base_Column_List">
+        id, name, type, icon_url, sort_weight, status, create_time, update_time, deleted_at
+    </sql>
+
+
+    <!-- 分页查询（带条件） -->
+    <select id="selectCategoryTagPage" resultType="org.dromara.business.domain.vo.CategoryTagVo">
+        SELECT <include refid="Base_Column_List"/>
+        FROM category_tag ${ew.customSqlSegment}
+    </select>
+
+    <select id="selectCategoryTagList" resultType="org.dromara.business.domain.vo.CategoryTagVo">
+        SELECT <include refid="Base_Column_List"/>
+        FROM category_tag ${ew.customSqlSegment}
+    </select>
+
+    <select id="selectCategoryTagById" resultType="org.dromara.business.domain.vo.CategoryTagVo">
+        SELECT <include refid="Base_Column_List"/>
+        FROM category_tag  where id=#{id}
+    </select>
+
+    <insert id="insertCategoryTag" useGeneratedKeys="true" keyProperty="id">
+        INSERT INTO category_tag (
+        name,
+        type,
+        <if test="iconUrl != null and iconUrl != ''">icon_url,</if>
+        sort_weight,
+        status
+        ) VALUES (
+        #{name},
+        #{type},
+        <if test="iconUrl != null and iconUrl != ''">#{iconUrl},</if>
+        #{sortWeight},
+        #{status}
+        )
+    </insert>
+
+    <!-- 编辑（仅更新非空字段） -->
+    <update id="updateCategoryTagById">
+        UPDATE category_tag
+        <set>
+            <if test="name != null and name != ''">name = #{name},</if>
+            <if test="type != null and type != ''">type = #{type},</if>
+            <if test="iconUrl != null">icon_url = #{iconUrl},</if>
+            <if test="sortWeight != null">sort_weight = #{sortWeight},</if>
+            <if test="status != null">status = #{status},</if>
+            update_time = NOW()
+        </set>
+        WHERE id = #{id} AND deleted_at IS NULL
+    </update>
+
+
+    <!-- 删除记录 -->
+    <delete id="deleteCategoryTagById">
+        DELETE FROM category_tag
+        <where>
+            id IN
+            <foreach item="id" collection="ids" open="(" separator="," close=")">
+                <if test="id > 0">
+                    #{id}
+                </if>
+            </foreach>
+        </where>
+    </delete>
+
+    <select id="selectCategoryTagExit" resultType="org.dromara.business.domain.vo.CategoryTagVo">
+        SELECT <include refid="Base_Column_List"/>
+        FROM category_tag  where  1=1
+        <if test="id != null and id != ''"> and id!=#{id}</if>
+        <if test="name != null and name != ''">and name=#{name}</if>
+        <if test="type != null and type != ''">and type=#{type}</if>
+    </select>
+
+</mapper>

ruoyi-modules/ruoyi-system/src/main/resources/mapper/business/TournamentCategoryTagMapper.xml

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.business.mapper.TournamentCategoryTagMapper">
+
+
+    <!-- 插入单条（通常用于批量） -->
+    <insert id="insertTournamentCategoryTag">
+        INSERT INTO tournament_category_tag (tournament_id, category_tag_id)
+        VALUES (#{tournamentId}, #{categoryTagId})
+        ON DUPLICATE KEY UPDATE
+        tournament_id = tournament_id; <!-- 防止报错，实际不更新 -->
+    </insert>
+
+    <!-- 批量插入（推荐方式） -->
+    <insert id="batchInsertTournamentCategoryTag">
+        INSERT INTO tournament_category_tag (tournament_id, category_tag_id)
+        VALUES
+        <foreach collection="list" item="item" separator=",">
+            (#{item.tournamentId}, #{item.categoryTagId})
+        </foreach>
+        ON DUPLICATE KEY UPDATE
+        tournament_id = tournament_id;
+    </insert>
+
+    <!-- 根据赛事ID删除所有关联（用于“重新绑定”） -->
+    <delete id="deleteByTournamentCategoryTagTournamentId">
+        DELETE FROM tournament_category_tag
+        WHERE tournament_id = #{tournamentId}
+    </delete>
+
+    <!-- 删除单条关联 -->
+    <delete id="deleteTournamentCategoryTagByIds">
+        DELETE FROM tournament_category_tag
+        WHERE tournament_id = #{tournamentId}
+          AND category_tag_id = #{categoryTagId}
+    </delete>
+
+
+
+</mapper>