导入报名表数据到数据库

pom.xml

@@ -80,6 +80,16 @@
                 <monitor.username>ruoyi</monitor.username>
                 <monitor.password>123456</monitor.password>
             </properties>
+        </profile>
+        <profile>
+            <id>test</id>
+            <properties>
+                <!-- 环境标识，需要与配置文件的名称相对应 -->
+                <profiles.active>test</profiles.active>
+                <logging.level>info</logging.level>
+                <monitor.username>ruoyi</monitor.username>
+                <monitor.password>123456</monitor.password>
+            </properties>
             <activation>
                 <!-- 默认环境 -->
                 <activeByDefault>true</activeByDefault>

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

@@ -0,0 +1,273 @@
+--- # 监控中心配置
+spring.boot.admin.client:
+  # 增加客户端开关
+  enabled: false
+  url: http://localhost:9090/admin
+  instance:
+    service-host-type: IP
+    metadata:
+      username: ${spring.boot.admin.client.username}
+      userpassword: ${spring.boot.admin.client.password}
+  username: @monitor.username@
+  password: @monitor.password@
+
+--- # snail-job 配置
+snail-job:
+  enabled: false
+  # 需要在 SnailJob 后台组管理创建对应名称的组,然后创建任务的时候选择对应的组,才能正确分派任务
+  group: "ruoyi_group"
+  # SnailJob 接入验证令牌 详见 script/sql/ry_job.sql `sj_group_config` 表
+  token: "SJ_cKqBTPzCsWA3VyuCfFoccmuIEGXjr5KT"
+  server:
+    host: 127.0.0.1
+    port: 17888
+  # 命名空间UUID 详见 script/sql/ry_job.sql `sj_namespace`表`unique_id`字段
+  namespace: ${spring.profiles.active}
+  # 随主应用端口漂移
+  port: 2${server.port}
+  # 客户端ip指定
+  host:
+  # RPC类型: netty, grpc
+  rpc-type: grpc
+
+--- # 数据源配置
+spring:
+  datasource:
+    type: com.zaxxer.hikari.HikariDataSource
+    # 动态数据源文档 https://www.kancloud.cn/tracy5546/dynamic-datasource/content
+    dynamic:
+      # 性能分析插件(有性能损耗 不建议生产环境使用)
+      p6spy: true
+      # 设置默认的数据源或者数据源组,默认值即为 master
+      primary: master
+      # 严格模式 匹配不到数据源则报错
+      strict: true
+      datasource:
+        # 主库数据源
+        master:
+          type: ${spring.datasource.type}
+          driverClassName: com.mysql.cj.jdbc.Driver
+          # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562
+          # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题)
+          url: jdbc:mysql://192.168.1.146:3306/game_event?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
+          username: root
+          password: P@ssw0rd
+#          password: 123456
+#        # 从库数据源
+#        slave:
+#          lazy: true
+#          type: ${spring.datasource.type}
+#          driverClassName: com.mysql.cj.jdbc.Driver
+#          url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
+#          username:
+#          password:
+#        oracle:
+#          type: ${spring.datasource.type}
+#          driverClassName: oracle.jdbc.OracleDriver
+#          url: jdbc:oracle:thin:@//localhost:1521/XE
+#          username: ROOT
+#          password: root
+#        postgres:
+#          type: ${spring.datasource.type}
+#          driverClassName: org.postgresql.Driver
+#          url: jdbc:postgresql://localhost:5432/postgres?useUnicode=true&characterEncoding=utf8&useSSL=true&autoReconnect=true&reWriteBatchedInserts=true
+#          username: root
+#          password: root
+#        sqlserver:
+#          type: ${spring.datasource.type}
+#          driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver
+#          url: jdbc:sqlserver://localhost:1433;DatabaseName=tempdb;SelectMethod=cursor;encrypt=false;rewriteBatchedStatements=true
+#          username: SA
+#          password: root
+      hikari:
+        # 最大连接池数量
+        maxPoolSize: 20
+        # 最小空闲线程数量
+        minIdle: 10
+        # 配置获取连接等待超时的时间
+        connectionTimeout: 30000
+        # 校验超时时间
+        validationTimeout: 5000
+        # 空闲连接存活最大时间，默认10分钟
+        idleTimeout: 600000
+        # 此属性控制池中连接的最长生命周期，值0表示无限生命周期，默认30分钟
+        maxLifetime: 1800000
+        # 多久检查一次连接的活性
+        keepaliveTime: 30000
+
+--- # redis 单机配置(单机与集群只能开启一个另一个需要注释掉)
+spring.data:
+  redis:
+    # 地址
+    host: 192.168.1.146
+    # 端口，默认为6379
+    port: 6379
+    # 数据库索引
+    database: 1
+    # redis 密码必须配置
+#    password: ruoyi123
+    # 连接超时时间
+    timeout: 10s
+    # 是否开启ssl
+    ssl.enabled: false
+
+# redisson 配置
+redisson:
+  # redis key前缀
+  keyPrefix:
+  # 线程池数量
+  threads: 4
+  # Netty线程池数量
+  nettyThreads: 8
+  # 单节点配置
+  singleServerConfig:
+    # 客户端名称 不能用中文
+    clientName: RuoYi-Vue-Plus
+    # 最小空闲连接数
+    connectionMinimumIdleSize: 8
+    # 连接池大小
+    connectionPoolSize: 32
+    # 连接空闲超时，单位：毫秒
+    idleConnectionTimeout: 10000
+    # 命令等待超时，单位：毫秒
+    timeout: 3000
+    # 发布和订阅连接池大小
+    subscriptionConnectionPoolSize: 50
+
+--- # mail 邮件发送
+mail:
+  enabled: false
+  host: smtp.163.com
+  port: 465
+  # 是否需要用户名密码验证
+  auth: true
+  # 发送方，遵循RFC-822标准
+  from: xxx@163.com
+  # 用户名（注意：如果使用foxmail邮箱，此处user为qq号）
+  user: xxx@163.com
+  # 密码（注意，某些邮箱需要为SMTP服务单独设置密码，详情查看相关帮助）
+  pass: xxxxxxxxxx
+  # 使用 STARTTLS安全连接，STARTTLS是对纯文本通信协议的扩展。
+  starttlsEnable: true
+  # 使用SSL安全连接
+  sslEnable: true
+  # SMTP超时时长，单位毫秒，缺省值不超时
+  timeout: 0
+  # Socket连接超时值，单位毫秒，缺省值不超时
+  connectionTimeout: 0
+
+--- # sms 短信 支持 阿里云 腾讯云 云片 等等各式各样的短信服务商
+# https://sms4j.com/doc3/ 差异配置文档地址 支持单厂商多配置，可以配置多个同时使用
+sms:
+  # 配置源类型用于标定配置来源(interface,yaml)
+  config-type: yaml
+  # 用于标定yml中的配置是否开启短信拦截，接口配置不受此限制
+  restricted: true
+  # 短信拦截限制单手机号每分钟最大发送，只对开启了拦截的配置有效
+  minute-max: 1
+  # 短信拦截限制单手机号每日最大发送量，只对开启了拦截的配置有效
+  account-max: 30
+  # 以下配置来自于 org.dromara.sms4j.provider.config.BaseConfig类中
+  blends:
+    # 唯一ID 用于发送短信寻找具体配置 随便定义别用中文即可
+    # 可以同时存在两个相同厂商 例如: ali1 ali2 两个不同的阿里短信账号 也可用于区分租户
+    config1:
+      # 框架定义的厂商名称标识，标定此配置是哪个厂商，详细请看厂商标识介绍部分
+      supplier: alibaba
+      # 有些称为accessKey有些称之为apiKey，也有称为sdkKey或者appId。
+      access-key-id: 您的accessKey
+      # 称为accessSecret有些称之为apiSecret
+      access-key-secret: 您的accessKeySecret
+      signature: 您的短信签名
+      sdk-app-id: 您的sdkAppId
+    config2:
+      # 厂商标识，标定此配置是哪个厂商，详细请看厂商标识介绍部分
+      supplier: tencent
+      access-key-id: 您的accessKey
+      access-key-secret: 您的accessKeySecret
+      signature: 您的短信签名
+      sdk-app-id: 您的sdkAppId
+
+
+--- # 三方授权
+justauth:
+  # 前端外网访问地址
+  address: http://localhost:80
+  type:
+    maxkey:
+      # maxkey 服务器地址
+      # 注意 如下均配置均不需要修改 maxkey 已经内置好了数据
+      server-url: http://sso.maxkey.top
+      client-id: 876892492581044224
+      client-secret: x1Y5MTMwNzIwMjMxNTM4NDc3Mzche8
+      redirect-uri: ${justauth.address}/social-callback?source=maxkey
+    topiam:
+      # topiam 服务器地址
+      server-url: http://127.0.0.1:1898/api/v1/authorize/y0q************spq***********8ol
+      client-id: 449c4*********937************759
+      client-secret: ac7***********1e0************28d
+      redirect-uri: ${justauth.address}/social-callback?source=topiam
+      scopes: [openid, email, phone, profile]
+    qq:
+      client-id: 10**********6
+      client-secret: 1f7d08**********5b7**********29e
+      redirect-uri: ${justauth.address}/social-callback?source=qq
+      union-id: false
+    weibo:
+      client-id: 10**********6
+      client-secret: 1f7d08**********5b7**********29e
+      redirect-uri: ${justauth.address}/social-callback?source=weibo
+    gitee:
+      client-id: 91436b7940090d09c72c7daf85b959cfd5f215d67eea73acbf61b6b590751a98
+      client-secret: 02c6fcfd70342980cd8dd2f2c06c1a350645d76c754d7a264c4e125f9ba915ac
+      redirect-uri: ${justauth.address}/social-callback?source=gitee
+    dingtalk:
+      client-id: 10**********6
+      client-secret: 1f7d08**********5b7**********29e
+      redirect-uri: ${justauth.address}/social-callback?source=dingtalk
+    baidu:
+      client-id: 10**********6
+      client-secret: 1f7d08**********5b7**********29e
+      redirect-uri: ${justauth.address}/social-callback?source=baidu
+    csdn:
+      client-id: 10**********6
+      client-secret: 1f7d08**********5b7**********29e
+      redirect-uri: ${justauth.address}/social-callback?source=csdn
+    coding:
+      client-id: 10**********6
+      client-secret: 1f7d08**********5b7**********29e
+      redirect-uri: ${justauth.address}/social-callback?source=coding
+      coding-group-name: xx
+    oschina:
+      client-id: 10**********6
+      client-secret: 1f7d08**********5b7**********29e
+      redirect-uri: ${justauth.address}/social-callback?source=oschina
+    alipay_wallet:
+      client-id: 10**********6
+      client-secret: 1f7d08**********5b7**********29e
+      redirect-uri: ${justauth.address}/social-callback?source=alipay_wallet
+      alipay-public-key: MIIB**************DAQAB
+    wechat_open:
+      client-id: 10**********6
+      client-secret: 1f7d08**********5b7**********29e
+      redirect-uri: ${justauth.address}/social-callback?source=wechat_open
+    wechat_mp:
+      client-id: 10**********6
+      client-secret: 1f7d08**********5b7**********29e
+      redirect-uri: ${justauth.address}/social-callback?source=wechat_mp
+    wechat_enterprise:
+      client-id: 10**********6
+      client-secret: 1f7d08**********5b7**********29e
+      redirect-uri: ${justauth.address}/social-callback?source=wechat_enterprise
+      agent-id: 1000002
+    gitlab:
+      client-id: 10**********6
+      client-secret: 1f7d08**********5b7**********29e
+      redirect-uri: ${justauth.address}/social-callback?source=gitlab
+    gitea:
+      # 前端改动 https://gitee.com/JavaLionLi/plus-ui/pulls/204
+      # gitea 服务器地址
+      server-url: https://demo.gitea.com
+      client-id: 10**********6
+      client-secret: 1f7d08**********5b7**********29e
+      redirect-uri: ${justauth.address}/social-callback?source=gitea

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

