Parcourir la source

feat(physical): 添加职务管理功能模块

- 创建职务管理实体类PhysicalJudgePosition,包含职务名称、优先级和状态字段
- 实现职务管理业务对象PhysicalJudgePositionBo,支持新增和编辑验证
- 开发职务管理服务接口IPhysicalJudgePositionService及其实现类
- 添加职务管理控制器PhysicalJudgePositionController,提供增删改查REST接口
- 创建职务管理数据访问层PhysicalJudgePositionMapper及MyBatis映射文件
- 实现职务管理视图对象PhysicalJudgePositionVo,支持Excel导出功能
- 为赛事功能添加默认状态设置,新建赛事默认为未发布状态
- 调整赛事服务中的状态设置逻辑,移除重复的状态赋值代码
fugui001 il y a 1 jour
Parent
commit
104de662fd

+ 2 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/business/controller/TournamentsController.java

@@ -88,6 +88,8 @@ public class TournamentsController extends BaseController {
     @RepeatSubmit()
     @PostMapping()
     public R<Void> add(@Validated(AddGroup.class) @RequestBody  TournamentsDto dto) {
+        //手动建立的都是未发布的
+        dto.setStatus(-1L);
         return toAjax(tournamentsService.insertByBo(dto));
     }
 

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

@@ -416,7 +416,7 @@ public class TournamentsServiceImpl implements ITournamentsService {
                 log.error("奖励列表为空");
                 return false;
             }
-            add.setStatus(Long.valueOf(GameStatus.UN_PUBLISHED.getCode()));
+            /*add.setStatus(Long.valueOf(GameStatus.UN_PUBLISHED.getCode()));*/
             Long userId = LoginHelper.getUserId();
             add.setCreateUserId(userId);
             // 处理开始时间

+ 1 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/job/business/ScheduleTask.java

@@ -397,6 +397,7 @@ public class ScheduleTask {
             bo.setRebuy(tournamentsVo.getRebuy());
             bo.setDelayShow(tournamentsVo.getDelayShow());
             bo.setRemark(tournamentsVo.getRemark());
+            bo.setStatus(0L);
             // 调用已有的插入方法
             if (!iTournamentsService.insertByBo(bo)) {
                 log.error("赛事插入失败");

+ 105 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/physical/controller/PhysicalJudgePositionController.java

@@ -0,0 +1,105 @@
+package org.dromara.physical.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.dromara.physical.domain.bo.PhysicalJudgePositionBo;
+import org.dromara.physical.domain.vo.PhysicalJudgePositionVo;
+import org.dromara.physical.service.IPhysicalJudgePositionService;
+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.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 职务管理
+ *
+ * @author Lion Li
+ * @date 2025-12-25
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/physical/judgePosition")
+public class PhysicalJudgePositionController extends BaseController {
+
+    private final IPhysicalJudgePositionService physicalJudgePositionService;
+
+    /**
+     * 查询职务管理列表
+     */
+    @SaCheckPermission("physical:judgePosition:list")
+    @GetMapping("/list")
+    public TableDataInfo<PhysicalJudgePositionVo> list(PhysicalJudgePositionBo bo, PageQuery pageQuery) {
+        return physicalJudgePositionService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出职务管理列表
+     */
+    @SaCheckPermission("physical:judgePosition:export")
+    @Log(title = "职务管理", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(PhysicalJudgePositionBo bo, HttpServletResponse response) {
+        List<PhysicalJudgePositionVo> list = physicalJudgePositionService.queryList(bo);
+        ExcelUtil.exportExcel(list, "职务管理", PhysicalJudgePositionVo.class, response);
+    }
+
+    /**
+     * 获取职务管理详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("physical:judgePosition:query")
+    @GetMapping("/{id}")
+    public R<PhysicalJudgePositionVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long id) {
+        return R.ok(physicalJudgePositionService.queryById(id));
+    }
+
+    /**
+     * 新增职务管理
+     */
+    @SaCheckPermission("physical:judgePosition:add")
+    @Log(title = "职务管理", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody PhysicalJudgePositionBo bo) {
+        return toAjax(physicalJudgePositionService.insertByBo(bo));
+    }
+
+    /**
+     * 修改职务管理
+     */
+    @SaCheckPermission("physical:judgePosition:edit")
+    @Log(title = "职务管理", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody PhysicalJudgePositionBo bo) {
+        return toAjax(physicalJudgePositionService.updateByBo(bo));
+    }
+
+    /**
+     * 删除职务管理
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("physical:judgePosition:remove")
+    @Log(title = "职务管理", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(physicalJudgePositionService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

+ 46 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/physical/domain/PhysicalJudgePosition.java

@@ -0,0 +1,46 @@
+package org.dromara.physical.domain;
+
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+
+/**
+ * 职务管理对象 physical_judge_position
+ *
+ * @author Lion Li
+ * @date 2025-12-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("physical_judge_position")
+public class PhysicalJudgePosition extends BaseEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     *
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 职务名称,如 裁判长
+     */
+    private String name;
+
+    /**
+     * 优先级,越大越优先
+     */
+    private Long priority;
+
+    /**
+     * 状态:1=启用,0=禁用
+     */
+    private Long status;
+
+
+}

+ 47 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/physical/domain/bo/PhysicalJudgePositionBo.java

@@ -0,0 +1,47 @@
+package org.dromara.physical.domain.bo;
+
+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.*;
+import org.dromara.physical.domain.PhysicalJudgePosition;
+
+/**
+ * 职务管理业务对象 physical_judge_position
+ *
+ * @author Lion Li
+ * @date 2025-12-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = PhysicalJudgePosition.class, reverseConvertGenerate = false)
+public class PhysicalJudgePositionBo extends BaseEntity {
+
+    /**
+     *
+     */
+    @NotNull(message = "不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 职务名称,如 裁判长
+     */
+    @NotBlank(message = "职务名称,如 裁判长不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String name;
+
+    /**
+     * 优先级,越大越优先
+     */
+    @NotNull(message = "优先级,越大越优先不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long priority;
+
+    /**
+     * 状态:1=启用,0=禁用
+     */
+    private Long status;
+
+
+}

+ 53 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/physical/domain/vo/PhysicalJudgePositionVo.java

@@ -0,0 +1,53 @@
+package org.dromara.physical.domain.vo;
+
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.physical.domain.PhysicalJudgePosition;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+
+
+/**
+ * 职务管理视图对象 physical_judge_position
+ *
+ * @author Lion Li
+ * @date 2025-12-25
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = PhysicalJudgePosition.class)
+public class PhysicalJudgePositionVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     *
+     */
+    @ExcelProperty(value = "编号")
+    private Long id;
+
+    /**
+     * 职务名称,如 裁判长
+     */
+    @ExcelProperty(value = "职务名称")
+    private String name;
+
+    /**
+     * 优先级,越大越优先
+     */
+    @ExcelProperty(value = "优先级,越大越优先")
+    private Long priority;
+
+    /**
+     * 状态:1=启用,0=禁用
+     */
+    @ExcelProperty(value = "状态:1=启用,0=禁用")
+    private Long status;
+
+
+}

+ 46 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/physical/mapper/PhysicalJudgePositionMapper.java

@@ -0,0 +1,46 @@
+package org.dromara.physical.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.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.physical.domain.PhysicalJudge;
+import org.dromara.physical.domain.PhysicalJudgePosition;
+import org.dromara.physical.domain.vo.PhysicalJudgePositionVo;
+import org.dromara.physical.domain.vo.PhysicalJudgeVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 职务管理Mapper接口
+ *
+ * @author Lion Li
+ * @date 2025-12-25
+ */
+@DS("mysql2")
+public interface PhysicalJudgePositionMapper extends BaseMapperPlus<PhysicalJudgePosition, PhysicalJudgePositionVo> {
+
+    @InterceptorIgnore(tenantLine = "true")
+    Page<PhysicalJudgePositionVo> selectJudgePositionPage(@Param("page") Page<PhysicalJudgePosition> page, @Param("ew") Wrapper<PhysicalJudgePosition> wrapper);
+
+    @InterceptorIgnore(tenantLine = "true")
+    PhysicalJudgePositionVo selectJudgePositionById(Long id);
+
+    @InterceptorIgnore(tenantLine = "true")
+    int updateJudgePositionById(PhysicalJudgePosition update);
+
+    @InterceptorIgnore(tenantLine = "true")
+    int insertJudgePosition(PhysicalJudgePosition insert);
+
+    @InterceptorIgnore(tenantLine = "true")
+    int deleteJudgePosition(@Param("ids") Collection<Long> ids);
+
+    @InterceptorIgnore(tenantLine = "true")
+    List<PhysicalJudgePositionVo> selectJudgePositionList(@Param("ew") Wrapper<PhysicalJudgePosition> wrapper);
+
+
+
+}

+ 68 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/physical/service/IPhysicalJudgePositionService.java

@@ -0,0 +1,68 @@
+package org.dromara.physical.service;
+
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.physical.domain.bo.PhysicalJudgePositionBo;
+import org.dromara.physical.domain.vo.PhysicalJudgePositionVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 职务管理Service接口
+ *
+ * @author Lion Li
+ * @date 2025-12-25
+ */
+public interface IPhysicalJudgePositionService {
+
+    /**
+     * 查询职务管理
+     *
+     * @param id 主键
+     * @return 职务管理
+     */
+    PhysicalJudgePositionVo queryById(Long id);
+
+    /**
+     * 分页查询职务管理列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 职务管理分页列表
+     */
+    TableDataInfo<PhysicalJudgePositionVo> queryPageList(PhysicalJudgePositionBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的职务管理列表
+     *
+     * @param bo 查询条件
+     * @return 职务管理列表
+     */
+    List<PhysicalJudgePositionVo> queryList(PhysicalJudgePositionBo bo);
+
+    /**
+     * 新增职务管理
+     *
+     * @param bo 职务管理
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(PhysicalJudgePositionBo bo);
+
+    /**
+     * 修改职务管理
+     *
+     * @param bo 职务管理
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(PhysicalJudgePositionBo bo);
+
+    /**
+     * 校验并批量删除职务管理信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

+ 133 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/physical/service/impl/PhysicalJudgePositionServiceImpl.java

@@ -0,0 +1,133 @@
+package org.dromara.physical.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.physical.domain.PhysicalJudgePosition;
+import org.dromara.physical.domain.bo.PhysicalJudgePositionBo;
+import org.dromara.physical.domain.vo.PhysicalJudgePositionVo;
+import org.dromara.physical.mapper.PhysicalJudgePositionMapper;
+import org.dromara.physical.service.IPhysicalJudgePositionService;
+import org.springframework.stereotype.Service;
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 职务管理Service业务层处理
+ *
+ * @author Lion Li
+ * @date 2025-12-25
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class PhysicalJudgePositionServiceImpl implements IPhysicalJudgePositionService {
+
+    private final PhysicalJudgePositionMapper baseMapper;
+
+    /**
+     * 查询职务管理
+     *
+     * @param id 主键
+     * @return 职务管理
+     */
+    @Override
+    public PhysicalJudgePositionVo queryById(Long id){
+        return baseMapper.selectJudgePositionById(id);
+    }
+
+    /**
+     * 分页查询职务管理列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 职务管理分页列表
+     */
+    @Override
+    public TableDataInfo<PhysicalJudgePositionVo> queryPageList(PhysicalJudgePositionBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<PhysicalJudgePosition> lqw = buildQueryWrapper(bo);
+        Page<PhysicalJudgePositionVo> result = baseMapper.selectJudgePositionPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的职务管理列表
+     *
+     * @param bo 查询条件
+     * @return 职务管理列表
+     */
+    @Override
+    public List<PhysicalJudgePositionVo> queryList(PhysicalJudgePositionBo bo) {
+        LambdaQueryWrapper<PhysicalJudgePosition> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectJudgePositionList(lqw);
+    }
+
+    private LambdaQueryWrapper<PhysicalJudgePosition> buildQueryWrapper(PhysicalJudgePositionBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<PhysicalJudgePosition> lqw = Wrappers.lambdaQuery();
+        lqw.orderByDesc(PhysicalJudgePosition::getPriority);
+        lqw.like(StringUtils.isNotBlank(bo.getName()), PhysicalJudgePosition::getName, bo.getName());
+        lqw.eq(bo.getPriority() != null, PhysicalJudgePosition::getPriority, bo.getPriority());
+        lqw.eq(bo.getStatus() != null, PhysicalJudgePosition::getStatus, bo.getStatus());
+        return lqw;
+    }
+
+    /**
+     * 新增职务管理
+     *
+     * @param bo 职务管理
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(PhysicalJudgePositionBo bo) {
+        PhysicalJudgePosition add = MapstructUtils.convert(bo, PhysicalJudgePosition.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insertJudgePosition(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改职务管理
+     *
+     * @param bo 职务管理
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(PhysicalJudgePositionBo bo) {
+        PhysicalJudgePosition update = MapstructUtils.convert(bo, PhysicalJudgePosition.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateJudgePositionById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(PhysicalJudgePosition entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除职务管理信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteJudgePosition(ids) > 0;
+    }
+}

+ 83 - 0
ruoyi-modules/ruoyi-system/src/main/resources/mapper/physical/PhysicalJudgePositionMapper.xml

@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.physical.mapper.PhysicalJudgePositionMapper">
+
+
+    <select id="selectJudgePositionPage" resultType="org.dromara.physical.domain.vo.PhysicalJudgePositionVo">
+        SELECT
+            id,
+            name,
+            priority,
+            status,
+            create_time,
+            update_time
+        FROM physical_judge_position ${ew.customSqlSegment}
+    </select>
+
+    <select id="selectJudgePositionList" resultType="org.dromara.physical.domain.vo.PhysicalJudgePositionVo">
+        SELECT
+            id,
+            name,
+            priority,
+            status,
+            create_time,
+            update_time
+        FROM physical_judge_position ${ew.customSqlSegment}
+    </select>
+
+
+    <select id="selectJudgePositionById" resultType="org.dromara.physical.domain.vo.PhysicalJudgePositionVo">
+        SELECT
+            id,
+            name,
+            priority,
+            status,
+            create_time,
+            update_time
+        FROM physical_judge_position where id = #{id}
+    </select>
+
+
+    <!-- 新增职务 -->
+    <insert id="insertJudgePosition" useGeneratedKeys="true" keyProperty="id">
+        INSERT INTO physical_judge_position (
+            name,
+            priority,
+            create_time,
+            update_time
+        ) VALUES (
+                     #{name},
+                     #{priority},
+                     NOW(),
+                     NOW()
+                 )
+    </insert>
+
+    <!-- 更新职务信息 -->
+    <update id="updateJudgePositionById">
+        UPDATE physical_judge_position
+        <set>
+            <if test="name != null and name != ''">name = #{name},</if>
+            <if test="priority != null">priority = #{priority},</if>
+            <if test="status != null">status = #{status},</if>
+            update_time = NOW()
+        </set>
+        WHERE id = #{id}
+    </update>
+
+    <delete id="deleteJudgePosition">
+        DELETE FROM physical_judge_position
+        <where>
+            id IN
+            <foreach item="id" collection="ids" open="(" separator="," close=")">
+                <if test="id > 0">
+                    #{id}
+                </if>
+            </foreach>
+        </where>
+    </delete>
+
+
+</mapper>