8.12

pom.xml

@@ -415,11 +415,6 @@
                     <compilerArgs>
                         <arg>-parameters</arg>
                     </compilerArgs>
-                    <excludes>
-                        <exclude>ruoyi-game-event/**</exclude>
-                        <exclude>ruoyi-common-tenant/**</exclude>
-                        <exclude>ruoyi-common-mybatis/**</exclude>
-                    </excludes>
                 </configuration>
             </plugin>
             <!-- 单元测试使用 -->

ruoyi-common/ruoyi-common-batch/pom.xml

@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>org.dromara</groupId>
+        <artifactId>ruoyi-common</artifactId>
+        <version>${revision}</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>ruoyi-common-batch</artifactId>
+
+    <description>
+        ruoyi-common-batch 批处理模块
+    </description>
+    <dependencies>
+        <!-- Spring框架基本的核心工具 -->
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context-support</artifactId>
+        </dependency>
+
+        <!-- SpringWeb模块 -->
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-web</artifactId>
+        </dependency>
+
+        <!-- 批处理 -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-batch</artifactId>
+            <version>2.7.18</version>
+        </dependency>
+
+        <!--常用工具类 -->
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+        </dependency>
+
+        <!-- servlet包 -->
+        <dependency>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-core</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-http</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-extra</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
+
+        <!--  自动生成YML配置关联JSON文件  -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-configuration-processor</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-properties-migrator</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.github.linpeilie</groupId>
+            <artifactId>mapstruct-plus-spring-boot-starter</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-game-event</artifactId>
+        </dependency>
+
+    </dependencies>
+
+</project>

ruoyi-common/ruoyi-common-batch/src/main/java/org/dromara/common/batch/config/GameAthleteBatchConfig.java

@@ -0,0 +1,59 @@
+// package org.dromara.common.batch.config;
+//
+// import lombok.RequiredArgsConstructor;
+// import org.dromara.common.batch.processer.GameAthleteProcessor;
+// import org.dromara.common.batch.writer.GameAthleteWriter;
+// import org.dromara.system.domain.GameAthlete;
+// import org.dromara.system.mapper.GameAthleteMapper;
+// import org.springframework.batch.core.Job;
+// import org.springframework.batch.core.Step;
+// import org.springframework.batch.core.configuration.annotation.StepScope;
+// import org.springframework.batch.item.ItemProcessor;
+// import org.springframework.batch.item.ItemWriter;
+// import org.springframework.batch.item.support.ListItemReader;
+// import org.springframework.context.annotation.Bean;
+// import org.springframework.context.annotation.Configuration;
+//
+// import java.util.List;
+//
+// @Configuration
+// @RequiredArgsConstructor
+// public class GameAthleteBatchConfig {
+//
+//     // private final JobBuilderFactory  jobBuilderFactory;
+//     // private final StepBuilderFactory stepBuilderFactory;
+//     private final GameAthleteMapper gameAthleteMapper;
+//
+//     @Bean
+//     public Job gameAthleteUpsertJob() {
+//         return jobBuilderFactory.get("gameAthleteUpsertJob")
+//                 .start(upsertStep())
+//                 .build();
+//     }
+//
+//     @Bean
+//     public Step upsertStep() {
+//         return stepBuilderFactory.get("upsertStep")
+//                 .<GameAthlete, GameAthlete>chunk(20) // 每100条处理一次
+//                 .reader(itemReader(null))
+//                 .processor(itemProcessor())
+//                 .writer(itemWriter())
+//                 .build();
+//     }
+//
+//     @Bean
+//     @StepScope
+//     public ListItemReader<GameAthlete> itemReader(@Value("#{jobParameters['athletes']}") List<GameAthlete> athletes) {
+//         return new ListItemReader<>(athletes);
+//     }
+//
+//     @Bean
+//     public ItemProcessor<GameAthlete, GameAthlete> itemProcessor() {
+//         return new GameAthleteProcessor();
+//     }
+//
+//     @Bean
+//     public ItemWriter<GameAthlete> itemWriter() {
+//         return new GameAthleteWriter(gameAthleteMapper);
+//     }
+// }

ruoyi-common/ruoyi-common-batch/src/main/java/org/dromara/common/batch/processer/GameAthleteProcessor.java

@@ -0,0 +1,28 @@
+package org.dromara.common.batch.processer;
+
+import java.util.Map;
+
+public class GameAthleteProcessor implements ItemProcessor<GameAthlete, GameAthlete> {
+
+    private Map<String, Long> codeToIdMap;
+    private boolean codesLoaded = false;
+
+    @Override
+    public GameAthlete process(GameAthlete item) throws Exception {
+        if (!codesLoaded) {
+            loadExistingCodes(item);
+            codesLoaded = true;
+        }
+
+        if (item.getAthleteCode() != null && codeToIdMap.containsKey(item.getAthleteCode())) {
+            item.setAthleteId(codeToIdMap.get(item.getAthleteCode()));
+        }
+        return item;
+    }
+
+    private void loadExistingCodes(GameAthlete sampleItem) {
+        // 获取所有需要检查的code
+        // 这里需要从上下文中获取完整的列表，可能需要调整设计
+        // 或者改为在writer中处理
+    }
+}

ruoyi-common/ruoyi-common-batch/src/main/java/org/dromara/common/batch/writer/GameAthleteWriter.java

@@ -0,0 +1,48 @@
+package org.dromara.common.batch.writer;
+
+import lombok.RequiredArgsConstructor;
+
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+@RequiredArgsConstructor
+public class GameAthleteWriter implements ItemWriter<GameAthlete> {
+
+    private final GameAthleteMapper gameAthleteMapper;
+
+    @Override
+    public void write(List<? extends GameAthlete> items) throws Exception {
+        // 1. 提取所有非空的athleteCode
+        Set<String> codes = items.stream()
+            .map(GameAthlete::getAthleteCode)
+            .filter(Objects::nonNull)
+            .collect(Collectors.toSet());
+
+        if (!codes.isEmpty()) {
+            // 2. 查询已存在的记录
+            Map<String, Long> codeToIdMap = gameAthleteMapper.selectList(
+                Wrappers.lambdaQuery(GameAthlete.class)
+                    .in(GameAthlete::getAthleteCode, codes)
+                    .select(GameAthlete::getAthleteId, GameAthlete::getAthleteCode)
+            ).stream().collect(Collectors.toMap(
+                GameAthlete::getAthleteCode,
+                GameAthlete::getAthleteId
+            ));
+
+            // 3. 设置已存在记录的ID
+            items.forEach(item -> {
+                if (item.getAthleteCode() != null) {
+                    Long id = codeToIdMap.get(item.getAthleteCode());
+                    if (id != null) {
+                        item.setAthleteId(id);
+                    }
+                }
+            });
+        }
+
+        // 4. 批量保存或更新
+        gameAthleteMapper.insertOrUpdateBatch(items);
+    }
+}

ruoyi-common/ruoyi-common-batch/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -0,0 +1,5 @@
+org.dromara.common.core.config.ApplicationConfig
+org.dromara.common.core.config.AsyncConfig
+org.dromara.common.core.config.ThreadPoolConfig
+org.dromara.common.core.config.ValidatorConfig
+org.dromara.common.core.utils.SpringUtils

ruoyi-common/ruoyi-common-web/pom.xml

@@ -57,6 +57,10 @@
             <groupId>cn.hutool</groupId>
             <artifactId>hutool-crypto</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-core</artifactId>
+        </dependency>
     </dependencies>
 
 </project>

ruoyi-modules/ruoyi-game-event/pom.xml

@@ -99,6 +99,10 @@
             <groupId>org.dromara</groupId>
             <artifactId>ruoyi-common-sse</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-core</artifactId>
+        </dependency>
 
     </dependencies>
 

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

@@ -1,12 +1,26 @@
 package org.dromara.system.controller;
 
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
 
+import cn.hutool.json.JSONUtil;
 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.common.redis.utils.RedisUtils;
+import org.dromara.system.domain.GameAthlete;
+import org.dromara.system.domain.GameTeam;
+import org.dromara.system.domain.constant.GameEventConstant;
 import org.dromara.system.domain.vo.AthleteScoreVo;
+import org.dromara.system.domain.vo.GameTeamVo;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.validation.annotation.Validated;
 import org.dromara.common.idempotent.annotation.RepeatSubmit;
@@ -22,6 +36,7 @@ import org.dromara.system.domain.vo.GameAthleteVo;
 import org.dromara.system.domain.bo.GameAthleteBo;
 import org.dromara.system.service.IGameAthleteService;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.springframework.web.multipart.MultipartFile;
 
 /**
  * 参赛队员
@@ -29,6 +44,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
  * @author zlt
  * @date 2025-07-30
  */