@@ -12,6 +12,7 @@ import lombok.val;
 import org.apache.ibatis.javassist.bytecode.AnnotationsAttribute;
 import org.dromara.common.core.domain.R;
 import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
 import org.dromara.system.domain.vo.EnrollProjectVo;
 import org.dromara.system.domain.vo.GameAthleteVo;
 import org.dromara.system.service.IEnrollService;
@@ -52,6 +53,7 @@ public class EnrollController {
     /**
      * 导入报名表
      */
+    @RepeatSubmit()
     @PostMapping("/importData/{eventId}")
     public R<String> importData(
         @RequestParam("file") MultipartFile file,

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

@@ -64,65 +64,29 @@ public class IEnrollServiceImpl implements IEnrollService {
             // 2. 获取赛事动态项目（赛事项目）
             Map<String, List<String>> projectMap = gameEventProjectService.mapProjectTypeAndProject(eventId);
 
-            // 3. 渲染分类
-            int currentColumnIndex = 6;
-            Row row = sheet.getRow(1);
-            if (row == null) {
-                row = sheet.createRow(1);
-            }
-
-            for (Map.Entry<String, List<String>> entry : projectMap.entrySet()) {
-                String categoryName = entry.getKey();
-                List<String> projectList = entry.getValue();
-                int projectCount = projectList.size();
-                // 3.1 创建单元格并设置分类名称
-                Cell cell = row.createCell(currentColumnIndex);
-                cell.setCellValue(categoryName);
-
-                // 3.2 合并单元格：从 currentColumnIndex 开始，合并 projectCount 个单元格
-                int lastColumnIndex = currentColumnIndex + projectCount - 1;
-                CellRangeAddress region = new CellRangeAddress(1, 1, currentColumnIndex, lastColumnIndex);
-                sheet.addMergedRegion(region);
-
-                // 3.3 创建样式：边框 + 居中 + 加粗
-                CellStyle style = xwb.createCellStyle();
-                style.setBorderTop(BorderStyle.THIN);
-                style.setBorderBottom(BorderStyle.THIN);
-                style.setBorderLeft(BorderStyle.THIN);
-                style.setBorderRight(BorderStyle.THIN);
-                style.setTopBorderColor(IndexedColors.BLACK.getIndex());
-                style.setBottomBorderColor(IndexedColors.BLACK.getIndex());
-                style.setLeftBorderColor(IndexedColors.BLACK.getIndex());
-                style.setRightBorderColor(IndexedColors.BLACK.getIndex());
-
-                style.setAlignment(HorizontalAlignment.CENTER);
-                style.setVerticalAlignment(VerticalAlignment.CENTER);
-
-                // 字体加粗
-                Font font = xwb.createFont();
-                font.setBold(true);
-                style.setFont(font);
-
-                // 应用样式
-                cell.setCellStyle(style);
-
-                // 3.4  更新起始列：为下一个分类腾出位置
-                currentColumnIndex = lastColumnIndex + 1;
-            }
-
-            // 4. 渲染项目（在第4行，索引为3）
-            currentColumnIndex = 6;
-            Row projectRow = sheet.getRow(2);
-            if (projectRow == null) {
-                projectRow = sheet.createRow(2);
-            }
-            for (Map.Entry<String, List<String>> entry : projectMap.entrySet()) {
-                List<String> projectList = entry.getValue();
-                // 4.1 遍历当前分类下的每个项目
-                for (String projectName : projectList) {
-                    Cell cell = projectRow.createCell(currentColumnIndex);
-                    cell.setCellValue(projectName);
+            if (!projectMap.isEmpty()) {
+                // 3. 渲染分类
+                int currentColumnIndex = 6;
+                Row row = sheet.getRow(1);
+                if (row == null) {
+                    row = sheet.createRow(1);
+                }
 
+                for (Map.Entry<String, List<String>> entry : projectMap.entrySet()) {
+                    String categoryName = entry.getKey();
+                    List<String> projectList = entry.getValue();
+                    int projectCount = projectList.size();
+                    // 3.1 创建单元格并设置分类名称
+                    // 当分类下的项目少于2个时不需要合并
+                    Cell cell = row.createCell(currentColumnIndex);
+                    cell.setCellValue(categoryName);
+                    int lastColumnIndex = 0;
+                    if (projectCount >= 2) {
+                        // 3.2 合并单元格：从 currentColumnIndex 开始，合并 projectCount 个单元格
+                        lastColumnIndex = currentColumnIndex + projectCount - 1;
+                        CellRangeAddress region = new CellRangeAddress(1, 1, currentColumnIndex, lastColumnIndex);
+                        sheet.addMergedRegion(region);
+                    }
                     // 3.3 创建样式：边框 + 居中 + 加粗
                     CellStyle style = xwb.createCellStyle();
                     style.setBorderTop(BorderStyle.THIN);
@@ -144,12 +108,50 @@ public class IEnrollServiceImpl implements IEnrollService {
 
                     // 应用样式
                     cell.setCellStyle(style);
+                    // 3.4  更新起始列：为下一个分类腾出位置
+                    currentColumnIndex = lastColumnIndex + 1;
+                }
 
-                    // 移动到下一列
-                    currentColumnIndex++;
+                // 4. 渲染项目（在第4行，索引为3）
+                currentColumnIndex = 6;
+                Row projectRow = sheet.getRow(2);
+                if (projectRow == null) {
+                    projectRow = sheet.createRow(2);
+                }
+                for (Map.Entry<String, List<String>> entry : projectMap.entrySet()) {
+                    List<String> projectList = entry.getValue();
+                    // 4.1 遍历当前分类下的每个项目
+                    for (String projectName : projectList) {
+                        Cell cell = projectRow.createCell(currentColumnIndex);
+                        cell.setCellValue(projectName);
+
+                        // 3.3 创建样式：边框 + 居中 + 加粗
+                        CellStyle style = xwb.createCellStyle();
+                        style.setBorderTop(BorderStyle.THIN);
+                        style.setBorderBottom(BorderStyle.THIN);
+                        style.setBorderLeft(BorderStyle.THIN);
+                        style.setBorderRight(BorderStyle.THIN);
+                        style.setTopBorderColor(IndexedColors.BLACK.getIndex());
+                        style.setBottomBorderColor(IndexedColors.BLACK.getIndex());
+                        style.setLeftBorderColor(IndexedColors.BLACK.getIndex());
+                        style.setRightBorderColor(IndexedColors.BLACK.getIndex());
+
+                        style.setAlignment(HorizontalAlignment.CENTER);
+                        style.setVerticalAlignment(VerticalAlignment.CENTER);
+
+                        // 字体加粗
+                        Font font = xwb.createFont();
+                        font.setBold(true);
+                        style.setFont(font);
+
+                        // 应用样式
+                        cell.setCellStyle(style);
+
+                        // 移动到下一列
+                        currentColumnIndex++;
+                    }
                 }
             }
-
             OutputStream outputStream = response.getOutputStream();
             // 清空response
             response.reset();
@@ -177,8 +179,7 @@ public class IEnrollServiceImpl implements IEnrollService {
         //1.解析报名信息
         List<EnrollProjectVo> enrollList = parseData(file);
         //2.保存报名信息
-        this.saveEnrollData(enrollList, eventId);
-        return null;
+        return this.saveEnrollData(enrollList, eventId);
     }
 
     private List<EnrollProjectVo> parseData(MultipartFile file) {