Ver código fonte

refactor(business): 赛事管理模块代码结构调整

-将 Tournaments 相关的接口、实体类、控制器、Mapper等从 demo 模块移动到 business 模块
- 更新包名和相关引用,以适应新的模块结构
- 修正部分代码和注释,以符合新的业务场景
fugui001 6 meses atrás
pai
commit
b546efa327

+ 22 - 22
ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TournamentsController.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/business/controller/TournamentsController.java

@@ -1,4 +1,4 @@
-package org.dromara.demo.controller;
+package org.dromara.business.controller;
 
 import java.util.List;
 
@@ -17,51 +17,51 @@ 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.demo.domain.vo.TournamentsVo;
-import org.dromara.demo.domain.bo.TournamentsBo;
-import org.dromara.demo.service.ITournamentsService;
+import org.dromara.business.domain.vo.TournamentsVo;
+import org.dromara.business.domain.bo.TournamentsBo;
+import org.dromara.business.service.ITournamentsService;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 
 /**
- * 【请填写功能名称
+ * 【赛事管理
  *
  * @author Lion Li
- * @date 2025-06-05
+ * @date 2025-06-11
  */
 @Validated
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/demo/tournaments")
+@RequestMapping("/business/tournaments")
 public class TournamentsController extends BaseController {
 
     private final ITournamentsService tournamentsService;
 
     /**
-     * 查询【请填写功能名称】列表
+     * 查询【赛事管理】列表
      */
-    @SaCheckPermission("demo:tournaments:list")
+    @SaCheckPermission("business:tournaments:list")
     @GetMapping("/list")
     public TableDataInfo<TournamentsVo> list(TournamentsBo bo, PageQuery pageQuery) {
         return tournamentsService.queryPageList(bo, pageQuery);
     }
 
     /**
-     * 导出【请填写功能名称】列表
+     * 导出【赛事管理】列表
      */
-    @SaCheckPermission("demo:tournaments:export")
+    @SaCheckPermission("business:tournaments:export")
     @Log(title = "【赛事管理-导出】", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(TournamentsBo bo, HttpServletResponse response) {
         List<TournamentsVo> list = tournamentsService.queryList(bo);
-        ExcelUtil.exportExcel(list, "【请填写功能名称】", TournamentsVo.class, response);
+        ExcelUtil.exportExcel(list, "【赛事管理-导出】", TournamentsVo.class, response);
     }
 
     /**
-     * 获取【请填写功能名称】详细信息
+     * 获取【赛事管理】详细信息
      *
      * @param id 主键
      */
-    @SaCheckPermission("demo:tournaments:query")
+    @SaCheckPermission("business:tournaments:query")
     @GetMapping("/{id}")
     public R<TournamentsVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long id) {
@@ -69,9 +69,9 @@ public class TournamentsController extends BaseController {
     }
 
     /**
-     * 新增【请填写功能名称
+     * 新增【赛事管理
      */
-    @SaCheckPermission("demo:tournaments:add")
+    @SaCheckPermission("business:tournaments:add")
     @Log(title = "【赛事管理-新增】", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
@@ -80,10 +80,10 @@ public class TournamentsController extends BaseController {
     }
 
     /**
-     * 修改【请填写功能名称
+     * 修改【赛事管理
      */
-    @SaCheckPermission("demo:tournaments:edit")
-    @Log(title = "【赛事管理-编辑】", businessType = BusinessType.UPDATE)
+    @SaCheckPermission("business:tournaments:edit")
+    @Log(title = "【赛事管理-修改】", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
     public R<Void> edit(@Validated(EditGroup.class) @RequestBody TournamentsBo bo) {
@@ -91,12 +91,12 @@ public class TournamentsController extends BaseController {
     }
 
     /**
-     * 删除【请填写功能名称
+     * 删除【赛事管理
      *
      * @param ids 主键串
      */
-    @SaCheckPermission("demo:tournaments:remove")
-    @Log(title = "【赛事管理-除】", businessType = BusinessType.DELETE)
+    @SaCheckPermission("business:tournaments:remove")
+    @Log(title = "【赛事管理-除】", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
                           @PathVariable Long[] ids) {

+ 2 - 4
ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/Tournaments.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/business/domain/Tournaments.java

@@ -1,4 +1,4 @@
-package org.dromara.demo.domain;
+package org.dromara.business.domain;
 
 import org.dromara.common.mybatis.core.domain.BaseEntity;
 import com.baomidou.mybatisplus.annotation.*;
@@ -13,7 +13,7 @@ import java.io.Serial;
  * 【请填写功能名称】对象 tournaments
  *
  * @author Lion Li
- * @date 2025-06-05
+ * @date 2025-06-11
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -80,6 +80,4 @@ public class Tournaments extends BaseEntity {
     private Date updatedAt;
 
 
-
-
 }

+ 5 - 5
ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/TournamentsBo.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/business/domain/bo/TournamentsBo.java

@@ -1,6 +1,6 @@
-package org.dromara.demo.domain.bo;
+package org.dromara.business.domain.bo;
 
-import org.dromara.demo.domain.Tournaments;
+import org.dromara.business.domain.Tournaments;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
 import org.dromara.common.core.validate.AddGroup;
 import org.dromara.common.core.validate.EditGroup;
@@ -15,7 +15,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
  * 【请填写功能名称】业务对象 tournaments
  *
  * @author Lion Li
- * @date 2025-06-05
+ * @date 2025-06-11
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -43,7 +43,7 @@ public class TournamentsBo extends BaseEntity {
     /**
      * 游戏类型
      */
-/*    @NotNull(message = "游戏类型不能为空", groups = { AddGroup.class, EditGroup.class })*/
+    @NotNull(message = "游戏类型不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long gameType;
 
     /**
@@ -73,7 +73,7 @@ public class TournamentsBo extends BaseEntity {
     /**
      * 赛事状态
      */
-    //@NotNull(message = "赛事状态不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotNull(message = "赛事状态不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long status;
 
     /**

+ 5 - 5
ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/TournamentsVo.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/business/domain/vo/TournamentsVo.java

@@ -1,8 +1,8 @@
-package org.dromara.demo.domain.vo;
+package org.dromara.business.domain.vo;
 
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import org.dromara.demo.domain.Tournaments;
+import org.dromara.business.domain.Tournaments;
 import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
 import cn.idev.excel.annotation.ExcelProperty;
 import org.dromara.common.excel.annotation.ExcelDictFormat;
@@ -20,7 +20,7 @@ import java.util.Date;
  * 【请填写功能名称】视图对象 tournaments
  *
  * @author Lion Li
- * @date 2025-06-05
+ * @date 2025-06-11
  */
 @Data
 @ExcelIgnoreUnannotated
@@ -88,13 +88,13 @@ public class TournamentsVo implements Serializable {
     /**
      *
      */
-    @ExcelProperty(value = "创建时间")
+    @ExcelProperty(value = "")
     private Date createdAt;
 
     /**
      *
      */
-    @ExcelProperty(value = "修改时间")
+    @ExcelProperty(value = "")
     private Date updatedAt;
 
 

+ 3 - 3
ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/mapper/TournamentsMapper.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/business/mapper/TournamentsMapper.java

@@ -1,13 +1,13 @@
-package org.dromara.demo.mapper;
+package org.dromara.business.mapper;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
-import org.dromara.demo.domain.Tournaments;
-import org.dromara.demo.domain.vo.TournamentsVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.business.domain.Tournaments;
+import org.dromara.business.domain.vo.TournamentsVo;
 
 import java.util.Collection;
 import java.util.List;

+ 4 - 4
ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/ITournamentsService.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/business/service/ITournamentsService.java

@@ -1,7 +1,7 @@
-package org.dromara.demo.service;
+package org.dromara.business.service;
 
-import org.dromara.demo.domain.vo.TournamentsVo;
-import org.dromara.demo.domain.bo.TournamentsBo;
+import org.dromara.business.domain.vo.TournamentsVo;
+import org.dromara.business.domain.bo.TournamentsBo;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.mybatis.core.page.PageQuery;
 
@@ -12,7 +12,7 @@ import java.util.List;
  * 【请填写功能名称】Service接口
  *
  * @author Lion Li
- * @date 2025-06-05
+ * @date 2025-06-11
  */
 public interface ITournamentsService {
 

+ 7 - 7
ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/TournamentsServiceImpl.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/business/service/impl/TournamentsServiceImpl.java

@@ -1,4 +1,4 @@
-package org.dromara.demo.service.impl;
+package org.dromara.business.service.impl;
 
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.StringUtils;
@@ -10,11 +10,11 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
-import org.dromara.demo.domain.bo.TournamentsBo;
-import org.dromara.demo.domain.vo.TournamentsVo;
-import org.dromara.demo.domain.Tournaments;
-import org.dromara.demo.mapper.TournamentsMapper;
-import org.dromara.demo.service.ITournamentsService;
+import org.dromara.business.domain.bo.TournamentsBo;
+import org.dromara.business.domain.vo.TournamentsVo;
+import org.dromara.business.domain.Tournaments;
+import org.dromara.business.mapper.TournamentsMapper;
+import org.dromara.business.service.ITournamentsService;
 
 import java.util.List;
 import java.util.Map;
@@ -24,7 +24,7 @@ import java.util.Collection;
  * 【请填写功能名称】Service业务层处理
  *
  * @author Lion Li
- * @date 2025-06-05
+ * @date 2025-06-11
  */
 @Slf4j
 @RequiredArgsConstructor

+ 4 - 4
ruoyi-modules/ruoyi-demo/src/main/resources/mapper/demo/TournamentsMapper.xml → ruoyi-modules/ruoyi-system/src/main/resources/mapper/business/TournamentsMapper.xml

@@ -2,18 +2,18 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.dromara.demo.mapper.TournamentsMapper">
+<mapper namespace="org.dromara.business.mapper.TournamentsMapper">
 
-    <select id="selectVoPage" resultType="org.dromara.demo.domain.vo.TournamentsVo">
+    <select id="selectVoPage" resultType="org.dromara.business.domain.vo.TournamentsVo">
         SELECT * FROM tournaments ${ew.customSqlSegment}
     </select>
 
 
-    <select id="selectTournamentsVoList" resultType="org.dromara.demo.domain.vo.TournamentsVo">
+    <select id="selectTournamentsVoList" resultType="org.dromara.business.domain.vo.TournamentsVo">
         SELECT id, name, start_time, game_type, starting_chips, level_duration, late_registration_level, max_players, status, created_at, updated_at FROM tournaments  ${ew.customSqlSegment}
     </select>
 
-    <select id="selectVoByIdInfo" resultType="org.dromara.demo.domain.vo.TournamentsVo">
+    <select id="selectVoByIdInfo" resultType="org.dromara.business.domain.vo.TournamentsVo">
        SELECT id, name, start_time, game_type, starting_chips, level_duration, late_registration_level, max_players, status, created_at, updated_at FROM tournaments WHERE id =  #{id}
     </select>