Browse Source

Merge branch 'dev_zlt' into dev

zhou 4 weeks ago
parent
commit
753fae262a
16 changed files with 606 additions and 0 deletions
  1. 105 0
      ruoyi-modules/ruoyi-game-event/src/main/java/org/dromara/system/controller/GameRankGroupController.java
  2. 11 0
      ruoyi-modules/ruoyi-game-event/src/main/java/org/dromara/system/controller/GameTeamController.java
  3. 57 0
      ruoyi-modules/ruoyi-game-event/src/main/java/org/dromara/system/domain/GameRankGroup.java
  4. 5 0
      ruoyi-modules/ruoyi-game-event/src/main/java/org/dromara/system/domain/GameTeam.java
  5. 51 0
      ruoyi-modules/ruoyi-game-event/src/main/java/org/dromara/system/domain/bo/GameRankGroupBo.java
  6. 5 0
      ruoyi-modules/ruoyi-game-event/src/main/java/org/dromara/system/domain/bo/GameTeamBo.java
  7. 11 0
      ruoyi-modules/ruoyi-game-event/src/main/java/org/dromara/system/domain/request/MoveGroupRequest.java
  8. 69 0
      ruoyi-modules/ruoyi-game-event/src/main/java/org/dromara/system/domain/vo/GameRankGroupVo.java
  9. 10 0
      ruoyi-modules/ruoyi-game-event/src/main/java/org/dromara/system/domain/vo/GameTeamVo.java
  10. 15 0
      ruoyi-modules/ruoyi-game-event/src/main/java/org/dromara/system/mapper/GameRankGroupMapper.java
  11. 10 0
      ruoyi-modules/ruoyi-game-event/src/main/java/org/dromara/system/mapper/GameTeamMapper.java
  12. 69 0
      ruoyi-modules/ruoyi-game-event/src/main/java/org/dromara/system/service/IGameRankGroupService.java
  13. 8 0
      ruoyi-modules/ruoyi-game-event/src/main/java/org/dromara/system/service/IGameTeamService.java
  14. 145 0
      ruoyi-modules/ruoyi-game-event/src/main/java/org/dromara/system/service/impl/GameRankGroupServiceImpl.java
  15. 27 0
      ruoyi-modules/ruoyi-game-event/src/main/java/org/dromara/system/service/impl/GameTeamServiceImpl.java
  16. 8 0
      ruoyi-modules/ruoyi-game-event/src/main/resources/mapper/system/GameTeamMapper.xml

+ 105 - 0
ruoyi-modules/ruoyi-game-event/src/main/java/org/dromara/system/controller/GameRankGroupController.java

@@ -0,0 +1,105 @@
+package org.dromara.system.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.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.system.domain.vo.GameRankGroupVo;
+import org.dromara.system.domain.bo.GameRankGroupBo;
+import org.dromara.system.service.IGameRankGroupService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 排名分组
+ *
+ * @author zlt
+ * @date 2025-09-19
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/system/rankGroup")
+public class GameRankGroupController extends BaseController {
+
+    private final IGameRankGroupService gameRankGroupService;
+
+    /**
+     * 查询排名分组列表
+     */
+    @SaCheckPermission("system:rankGroup:list")
+    @GetMapping("/list")
+    public TableDataInfo<GameRankGroupVo> list(GameRankGroupBo bo, PageQuery pageQuery) {
+        return gameRankGroupService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出排名分组列表
+     */
+    @SaCheckPermission("system:rankGroup:export")
+    @Log(title = "排名分组", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(GameRankGroupBo bo, HttpServletResponse response) {
+        List<GameRankGroupVo> list = gameRankGroupService.queryList(bo);
+        ExcelUtil.exportExcel(list, "排名分组", GameRankGroupVo.class, response);
+    }
+
+    /**
+     * 获取排名分组详细信息
+     *
+     * @param rgId 主键
+     */
+    @SaCheckPermission("system:rankGroup:query")
+    @GetMapping("/{rgId}")
+    public R<GameRankGroupVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long rgId) {
+        return R.ok(gameRankGroupService.queryById(rgId));
+    }
+
+    /**
+     * 新增排名分组
+     */
+    @SaCheckPermission("system:rankGroup:add")
+    @Log(title = "排名分组", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody GameRankGroupBo bo) {
+        return toAjax(gameRankGroupService.insertByBo(bo));
+    }
+
+    /**
+     * 修改排名分组
+     */
+    @SaCheckPermission("system:rankGroup:edit")
+    @Log(title = "排名分组", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody GameRankGroupBo bo) {
+        return toAjax(gameRankGroupService.updateByBo(bo));
+    }
+
+    /**
+     * 删除排名分组
+     *
+     * @param rgIds 主键串
+     */
+    @SaCheckPermission("system:rankGroup:remove")
+    @Log(title = "排名分组", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{rgIds}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] rgIds) {
+        return toAjax(gameRankGroupService.deleteWithValidByIds(List.of(rgIds), true));
+    }
+}

