Merge branch 'refs/heads/dev' into dev_zlt

# Conflicts:
#	ruoyi-modules/ruoyi-game-event/src/main/java/org/dromara/system/controller/GameEventController.java
#	ruoyi-modules/ruoyi-game-event/src/main/java/org/dromara/system/service/IGameEventService.java
#	ruoyi-modules/ruoyi-game-event/src/main/java/org/dromara/system/service/impl/GameEventServiceImpl.java

ruoyi-admin/src/main/resources/application-dev.yml

@@ -98,11 +98,11 @@ spring:
 spring.data:
   redis:
     # 地址
-    host: localhost
+    host: 192.168.1.146
     # 端口，默认为6379
     port: 6379
     # 数据库索引
-    database: 0
+    database: 1
     # redis 密码必须配置
 #    password: ruoyi123
     # 连接超时时间

ruoyi-modules/ruoyi-game-event/src/main/java/org/dromara/system/controller/ArticleController.java

@@ -23,7 +23,7 @@ import org.dromara.system.service.IArticleService;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 
 /**
- * 文章(可用于活动预热)
+ * 文章
  *
  * @author Lion Li
  * @date 2025-08-08
@@ -37,7 +37,7 @@ public class ArticleController extends BaseController {
     private final IArticleService articleService;
 
     /**
-     * 查询文章(可用于活动预热)列表
+     * 查询文章列表
      */
     @SaCheckPermission("system:article:list")
     @GetMapping("/list")
@@ -46,18 +46,18 @@ public class ArticleController extends BaseController {
     }
 
     /**
-     * 导出文章(可用于活动预热)列表
+     * 导出文章列表
      */
     @SaCheckPermission("system:article:export")