+@Slf4j
 @Validated
 @RequiredArgsConstructor
 @RestController
@@ -57,6 +73,41 @@ public class GameAthleteController extends BaseController {
         ExcelUtil.exportExcel(list, "参赛队员", GameAthleteVo.class, response);
     }
 
+    /**
+     * 导入参赛队员列表
+     */
+    @SaCheckPermission("system:gameAthlete:import")
+    @Log(title = "参赛队员", businessType = BusinessType.IMPORT)
+    @PostMapping("/import")
+    public R<Void> importExcel(@RequestPart("file") MultipartFile file) {
+        ExcelResult<GameAthleteVo> excelResult = null;
+        try {
+            // 从redis中获取默认参赛赛事
+            Long defaultEventId = Long.valueOf(RedisUtils.getCacheObject(GameEventConstant.DEFAULT_EVENT_ID_KEY).toString());
+            excelResult = ExcelUtil.importExcel(file.getInputStream(), GameAthleteVo.class, true);
+            List<GameAthlete> list = MapstructUtils.convert(excelResult.getList(), GameAthlete.class);
+            Long finalDefaultEventId = defaultEventId;
+            list.stream()
+                .map(gameAthlete -> {
+                    gameAthlete.setEventId(finalDefaultEventId);
+                    return gameAthlete;
+                })
+                .collect(Collectors.toList());
+            gameAthleteService.saveOrEditBatch(list);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return R.ok(excelResult.getAnalysis());
+    }
+
+    /**
+     * 获取导入模板
+     */
+    @PostMapping("/importTemplate")
+    public void importTemplate(HttpServletResponse response) {
+        ExcelUtil.exportExcel(new ArrayList<>(), "参数队员数据", GameAthleteVo.class, response);
+    }
+
     /**
      * 获取参赛队员详细信息
      *
@@ -76,7 +127,7 @@ public class GameAthleteController extends BaseController {
      */
     @SaCheckPermission("system:gameAthlete:list")
     @GetMapping("/listByEventId")
-    public R<List<AthleteScoreVo>> getAthleteScoreList(@NotNull(message = "赛事ID不能为空") @RequestParam Long eventId){
+    public R<List<AthleteScoreVo>> getAthleteScoreList(@NotNull(message = "赛事ID不能为空") @RequestParam Long eventId) {
         List<AthleteScoreVo> list = gameAthleteService.queryAthleteScoreList(eventId);
         return R.ok(list);
     }
@@ -115,4 +166,14 @@ public class GameAthleteController extends BaseController {
                           @PathVariable Long[] athleteIds) {
         return toAjax(gameAthleteService.deleteWithValidByIds(List.of(athleteIds), true));
     }
+
+
+    public static void main(String[] args) {
+        List<String> strings = List.of("1", "2", "3");
+        String str = JSONUtil.toJsonStr(strings);
+        System.out.println(str);
+        String s="["1","2","3"]"
+        List<String> list = JSONUtil.toList(str, String.class);
+        System.out.println(list);
+    }
 }

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

@@ -7,6 +7,8 @@ import lombok.RequiredArgsConstructor;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.constraints.*;
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.dromara.common.redis.utils.RedisUtils;
+import org.dromara.system.domain.constant.GameEventConstant;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.validation.annotation.Validated;
 import org.dromara.common.idempotent.annotation.RepeatSubmit;
@@ -128,7 +130,9 @@ public class GameEventController extends BaseController {
     @Log(title = "赛事默认状态修改", businessType = BusinessType.UPDATE)
     @PutMapping("/changeEventDefault")
     public R<Void> changeEventDefault(@RequestBody GameEventBo bo) {
-        return toAjax(gameEventService.updateEventDefault(bo));
+        int result = gameEventService.updateEventDefault(bo);
+        RedisUtils.setCacheObject(GameEventConstant.DEFAULT_EVENT_ID_KEY, bo.getEventId());
+        return toAjax(result);
     }
 
     /**

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

@@ -27,11 +27,6 @@ public class GameEventConfigType extends TenantEntity {
     @TableId(value = "type_id",type = IdType.AUTO)
     private Long typeId;
 
-    /**
-     * 赛事ID
-     */
-    private Long eventId;
-
     /**
      * 类型编码
      */

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

@@ -25,11 +25,6 @@ public class GameEventConfigTypeBo extends BaseEntity {
      */
     private Long typeId;
 
-    /**
-     * 赛事ID
-     */
-    private Long eventId;
-
     /**
      * 类型编码
      */

ruoyi-modules/ruoyi-game-event/src/main/java/org/dromara/system/domain/constant/GameEventConstant.java

@@ -4,5 +4,9 @@ public class GameEventConstant {
     /**
      * 默认赛事缓存键
      */
-    public static final String DEFAULT_EVENT_KEY = "default_game_event";
+    public static final String DEFAULT_EVENT_KEY = "default:gameevent";
+    /**
+     * 默认赛事id缓存键
+     */
+    public static final String DEFAULT_EVENT_ID_KEY = "default:gameevent:id";
 }

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

@@ -11,7 +11,7 @@ import lombok.Data;
 import java.io.Serial;
 import java.io.Serializable;
 import java.util.Date;
-
+import java.util.List;
 
 
 /**
@@ -31,25 +31,25 @@ public class GameAthleteVo implements Serializable {
     /**
      * 主键
      */
-    @ExcelProperty(value = "主键")
+    // @ExcelProperty(value = "主键")
     private Long athleteId;
 
     /**
      * 用户ID
      */
-    @ExcelProperty(value = "用户ID")
+    // @ExcelProperty(value = "用户ID")
     private Long userId;
 
     /**
      * 赛事ID
      */
-    @ExcelProperty(value = "赛事ID")
+    // @ExcelProperty(value = "赛事ID")
     private Long eventId;
 
     /**
      * 赛事名称
      */
-    @ExcelProperty(value = "赛事名称")
+    // @ExcelProperty(value = "赛事名称")
     private String eventName;
 
     /**

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

@@ -33,11 +33,6 @@ public class GameEventConfigTypeVo implements Serializable {
      */
     private Long typeId;
 
-    /**
-     * 赛事ID
-     */
-    private String eventId;
-
     /**
      * 类型编码
      */

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

@@ -1,5 +1,6 @@
 package org.dromara.system.service;
 
+import org.dromara.system.domain.GameAthlete;
 import org.dromara.system.domain.vo.AthleteScoreVo;
 import org.dromara.system.domain.vo.GameAthleteVo;
 import org.dromara.system.domain.bo.GameAthleteBo;
@@ -74,4 +75,6 @@ public interface IGameAthleteService {
      * @return 是否删除成功
      */
     Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    Boolean saveOrEditBatch(List<GameAthlete> list);
 }

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

@@ -288,4 +288,52 @@ public class GameAthleteServiceImpl implements IGameAthleteService {
         }
         return baseMapper.deleteByIds(ids) > 0;
     }
+
+
+    /**
+     * 批量保存更新参赛队员信息
+     *
+     * @param list 参赛队员信息
+     */
+    @Override
+    public Boolean saveOrEditBatch(List<GameAthlete> list) {
+        if (CollectionUtils.isEmpty(list)) {
+            return true;
+        }
+
+        // 1. 提取所有非空的athleteCode
+        Set<String> codes = new HashSet<>(list.size());
+        for (GameAthlete athlete : list) {
+            if (athlete.getAthleteCode() != null) {
+                codes.add(athlete.getAthleteCode());
+            }
+        }
+
+        if (codes.isEmpty()) {
+            return baseMapper.insertBatch(list); // 如果全是新记录，直接批量插入
+        }
+
+        // 2. 查询已存在的记录（只需要id和code）
+        Map<String, Long> codeToIdMap = baseMapper.selectList(
+            Wrappers.lambdaQuery(GameAthlete.class)
+                .in(GameAthlete::getAthleteCode, codes)
+                .select(GameAthlete::getAthleteId, GameAthlete::getAthleteCode)
+        ).stream().collect(Collectors.toMap(
+            GameAthlete::getAthleteCode,
+            GameAthlete::getAthleteId,
+            (oldValue, newValue) -> oldValue // 如果有重复code，保留第一个
+        ));
+
+        // 3. 设置已存在记录的ID
+        for (GameAthlete item : list) {
+            if (item.getAthleteCode() != null) {
+                Long id = codeToIdMap.get(item.getAthleteCode());
+                if (id != null) {
+                    item.setAthleteId(id);
+                }
+            }
+        }
+
+        return baseMapper.insertOrUpdateBatch(list);
+    }
 }

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

@@ -9,6 +9,8 @@ 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.GameEventConfigTypeBo;
 import org.dromara.system.domain.vo.GameEventConfigTypeVo;
@@ -40,7 +42,7 @@ public class GameEventConfigTypeServiceImpl implements IGameEventConfigTypeServi
      * @return 赛事配置类型
      */
     @Override
-    public GameEventConfigTypeVo queryById(Long typeId){
+    public GameEventConfigTypeVo queryById(Long typeId) {
         return baseMapper.selectVoById(typeId);
     }
 
@@ -116,7 +118,7 @@ public class GameEventConfigTypeServiceImpl implements IGameEventConfigTypeServi
     /**
      * 保存前的数据校验
      */
-    private void validEntityBeforeSave(GameEventConfigType entity){
+    private void validEntityBeforeSave(GameEventConfigType entity) {
         //TODO 做一些数据校验,如唯一约束
     }
 
@@ -129,7 +131,7 @@ public class GameEventConfigTypeServiceImpl implements IGameEventConfigTypeServi
      */
     @Override
     public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
-        if(isValid){
+        if (isValid) {
             //TODO 做一些业务上的校验,判断是否需要校验
         }
         return baseMapper.deleteByIds(ids) > 0;