+ 11 - 0
ruoyi-modules/ruoyi-game-event/src/main/java/org/dromara/system/controller/GameTeamController.java

@@ -20,6 +20,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.web.core.BaseController;
 import org.dromara.system.domain.GameTeam;
 import org.dromara.system.domain.bo.GameTeamBo;
+import org.dromara.system.domain.request.MoveGroupRequest;
 import org.dromara.system.domain.request.UpdateTeamAthletesRequest;
 import org.dromara.system.domain.vo.GameTeamVo;
 import org.dromara.system.service.IGameEventService;
@@ -171,4 +172,14 @@ public class GameTeamController extends BaseController {
     public R<Void> updateTeamAthletes(@RequestBody UpdateTeamAthletesRequest request) {
         return toAjax(gameTeamService.updateTeamAthletes(request.getTeamId(), request.getAthleteIds()));
     }
+
+    /**
+     * 移动分组
+     */
+    @SaCheckPermission("system:gameTeam:edit")
+    @Log(title = "参赛队伍", businessType = BusinessType.UPDATE)
+    @PutMapping("/moveGroup")
+    public R<Void> moveGroup(@RequestBody MoveGroupRequest request) {
+        return toAjax(gameTeamService.moveGroup(request.getTeamIds(), request.getRgId()));
+    }
 }

+ 57 - 0
ruoyi-modules/ruoyi-game-event/src/main/java/org/dromara/system/domain/GameRankGroup.java

@@ -0,0 +1,57 @@
+package org.dromara.system.domain;
+
+import org.dromara.common.tenant.core.TenantEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+
+/**
+ * 排名分组对象 game_rank_group
+ *
+ * @author zlt
+ * @date 2025-09-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("game_rank_group")
+public class GameRankGroup extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "rg_id")
+    private Long rgId;
+
+    /**
+     * 赛事ID
+     */
+    private Long eventId;
+
+    /**
+     * 分组名
+     */
+    private String rgName;
+
+    /**
+     * 状态(0正常 1停用)
+     */
+    private String status;
+
+    /**
+     * 删除标志(0代表存在 1代表删除)
+     */
+    @TableLogic
+    private String delFlag;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

+ 5 - 0
ruoyi-modules/ruoyi-game-event/src/main/java/org/dromara/system/domain/GameTeam.java

@@ -32,6 +32,11 @@ public class GameTeam extends TenantEntity {
      */
     private Long eventId;
 
+    /**
+     * 排名分组ID
+     */
+    private Long rgId;
+
     /**
      * 队伍名称
      */

+ 51 - 0
ruoyi-modules/ruoyi-game-event/src/main/java/org/dromara/system/domain/bo/GameRankGroupBo.java

@@ -0,0 +1,51 @@
+package org.dromara.system.domain.bo;
+
+import org.dromara.system.domain.GameRankGroup;
+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.*;
+
+/**
+ * 排名分组业务对象 game_rank_group
+ *
+ * @author zlt
+ * @date 2025-09-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = GameRankGroup.class, reverseConvertGenerate = false)
+public class GameRankGroupBo extends BaseEntity {
+
+    /**
+     * 主键
+     */
+    private Long rgId;
+
+    /**
+     * 赛事ID
+     */
+    private Long eventId;
+
+    /**
+     * 分组名
+     */
+    private String rgName;
+
+    /**
+     * 状态(0正常 1停用)
+     */
+//    @NotBlank(message = "状态(0正常 1停用)不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String status;
+
+    /**
+     * 备注
+     */
+//    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String remark;
+
+
+}