-    @Log(title = "文章(可用于活动预热)", businessType = BusinessType.EXPORT)
+    @Log(title = "文章", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(ArticleBo bo, HttpServletResponse response) {
         List<ArticleVo> list = articleService.queryList(bo);
-        ExcelUtil.exportExcel(list, "文章(可用于活动预热)", ArticleVo.class, response);
+        ExcelUtil.exportExcel(list, "文章", ArticleVo.class, response);
     }
 
     /**
-     * 获取文章(可用于活动预热)详细信息
+     * 获取文章详细信息
      *
      * @param id 主键
      */
@@ -69,10 +69,10 @@ public class ArticleController extends BaseController {
     }
 
     /**
-     * 新增文章(可用于活动预热)
+     * 新增文章
      */
     @SaCheckPermission("system:article:add")
-    @Log(title = "文章(可用于活动预热)", businessType = BusinessType.INSERT)
+    @Log(title = "文章", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
     public R<Void> add(@Validated(AddGroup.class) @RequestBody ArticleBo bo) {
@@ -80,10 +80,10 @@ public class ArticleController extends BaseController {
     }
 
     /**
-     * 修改文章(可用于活动预热)
+     * 修改文章
      */
     @SaCheckPermission("system:article:edit")
-    @Log(title = "文章(可用于活动预热)", businessType = BusinessType.UPDATE)
+    @Log(title = "文章", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
     public R<Void> edit(@Validated(EditGroup.class) @RequestBody ArticleBo bo) {
@@ -91,15 +91,25 @@ public class ArticleController extends BaseController {
     }
 
     /**
-     * 删除文章(可用于活动预热)
+     * 删除文章
      *
      * @param ids 主键串
      */
     @SaCheckPermission("system:article:remove")
-    @Log(title = "文章(可用于活动预热)", businessType = BusinessType.DELETE)
+    @Log(title = "文章", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
                           @PathVariable Long[] ids) {
         return toAjax(articleService.deleteWithValidByIds(List.of(ids), true));
     }
+
+
+    /**
+     * 查询文章数量
+     * @return
+     */
+    @GetMapping("/count")
+    public R<Long> count() {
+        return R.ok(articleService.countArticle());
+    }
 }

ruoyi-modules/ruoyi-game-event/src/main/java/org/dromara/system/controller/GameEventController.java

@@ -130,4 +130,15 @@ public class GameEventController extends BaseController {
     public R<Void> changeEventDefault(@RequestBody GameEventBo bo) {
         return toAjax(gameEventService.updateEventDefault(bo));
     }
+
+    /**
+     * 查询赛事数量
+     *
+     * @param type 0:所有 1:未开始 2:进行中 3:已结束
+     * @return
+     */
+    @GetMapping("/count/{type}")
+    public R<Long> count(@PathVariable Long type) {
+        return R.ok(gameEventService.countGameEvent(type));
+    }
 }

ruoyi-modules/ruoyi-game-event/src/main/java/org/dromara/system/controller/GameEventProjectController.java

@@ -102,4 +102,14 @@ public class GameEventProjectController extends BaseController {
                           @PathVariable Long[] projectIds) {
         return toAjax(gameEventProjectService.deleteWithValidByIds(List.of(projectIds), true));
     }
+
+
+    /**
+     * 查询赛事项目数量
+     * @return
+     */
+    @GetMapping("/count")
+    public R<Long> count() {
+        return R.ok(gameEventProjectService.countEventProject());
+    }
 }

ruoyi-modules/ruoyi-game-event/src/main/java/org/dromara/system/controller/GameRefereeController.java

@@ -102,4 +102,15 @@ public class GameRefereeController extends BaseController {
                           @PathVariable Long[] refereeIds) {
         return toAjax(gameRefereeService.deleteWithValidByIds(List.of(refereeIds), true));
     }
+
+
+    /**
+     * 查询裁判数量
+     * @return
+     */
+    @GetMapping("/count")
+    public R<Long> count() {
+        return R.ok(gameRefereeService.countReferee());
+    }
+
 }

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

@@ -1,11 +1,17 @@
 package org.dromara.system.controller;
 
+import java.io.IOException;
+import java.util.ArrayList;
 import java.util.List;
 
 import lombok.RequiredArgsConstructor;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.constraints.*;
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.excel.core.ExcelResult;
+import org.dromara.system.domain.GameTeam;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.validation.annotation.Validated;
 import org.dromara.common.idempotent.annotation.RepeatSubmit;
@@ -21,6 +27,7 @@ import org.dromara.system.domain.vo.GameTeamVo;
 import org.dromara.system.domain.bo.GameTeamBo;
 import org.dromara.system.service.IGameTeamService;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.springframework.web.multipart.MultipartFile;
 
 /**
  * 参赛队伍
@@ -28,6 +35,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
  * @author zlt
  * @date 2025-07-30
  */
+@Slf4j
 @Validated
 @RequiredArgsConstructor
 @RestController
@@ -45,6 +53,33 @@ public class GameTeamController extends BaseController {
         return gameTeamService.queryPageList(bo, pageQuery);
     }
 
+    /**
+     * 导入参赛队伍列表
+     */
+    @SaCheckPermission("system:gameTeam:import")
+    @Log(title = "参赛队伍", businessType = BusinessType.IMPORT)
+    @PostMapping("/import")
+    public R<Void> importExcel(@RequestPart("file") MultipartFile file) {
+        ExcelResult<GameTeamVo> excelResult = null;
+        try {
+            excelResult = ExcelUtil.importExcel(file.getInputStream(), GameTeamVo.class, true);
+            List<GameTeam> list = MapstructUtils.convert(excelResult.getList(), GameTeam.class);
+            log.info("转换后的列表:", list);
+            gameTeamService.saveBatch(list);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return R.ok(excelResult.getAnalysis());
+    }
+
+    /**
+     * 获取导入模板
+     */
+    @PostMapping("/importTemplate")
+    public void importTemplate(HttpServletResponse response) {
+        ExcelUtil.exportExcel(new ArrayList<>(), "参数队伍数据", GameTeamVo.class, response);
+    }
+
     /**
      * 导出参赛队伍列表
      */
@@ -64,7 +99,7 @@ public class GameTeamController extends BaseController {
     @SaCheckPermission("system:gameTeam:query")
     @GetMapping("/{teamId}")
     public R<GameTeamVo> getInfo(@NotNull(message = "主键不能为空")
-                                     @PathVariable Long teamId) {
+                                 @PathVariable Long teamId) {
         return R.ok(gameTeamService.queryById(teamId));
     }
 
@@ -102,4 +137,14 @@ public class GameTeamController extends BaseController {
                           @PathVariable Long[] teamIds) {
         return toAjax(gameTeamService.deleteWithValidByIds(List.of(teamIds), true));
     }
+
+
+    /**
+     * 查询参赛队伍数量
+     * @return
+     */
+    @GetMapping("/count")
+    public R<Long> count() {
+        return R.ok(gameTeamService.countTeam());
+    }
 }

ruoyi-modules/ruoyi-game-event/src/main/java/org/dromara/system/domain/bo/GameEventProjectBo.java

@@ -9,7 +9,9 @@ import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import jakarta.validation.constraints.*;
+
 import java.util.Date;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 
 /**
@@ -31,9 +33,14 @@ public class GameEventProjectBo extends BaseEntity {
     /**
      * 赛事ID
      */
-    @NotNull(message = "赛事ID不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotNull(message = "赛事ID不能为空", groups = {AddGroup.class, EditGroup.class})
     private Long eventId;
 
+    /**
+     * 赛事名称
+     */
+    private String eventName;
+
     /**
      * 项目名称
      */
@@ -61,7 +68,7 @@ public class GameEventProjectBo extends BaseEntity {
     /**
      * 比赛场地
      */
-    @NotBlank(message = "比赛场地不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotBlank(message = "比赛场地不能为空", groups = {AddGroup.class, EditGroup.class})
     private String location;
 
     /**

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

@@ -22,19 +22,24 @@ public class GameTeamBo extends BaseEntity {
     /**
      * 主键
      */
-    @NotNull(message = "主键不能为空", groups = { EditGroup.class })
+    @NotNull(message = "主键不能为空", groups = {EditGroup.class})
     private Long teamId;
 
     /**
      * 赛事ID
      */
-    @NotNull(message = "赛事ID不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotNull(message = "赛事ID不能为空", groups = {AddGroup.class, EditGroup.class})
     private Long eventId;
 
+    /**
+     * 赛事名称
+     */
+    private String eventName;
+
     /**
      * 队伍名称
      */
-    @NotBlank(message = "队伍名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotBlank(message = "队伍名称不能为空", groups = {AddGroup.class, EditGroup.class})
     private String teamName;
 
     /**

ruoyi-modules/ruoyi-game-event/src/main/java/org/dromara/system/domain/vo/GameEventProjectVo.java

@@ -39,6 +39,12 @@ public class GameEventProjectVo implements Serializable {
     @ExcelProperty(value = "赛事ID")
     private Long eventId;
 
+    /**
+     * 赛事ID
+     */
+    @ExcelProperty(value = "赛事名称")
+    private String eventName;
+
     /**
      * 项目名称
      */

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

@@ -28,7 +28,7 @@ public class GameTeamVo implements Serializable {
     @Serial
     private static final long serialVersionUID = 1L;
 
-//    @ExcelProperty(value = "主键")
+   @ExcelProperty(value = "主键")
     private Long teamId;
 
     /**
@@ -37,6 +37,12 @@ public class GameTeamVo implements Serializable {
     @ExcelProperty(value = "赛事ID")
     private Long eventId;
 
+    /**
+     * 赛事ID
+     */
+    @ExcelProperty(value = "赛事名称")
+    private String eventName;
+
     /**
      * 队伍名称
      */

ruoyi-modules/ruoyi-game-event/src/main/java/org/dromara/system/service/IArticleService.java

@@ -65,4 +65,10 @@ public interface IArticleService {
      * @return 是否删除成功
      */
     Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    /**
+     * 查询文章数量
+     * @return
+     */
+    Long countArticle();
 }

ruoyi-modules/ruoyi-game-event/src/main/java/org/dromara/system/service/IGameEventProjectService.java

@@ -67,4 +67,6 @@ public interface IGameEventProjectService {
     Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
 
     List<GameEventProjectVo> listProjectsByEventIdAndProjectIndex(Long eventId, String[] projectIds);
+
+    Long countEventProject();
 }

ruoyi-modules/ruoyi-game-event/src/main/java/org/dromara/system/service/IGameEventService.java

@@ -94,4 +94,10 @@ public interface IGameEventService {
      * @return 更新记录数
      */
     int updateEventDefault(GameEventBo bo);
+
+    /**
+     * 统计赛事个数
+     * @return
+     */
+    Long countGameEvent(Long type);
 }

ruoyi-modules/ruoyi-game-event/src/main/java/org/dromara/system/service/IGameRefereeService.java

@@ -65,4 +65,10 @@ public interface IGameRefereeService {
      * @return 是否删除成功
      */
     Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    /**
+     * 获取裁判数量
+     * @return
+     */
+    Long countReferee();
 }

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

@@ -1,5 +1,6 @@
 package org.dromara.system.service;
 
+import org.dromara.system.domain.GameTeam;
 import org.dromara.system.domain.vo.GameTeamVo;
 import org.dromara.system.domain.bo.GameTeamBo;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
@@ -65,4 +66,18 @@ public interface IGameTeamService {
      * @return 是否删除成功
      */
     Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    /**
+     * 批量保存参赛队伍信息
+     *
+     * @param list 参赛队伍信息
+     */
+
+    Boolean saveBatch(List<GameTeam> list);
+
+    /**
+     * 获取参赛队伍数量
+     * @return
+     */
+    Long countTeam();
 }

ruoyi-modules/ruoyi-game-event/src/main/java/org/dromara/system/service/impl/ArticleServiceImpl.java

@@ -171,4 +171,15 @@ public class ArticleServiceImpl implements IArticleService {
         return baseMapper.deleteByIds(ids) > 0;
     }
 
+    /**
+     * 查询文章数量
+     *
+     * @return
+     */
+    @Override
+    public Long countArticle() {
+        return this.baseMapper.selectCount(
+            Wrappers.lambdaQuery(Article.class)
+        );
+    }
 }

ruoyi-modules/ruoyi-game-event/src/main/java/org/dromara/system/service/impl/GameAthleteServiceImpl.java

@@ -153,22 +153,25 @@ public class GameAthleteServiceImpl implements IGameAthleteService {
         Page<GameAthleteVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
         result.getRecords().stream()
             .map(vo -> {
-                if(StringUtils.isNotBlank(vo.getProjectValue())) {
-                    String[] projectIds = vo.getProjectValue().split(",");
-                    List<GameEventProjectVo> projects =
-                        gameEventProjectService.listProjectsByEventIdAndProjectIndex(
-                            vo.getEventId(),
-                            projectIds);
-                    String projectNames = projects.stream()
-                        .map(GameEventProjectVo::getProjectName)
-                        .filter(StringUtils::isNotBlank)  // 过滤项目名为空的情况
-                        .collect(Collectors.joining(","));
-                    vo.setProjectValue(projectNames);
-                }
-                if(ObjectUtil.isNotEmpty(vo.getEventId())){
-                    GameEventVo gameEventVo = gameEventService.queryById(vo.getEventId());
-                    vo.setEventName(gameEventVo.getEventName());
-                }
+                Optional.ofNullable(vo.getProjectValue())
+                    .filter(StringUtils::isNotBlank)
+                    .ifPresent(projectValue -> {
+                        String[] projectIds = projectValue.split(",");
+                        List<GameEventProjectVo> projects =
+                            gameEventProjectService.listProjectsByEventIdAndProjectIndex(
+                                vo.getEventId(),
+                                projectIds);
+                        vo.setProjectValue(projects.stream()
+                            .map(GameEventProjectVo::getProjectName)
+                            .filter(StringUtils::isNotBlank)  // 过滤项目名为空的情况
+                            .collect(Collectors.joining(",")));
+                    });
+                Optional.ofNullable(vo.getEventId())
+                    .filter(ObjectUtil::isNotEmpty)
+                    .ifPresent(projectValue -> {
+                        GameEventVo gameEventVo = gameEventService.queryById(vo.getEventId());
+                        vo.setEventName(gameEventVo.getEventName());
+                    });
                 return vo;
             })
             .collect(Collectors.toList());  // 收集结果

ruoyi-modules/ruoyi-game-event/src/main/java/org/dromara/system/service/impl/GameEventGroupServiceImpl.java

@@ -21,6 +21,7 @@ import org.dromara.system.service.IGameEventGroupService;
 import java.util.List;
 import java.util.Map;
 import java.util.Collection;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 /**
@@ -61,18 +62,20 @@ public class GameEventGroupServiceImpl implements IGameEventGroupService {
         LambdaQueryWrapper<GameEventGroup> lqw = buildQueryWrapper(bo);
         Page<GameEventGroupVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
         result.getRecords().stream()
-            .filter(vo -> StringUtils.isNotBlank(vo.getProjectList()))  // 过滤null和空字符串
             .map(vo -> {
-                String[] projectIds = vo.getProjectList().split(",");
-                List<GameEventProjectVo> projects =
-                    gameEventProjectService.listProjectsByEventIdAndProjectIndex(
-                        vo.getEventId(),
-                        projectIds);
-                String projectNames = projects.stream()
-                    .map(GameEventProjectVo::getProjectName)
-                    .filter(StringUtils::isNotBlank)  // 过滤项目名为空的情况
-                    .collect(Collectors.joining(","));
-                vo.setProjectList(projectNames);
+                Optional.ofNullable(vo.getProjectList())
+                    .filter(StringUtils::isNotBlank)
+                    .ifPresent(projectValue -> {
+                        String[] projectIds = projectValue.split(",");
+                        List<GameEventProjectVo> projects =
+                            gameEventProjectService.listProjectsByEventIdAndProjectIndex(
+                                vo.getEventId(),
+                                projectIds);
+                        vo.setProjectList(projects.stream()
+                            .map(GameEventProjectVo::getProjectName)
+                            .filter(StringUtils::isNotBlank)
+                            .collect(Collectors.joining(",")));
+                    });
                 return vo;
             })
             .collect(Collectors.toList());  // 收集结果

ruoyi-modules/ruoyi-game-event/src/main/java/org/dromara/system/service/impl/GameEventProjectServiceImpl.java

@@ -1,5 +1,7 @@
 package org.dromara.system.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
@@ -9,6 +11,12 @@ 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.system.domain.GameAthlete;
+import org.dromara.system.domain.GameEvent;
+import org.dromara.system.domain.bo.GameEventBo;
+import org.dromara.system.domain.vo.GameEventVo;
+import org.dromara.system.mapper.GameEventMapper;
+import org.dromara.system.service.IGameEventService;
 import org.springframework.stereotype.Service;
 import org.dromara.system.domain.bo.GameEventProjectBo;
 import org.dromara.system.domain.vo.GameEventProjectVo;
@@ -19,6 +27,8 @@ import org.dromara.system.service.IGameEventProjectService;
 import java.util.List;
 import java.util.Map;
 import java.util.Collection;
+import java.util.Optional;
+import java.util.stream.Collectors;
 
 /**
  * 赛事项目Service业务层处理
@@ -32,6 +42,7 @@ import java.util.Collection;
 public class GameEventProjectServiceImpl implements IGameEventProjectService {
 
     private final GameEventProjectMapper baseMapper;
+    private final GameEventMapper gameEventMapper;
 
     /**
      * 查询赛事项目
@@ -55,6 +66,17 @@ public class GameEventProjectServiceImpl implements IGameEventProjectService {
     public TableDataInfo<GameEventProjectVo> queryPageList(GameEventProjectBo bo, PageQuery pageQuery) {
         LambdaQueryWrapper<GameEventProject> lqw = buildQueryWrapper(bo);
         Page<GameEventProjectVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        result.getRecords().stream()
+            .map(vo -> {
+                Optional.ofNullable(vo.getEventId())
+                    .filter(ObjectUtil::isNotEmpty)
+                    .ifPresent(projectValue -> {
+                        GameEvent gameEvent = gameEventMapper.selectById(vo.getEventId());
+                        vo.setEventName(gameEvent.getEventName());
+                    });
+                return vo;
+            })
+            .collect(Collectors.toList());  // 收集结果
         return TableDataInfo.build(result);
     }
 
@@ -75,6 +97,23 @@ public class GameEventProjectServiceImpl implements IGameEventProjectService {
         LambdaQueryWrapper<GameEventProject> lqw = Wrappers.lambdaQuery();
         lqw.orderByAsc(GameEventProject::getProjectId);
         lqw.eq(bo.getEventId() != null, GameEventProject::getEventId, bo.getEventId());
+        // 通过名称模糊查询
+        Optional.ofNullable(bo.getEventName())
+            .ifPresent(eventName->{
+                List<GameEvent> gameEvents = gameEventMapper.selectList(
+                    Wrappers.lambdaQuery(GameEvent.class)
+                        .like(GameEvent::getEventName, bo.getEventName())
+                        .select(GameEvent::getEventId)
+                );
+                if(CollectionUtils.isNotEmpty(gameEvents)){
+                    List<Long> ids = gameEvents.stream()
+                        .map(GameEvent::getEventId)
+                        .collect(Collectors.toList());
+                    lqw.in(GameEventProject::getEventId, ids);
+                }else{
+                    lqw.apply("1=0");
+                }
+            });
         lqw.like(StringUtils.isNotBlank(bo.getProjectName()), GameEventProject::getProjectName, bo.getProjectName());
         lqw.eq(StringUtils.isNotBlank(bo.getProjectType()), GameEventProject::getProjectType, bo.getProjectType());
         lqw.eq(StringUtils.isNotBlank(bo.getGroupType()), GameEventProject::getGroupType, bo.getGroupType());
@@ -144,4 +183,11 @@ public class GameEventProjectServiceImpl implements IGameEventProjectService {
                 .in(GameEventProject::getProjectId, projectIds)
         );
     }
+
+    @Override
+    public Long countEventProject() {
+        return this.baseMapper.selectCount(
+            Wrappers.lambdaQuery(GameEventProject.class)
+        );
+    }
 }

ruoyi-modules/ruoyi-game-event/src/main/java/org/dromara/system/service/impl/GameEventServiceImpl.java

@@ -243,4 +243,21 @@ public class GameEventServiceImpl implements IGameEventService {
         }
         return row;
     }
+
+    /**
+     * 统计赛事个数
+     * 0:所有 1:未开始 2:进行中 3:已结束
+     *
+     * @return
+     */
+    @Override
+    public Long countGameEvent(Long type) {
+        return this.baseMapper.selectCount(
+            Wrappers.lambdaQuery(GameEvent.class)
+                .apply(type == 0, "1=1")
+                .apply(type == 1, "start_time > now()")
+                .apply(type == 2, "start_time <= now() and end_time >= now()")
+                .apply(type == 3, "end_time < now()")
+        );
+    }
 }

ruoyi-modules/ruoyi-game-event/src/main/java/org/dromara/system/service/impl/GameRefereeServiceImpl.java

@@ -131,4 +131,16 @@ public class GameRefereeServiceImpl implements IGameRefereeService {
         }
         return baseMapper.deleteByIds(ids) > 0;
     }
+
+    /**
+     * 获取裁判数量
+     *
+     * @return
+     */
+    @Override
+    public Long countReferee() {
+        return this.baseMapper.selectCount(
+            Wrappers.lambdaQuery(GameReferee.class)
+        );
+    }
 }

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

@@ -1,5 +1,7 @@
 package org.dromara.system.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
@@ -9,6 +11,11 @@ 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.system.domain.GameAthlete;
+import org.dromara.system.domain.GameEvent;
+import org.dromara.system.domain.vo.GameEventProjectVo;
+import org.dromara.system.mapper.GameAthleteMapper;
+import org.dromara.system.mapper.GameEventMapper;
 import org.springframework.stereotype.Service;
 import org.dromara.system.domain.bo.GameTeamBo;
 import org.dromara.system.domain.vo.GameTeamVo;
@@ -16,9 +23,9 @@ import org.dromara.system.domain.GameTeam;
 import org.dromara.system.mapper.GameTeamMapper;
 import org.dromara.system.service.IGameTeamService;
 
-import java.util.List;
-import java.util.Map;
-import java.util.Collection;
+import javax.swing.text.html.Option;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 参赛队伍Service业务层处理
@@ -33,6 +40,10 @@ public class GameTeamServiceImpl implements IGameTeamService {
 
     private final GameTeamMapper baseMapper;
 
+    private final GameAthleteMapper gameAthleteMapper;
+
+    private final GameEventMapper gameEventMapper;
+
     /**
      * 查询参赛队伍
      *
@@ -40,7 +51,7 @@ public class GameTeamServiceImpl implements IGameTeamService {
      * @return 参赛队伍
      */
     @Override
-    public GameTeamVo queryById(Long teamId){
+    public GameTeamVo queryById(Long teamId) {
         return baseMapper.selectVoById(teamId);
     }
 
@@ -55,6 +66,51 @@ public class GameTeamServiceImpl implements IGameTeamService {
     public TableDataInfo<GameTeamVo> queryPageList(GameTeamBo bo, PageQuery pageQuery) {
         LambdaQueryWrapper<GameTeam> lqw = buildQueryWrapper(bo);
         Page<GameTeamVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        // 查询领队和队员列表
+        result.getRecords().stream()
+            .map(vo -> {
+                // 处理运动员列表
+                Optional.ofNullable(vo.getAthleteValue())
+                    .filter(StringUtils::isNotBlank)
+                    .ifPresent(athleteValue -> {
+                        String[] projectIds = athleteValue.split(",");
+                        List<GameAthlete> athletes = gameAthleteMapper.selectList(
+                            Wrappers.<GameAthlete>lambdaQuery()
+                                .in(GameAthlete::getAthleteId, projectIds)
+                                .select(GameAthlete::getName));
+
+                        vo.setAthleteValue(athletes.stream()
+                            .map(GameAthlete::getName)
+                            .filter(StringUtils::isNotBlank)
+                            .collect(Collectors.joining(",")));
+                    });
+                // 处理领队
+                Optional.ofNullable(vo.getLeader())
+                    .filter(StringUtils::isNotBlank)
+                    .ifPresent(leaderId -> {
+                        GameAthlete athlete = gameAthleteMapper.selectOne(
+                            Wrappers.<GameAthlete>lambdaQuery()
+                                .eq(GameAthlete::getAthleteId, leaderId)
+                                .select(GameAthlete::getName));
+                        Optional.ofNullable(athlete)
+                            .map(GameAthlete::getName)
+                            .ifPresent(vo::setLeader);
+                    });
+                //处理赛事名称
+                Optional.ofNullable(vo.getEventId())
+                    .filter(ObjectUtil::isNotEmpty)
+                    .ifPresent(eventId -> {
+                        GameEvent gameEvent = gameEventMapper.selectOne(
+                            Wrappers.<GameEvent>lambdaQuery()
+                                .eq(GameEvent::getEventId, eventId)
+                                .select(GameEvent::getEventName));
+                        Optional.ofNullable(gameEvent)
+                            .map(GameEvent::getEventName)
+                            .ifPresent(vo::setEventName);
+                    });
+                return vo;
+            })
+            .collect(Collectors.toList());  // 收集结果
         return TableDataInfo.build(result);
     }
 
@@ -75,6 +131,25 @@ public class GameTeamServiceImpl implements IGameTeamService {
         LambdaQueryWrapper<GameTeam> lqw = Wrappers.lambdaQuery();
         lqw.orderByAsc(GameTeam::getTeamId);
         lqw.eq(bo.getEventId() != null, GameTeam::getEventId, bo.getEventId());
+
+        Optional.ofNullable(bo.getEventName())
+            .filter(StringUtils::isNotBlank)
+            .ifPresent(eventName -> {
+                List<GameEvent> gameEvents = gameEventMapper.selectList(
+                    Wrappers.<GameEvent>lambdaQuery()
+                        .like(GameEvent::getEventName, eventName)
+                        .select(GameEvent::getEventId)
+                );
+                if (CollectionUtils.isNotEmpty(gameEvents)) {
+                    Set<Long> set = gameEvents.stream()
+                        .map(GameEvent::getEventId)
+                        .collect(Collectors.toSet());
+                    lqw.in(GameTeam::getEventId, set);
+                } else {
+                    lqw.apply("1=0");
+                }
+            });
+
         lqw.like(StringUtils.isNotBlank(bo.getTeamName()), GameTeam::getTeamName, bo.getTeamName());
         lqw.eq(StringUtils.isNotBlank(bo.getTeamCode()), GameTeam::getTeamCode, bo.getTeamCode());
         lqw.eq(StringUtils.isNotBlank(bo.getLeader()), GameTeam::getLeader, bo.getLeader());
@@ -120,7 +195,7 @@ public class GameTeamServiceImpl implements IGameTeamService {
     /**
      * 保存前的数据校验
      */
-    private void validEntityBeforeSave(GameTeam entity){
+    private void validEntityBeforeSave(GameTeam entity) {
         //TODO 做一些数据校验,如唯一约束
     }
 
@@ -133,9 +208,29 @@ public class GameTeamServiceImpl implements IGameTeamService {
      */
     @Override
     public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
-        if(isValid){
+        if (isValid) {
             //TODO 做一些业务上的校验,判断是否需要校验
         }
         return baseMapper.deleteByIds(ids) > 0;
     }
+
+    /**
+     * 批量保存参赛队伍信息
+     *
+     * @param list 参赛队伍信息
+     */
+    @Override
+    public Boolean saveBatch(List<GameTeam> list) {
+        return baseMapper.insertBatch(list);
+    }
+
+    /**
+     * 获取参赛队伍数量
+     *
+     * @return
+     */
+    @Override
+    public Long countTeam() {
+        return this.baseMapper.selectCount(Wrappers.lambdaQuery(GameTeam.class));
+    }
 }

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysUserOnlineController.java

@@ -22,6 +22,7 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
+import java.util.concurrent.atomic.AtomicLong;
 import java.util.stream.Collectors;
 
 /**
@@ -128,4 +129,30 @@ public class SysUserOnlineController extends BaseController {
         return R.ok();
     }
 
+    /**
+     * 获取在线用户数量
+     *
+     * @return 在线用户数量
+     */
+    @GetMapping("/count")
+    public R<Long> getOnlineUserCount() {
+        // 获取所有未过期的 token
+        Collection<String> keys = RedisUtils.keys(CacheConstants.ONLINE_TOKEN_KEY + "*");
+        AtomicLong count = new AtomicLong(0);
+
+        for (String key : keys) {
+            String token = StringUtils.substringAfterLast(key, ":");
+            // 如果已经过期则跳过
+            if (StpUtil.stpLogic.getTokenActiveTimeoutByToken(token) < -1) {
+                continue;
+            }
+            UserOnlineDTO userOnlineDTO = RedisUtils.getCacheObject(CacheConstants.ONLINE_TOKEN_KEY + token);
+            if (userOnlineDTO != null) {
+                count.addAndGet(1);
+            }
+        }
+        // 返回在线用户数量
+        return R.ok(count.getAcquire());
+    }
+
 }