+ 5 - 0
ruoyi-modules/ruoyi-game-event/src/main/java/org/dromara/system/domain/bo/GameTeamBo.java

@@ -33,6 +33,11 @@ public class GameTeamBo extends BaseEntity {
 //    @NotNull(message = "赛事ID不能为空", groups = {AddGroup.class, EditGroup.class})
     private Long eventId;
 
+    /**
+     * 排名分组ID
+     */
+    private Long rgId;
+
     /**
      * 赛事名称
      */

+ 11 - 0
ruoyi-modules/ruoyi-game-event/src/main/java/org/dromara/system/domain/request/MoveGroupRequest.java

@@ -0,0 +1,11 @@
+package org.dromara.system.domain.request;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class MoveGroupRequest {
+    private List<Long> teamIds;
+    private Long rgId;
+}

+ 69 - 0
ruoyi-modules/ruoyi-game-event/src/main/java/org/dromara/system/domain/vo/GameRankGroupVo.java

@@ -0,0 +1,69 @@
+package org.dromara.system.domain.vo;
+
+import org.dromara.system.domain.GameRankGroup;
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+
+/**
+ * 排名分组视图对象 game_rank_group
+ *
+ * @author zlt
+ * @date 2025-09-19
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = GameRankGroup.class)
+public class GameRankGroupVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+//    @ExcelProperty(value = "主键")
+    private Long rgId;
+
+    /**
+     * 赛事ID
+     */
+//    @ExcelProperty(value = "赛事ID")
+    private Long eventId;
+
+    /**
+     * 分组名
+     */
+    @ExcelProperty(value = "分组名")
+    private String rgName;
+
+    /**
+     * 更新时间
+     */
+    @ExcelProperty(value = "更新时间")
+    private Date updateTime;
+
+    /**
+     * 状态(0正常 1停用)
+     */
+    @ExcelProperty(value = "状态", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "0=正常,1=停用")
+    private String status;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+
+}

+ 10 - 0
ruoyi-modules/ruoyi-game-event/src/main/java/org/dromara/system/domain/vo/GameTeamVo.java

@@ -37,6 +37,16 @@ public class GameTeamVo implements Serializable {
 //    @ExcelProperty(value = "赛事ID")
     private Long eventId;
 
+    /**
+     * 排名分组ID
+     */
+    private Long rgId;
+
+    /**
+     * 排名分组名
+     */
+    private String rgName;
+
     /**
      * 赛事名称
      */

+ 15 - 0
ruoyi-modules/ruoyi-game-event/src/main/java/org/dromara/system/mapper/GameRankGroupMapper.java

@@ -0,0 +1,15 @@
+package org.dromara.system.mapper;
+
+import org.dromara.system.domain.GameRankGroup;
+import org.dromara.system.domain.vo.GameRankGroupVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 排名分组Mapper接口
+ *
+ * @author zlt
+ * @date 2025-09-19
+ */
+public interface GameRankGroupMapper extends BaseMapperPlus<GameRankGroup, GameRankGroupVo> {
+
+}

+ 10 - 0
ruoyi-modules/ruoyi-game-event/src/main/java/org/dromara/system/mapper/GameTeamMapper.java

@@ -5,6 +5,8 @@ import org.dromara.system.domain.GameTeam;
 import org.dromara.system.domain.vo.GameTeamVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 
+import java.util.List;
+
 /**
  * 参赛队伍Mapper接口
  *
@@ -20,4 +22,12 @@ public interface GameTeamMapper extends BaseMapperPlus<GameTeam, GameTeamVo> {
         LIMIT 1
         """)
     GameTeam selectMaxNumber(Long eventId);
+
+    /**
+     * 批量更新rgId
+     * @param rgId
+     * @param teamIds
+     * @return
+     */
+    boolean batchUpdateRg(Long rgId, List<Long> teamIds);
 }

+ 69 - 0
ruoyi-modules/ruoyi-game-event/src/main/java/org/dromara/system/service/IGameRankGroupService.java

@@ -0,0 +1,69 @@
+package org.dromara.system.service;
+
+import org.dromara.system.domain.vo.GameRankGroupVo;
+import org.dromara.system.domain.bo.GameRankGroupBo;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 排名分组Service接口
+ *
+ * @author zlt
+ * @date 2025-09-19
+ */
+public interface IGameRankGroupService {
+
+    /**
+     * 查询排名分组
+     *
+     * @param rgId 主键
+     * @return 排名分组
+     */
+    GameRankGroupVo queryById(Long rgId);
+
+    /**
+     * 分页查询排名分组列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 排名分组分页列表
+     */
+    TableDataInfo<GameRankGroupVo> queryPageList(GameRankGroupBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的排名分组列表
+     *
+     * @param bo 查询条件
+     * @return 排名分组列表
+     */
+    List<GameRankGroupVo> queryList(GameRankGroupBo bo);
+
+    /**
+     * 新增排名分组
+     *
+     * @param bo 排名分组
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(GameRankGroupBo bo);
+
+    /**
+     * 修改排名分组
+     *
+     * @param bo 排名分组
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(GameRankGroupBo bo);
+
+    /**
+     * 校验并批量删除排名分组信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

+ 8 - 0
ruoyi-modules/ruoyi-game-event/src/main/java/org/dromara/system/service/IGameTeamService.java

@@ -127,4 +127,12 @@ public interface IGameTeamService {
     GameTeam queryByName(String teamName, Long eventId);
 
     GameTeam queryMaxNumber(Long eventId);
+
+    /**
+     * 移动分组
+     * @param teamIds 队伍ID列表
+     * @param rgId 目标排名分组ID
+     * @return 结果
+     */
+    Boolean moveGroup(List<Long> teamIds, Long rgId);
 }

+ 145 - 0
ruoyi-modules/ruoyi-game-event/src/main/java/org/dromara/system/service/impl/GameRankGroupServiceImpl.java

@@ -0,0 +1,145 @@
+package org.dromara.system.service.impl;
+
+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.dromara.common.redis.utils.RedisUtils;
+import org.dromara.system.domain.constant.GameEventConstant;
+import org.springframework.stereotype.Service;
+import org.dromara.system.domain.bo.GameRankGroupBo;
+import org.dromara.system.domain.vo.GameRankGroupVo;
+import org.dromara.system.domain.GameRankGroup;
+import org.dromara.system.mapper.GameRankGroupMapper;
+import org.dromara.system.service.IGameRankGroupService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+import java.util.stream.Collectors;
+
+/**
+ * 排名分组Service业务层处理
+ *
+ * @author zlt
+ * @date 2025-09-19
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class GameRankGroupServiceImpl implements IGameRankGroupService {
+
+    private final GameRankGroupMapper baseMapper;
+
+    /**
+     * 查询排名分组
+     *
+     * @param rgId 主键
+     * @return 排名分组
+     */
+    @Override
+    public GameRankGroupVo queryById(Long rgId){
+        return baseMapper.selectVoById(rgId);
+    }
+
+    /**
+     * 分页查询排名分组列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 排名分组分页列表
+     */
+    @Override
+    public TableDataInfo<GameRankGroupVo> queryPageList(GameRankGroupBo bo, PageQuery pageQuery) {
+        if (bo.getEventId() == null) {
+            Object cacheObject = RedisUtils.getCacheObject(GameEventConstant.DEFAULT_EVENT_ID);
+            if (cacheObject instanceof Integer) {
+                bo.setEventId(((Integer) cacheObject).longValue());  // 显式转换为 Long 类型
+            } else if (cacheObject instanceof Long) {
+                bo.setEventId((Long) cacheObject);
+            }
+        }
+        LambdaQueryWrapper<GameRankGroup> lqw = buildQueryWrapper(bo);
+        Page<GameRankGroupVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的排名分组列表
+     *
+     * @param bo 查询条件
+     * @return 排名分组列表
+     */
+    @Override
+    public List<GameRankGroupVo> queryList(GameRankGroupBo bo) {
+        LambdaQueryWrapper<GameRankGroup> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<GameRankGroup> buildQueryWrapper(GameRankGroupBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<GameRankGroup> lqw = Wrappers.lambdaQuery();
+        lqw.orderByAsc(GameRankGroup::getRgId);
+        lqw.eq(bo.getEventId() != null, GameRankGroup::getEventId, bo.getEventId());
+        lqw.like(StringUtils.isNotBlank(bo.getRgName()), GameRankGroup::getRgName, bo.getRgName());
+        lqw.eq(StringUtils.isNotBlank(bo.getStatus()), GameRankGroup::getStatus, bo.getStatus());
+        return lqw;
+    }
+
+    /**
+     * 新增排名分组
+     *
+     * @param bo 排名分组
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(GameRankGroupBo bo) {
+        GameRankGroup add = MapstructUtils.convert(bo, GameRankGroup.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setRgId(add.getRgId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改排名分组
+     *
+     * @param bo 排名分组
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(GameRankGroupBo bo) {
+        GameRankGroup update = MapstructUtils.convert(bo, GameRankGroup.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(GameRankGroup entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除排名分组信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+}

+ 27 - 0
ruoyi-modules/ruoyi-game-event/src/main/java/org/dromara/system/service/impl/GameTeamServiceImpl.java

@@ -1,8 +1,10 @@
 package org.dromara.system.service.impl;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -17,12 +19,15 @@ import org.dromara.common.redis.utils.RedisUtils;
 import org.dromara.system.domain.GameAthlete;
 import org.dromara.system.domain.GameEvent;
 import org.dromara.system.domain.GameTeam;
+import org.dromara.system.domain.bo.GameRankGroupBo;
 import org.dromara.system.domain.bo.GameTeamBo;
 import org.dromara.system.domain.constant.GameEventConstant;
+import org.dromara.system.domain.vo.GameRankGroupVo;
 import org.dromara.system.domain.vo.GameTeamVo;
 import org.dromara.system.mapper.GameAthleteMapper;
 import org.dromara.system.mapper.GameEventMapper;
 import org.dromara.system.mapper.GameTeamMapper;
+import org.dromara.system.service.IGameRankGroupService;
 import org.dromara.system.service.IGameTeamService;
 import org.springframework.stereotype.Service;
 
@@ -46,6 +51,8 @@ public class GameTeamServiceImpl implements IGameTeamService {
 
     private final GameEventMapper gameEventMapper;
 
+    private final IGameRankGroupService gameRankGroupService;
+
     /**
      * 查询参赛队伍
      *
@@ -431,4 +438,24 @@ public class GameTeamServiceImpl implements IGameTeamService {
     public GameTeam queryMaxNumber(Long eventId) {
         return baseMapper.selectMaxNumber(eventId);
     }
+
+    @Override
+    public Boolean moveGroup(List<Long> teamIds, Long rgId) {
+        if (CollUtil.isEmpty(teamIds) || rgId == null) {
+            return false;
+        }
+
+        // 验证排名分组是否存在
+        GameRankGroupVo rankGroup = gameRankGroupService.queryById(rgId);
+        if (rankGroup == null) {
+            throw new ServiceException("排名分组不存在");
+        }
+
+        // 批量更新队伍的排名分组
+//        LambdaUpdateWrapper<GameTeam> updateWrapper = new LambdaUpdateWrapper<>();
+//        updateWrapper.in(GameTeam::getTeamId, teamIds)
+//            .set(GameTeam::getRgId, rgId);
+
+        return baseMapper.batchUpdateRg(rgId, teamIds);
+    }
 }

+ 8 - 0
ruoyi-modules/ruoyi-game-event/src/main/resources/mapper/system/GameTeamMapper.xml

@@ -4,4 +4,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.dromara.system.mapper.GameTeamMapper">
 
+    <update id="batchUpdateRg" >
+        update game_team set rg_id = #{rgId}
+        where team_id in
+        <foreach item="item" collection="teamIds" separator="," open="(" close=")">
+            #{item}
+        </foreach>
+        AND del_flag = '0'
+    </update>
 </mapper>