Merge remote-tracking branch 'origin/dev' into dev

xiangpei

2024-06-26 44aaa355ecf9430f8b182654d03c2914287bcba6

Merge remote-tracking branch 'origin/dev' into dev

 src/main/java/com/ycl/jxkg/controller/admin/ExamCheatController.java

New file
@@ -0,0 +1,82 @@
package com.ycl.jxkg.controller.admin;

import com.ycl.jxkg.base.Result;
import com.ycl.jxkg.domain.form.ExamCheatForm;
import com.ycl.jxkg.domain.query.ExamCheatQuery;
import com.ycl.jxkg.group.Add;
import com.ycl.jxkg.group.Update;
import com.ycl.jxkg.service.ExamCheatService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

import javax.validation.constraints.NotEmpty;
import java.util.List;

/**
 * 考试作弊记录 前端控制器
 *
 * @author gonghl
 * @since 2024-06-26
 */
@Validated
@RequiredArgsConstructor
@Api(value = "考试作弊记录", tags = "考试作弊记录管理")
@RestController
@RequestMapping("/api/admin/cheat")
public class ExamCheatController {

    private final ExamCheatService examCheatService;

    @PostMapping
    @ApiOperation(value = "添加", notes = "添加")
    @PreAuthorize("hasAuthority('examCheat:add')")
    public Result add(@RequestBody @Validated(Add.class) ExamCheatForm form) {
        return examCheatService.add(form);
    }

    @PutMapping
    @ApiOperation(value = "修改", notes = "修改")
    @PreAuthorize("hasAuthority('examCheat:edit')")
    public Result update(@RequestBody @Validated(Update.class) ExamCheatForm form) {
        return examCheatService.update(form);
    }

    @DeleteMapping("/{id}")
    @ApiOperation(value = "ID删除", notes = "ID删除")
    @PreAuthorize("hasAuthority('examCheat:del')")
    public Result removeById(@PathVariable("id") String id) {
        return examCheatService.removeById(id);
    }

    @DeleteMapping("/batch")
    @ApiOperation(value = "批量删除", notes = "批量删除")
    @PreAuthorize("hasAuthority('examCheat:del:batch')")
    public Result remove(@RequestBody @NotEmpty(message = "请选择数据") List<String> ids) {
        return examCheatService.remove(ids);
    }

    @GetMapping("/page")
    @ApiOperation(value = "分页", notes = "分页")
    @PreAuthorize("hasAuthority('examCheat:page')")
    public Result page(ExamCheatQuery query) {
        return examCheatService.page(query);
    }

    @GetMapping("/{id}")
    @ApiOperation(value = "详情", notes = "详情")
    @PreAuthorize("hasAuthority('examCheat:detail')")
    public Result detail(@PathVariable("id") Integer id) {
        return examCheatService.detail(id);
    }

    @GetMapping("/list")
    @PreAuthorize("hasAuthority('examCheat:list')")
    @ApiOperation(value = "列表", notes = "列表")
    public Result list() {
        return examCheatService.all();
    }
}

 src/main/java/com/ycl/jxkg/domain/entity/ExamCheat.java

New file
@@ -0,0 +1,46 @@
package com.ycl.jxkg.domain.entity;

import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ycl.jxkg.domain.base.AbsEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;

import java.io.Serializable;

/**
 * 考试作弊记录
 *
 * @author gonghl
 * @since 2024-06-26
 */
@Data
@Accessors(chain = true)
@TableName("t_exam_cheat")
@EqualsAndHashCode(callSuper = true)
public class ExamCheat extends AbsEntity implements Serializable {

    private static final long serialVersionUID = 1L;

    /**
     * 考试id
     */
    @TableField("exam_id")
    private Integer examId;

    /**
     * 作弊人
     */
    @TableField("cheat_user")
    private Integer cheatUser;

    /**
     * 创建人
     */
    @TableField(value = "create_user", fill = FieldFill.INSERT)
    private Integer createUser;

}


 src/main/java/com/ycl/jxkg/domain/form/ExamCheatForm.java

New file
@@ -0,0 +1,50 @@
package com.ycl.jxkg.domain.form;

import com.ycl.jxkg.domain.base.AbsForm;
import com.ycl.jxkg.domain.entity.ExamCheat;
import com.ycl.jxkg.group.Add;
import com.ycl.jxkg.group.Update;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.beans.BeanUtils;
import org.springframework.lang.NonNull;

import javax.validation.constraints.NotNull;
import java.util.Date;

/**
 * 考试作弊记录表单
 *
 * @author gonghl
 * @since 2024-06-26
 */
@Data
@ApiModel(value = "ExamCheat表单", description = "考试作弊记录表单")
public class ExamCheatForm extends AbsForm {

    @NotNull(message = "考试id不能为空", groups = {Add.class, Update.class})
    @ApiModelProperty("考试id")
    private Integer examId;

    @NotNull(message = "创建时间不能为空", groups = {Add.class, Update.class})
    @ApiModelProperty("创建时间")
    private Date createTime;

    @NotNull(message = "作弊人不能为空", groups = {Add.class, Update.class})
    @ApiModelProperty("作弊人")
    private Integer cheatUser;

    @NotNull(message = "创建人不能为空", groups = {Add.class, Update.class})
    @ApiModelProperty("创建人")
    private Integer createUser;

    public static ExamCheat getEntityByForm(@NonNull ExamCheatForm form, ExamCheat entity) {
        if(entity == null) {
          entity = new ExamCheat();
        }
        BeanUtils.copyProperties(form, entity);
        return entity;
    }

}

 src/main/java/com/ycl/jxkg/domain/query/ExamCheatQuery.java

New file
@@ -0,0 +1,20 @@
package com.ycl.jxkg.domain.query;

import com.ycl.jxkg.domain.base.AbsQuery;
import io.swagger.annotations.ApiModel;
import lombok.Data;

/**
 * 考试作弊记录查询
 *
 * @author gonghl
 * @since 2024-06-26
 */
@Data
@ApiModel(value = "ExamCheat查询", description = "考试作弊记录查询")
public class ExamCheatQuery extends AbsQuery {

    private String keyword;

}


 src/main/java/com/ycl/jxkg/domain/vo/ExamCheatVO.java

New file
@@ -0,0 +1,60 @@
package com.ycl.jxkg.domain.vo;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.ycl.jxkg.domain.base.AbsVo;
import com.ycl.jxkg.domain.entity.ExamCheat;
import lombok.Data;
import org.springframework.beans.BeanUtils;
import org.springframework.lang.NonNull;

import java.util.Date;

/**
 * 考试作弊记录展示
 *
 * @author gonghl
 * @since 2024-06-26
 */
@Data
public class ExamCheatVO extends AbsVo {

    /**
     * 考试id
     */
    private Integer examId;

    /**
     * 考试名称
     */
    private String examName;

    /**
     * 创建时间
     */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date createTime;

    /**
     * 作弊人
     */
    private Integer cheatUser;

    /**
     * 作弊人
     */
    private String cheatUserName;

    /**
     * 创建人
     */
    private Integer createUser;

    public static ExamCheatVO getVoByEntity(@NonNull ExamCheat entity, ExamCheatVO vo) {
        if (vo == null) {
            vo = new ExamCheatVO();
        }
        BeanUtils.copyProperties(entity, vo);
        return vo;
    }

}

 src/main/java/com/ycl/jxkg/mapper/ExamCheatMapper.java

New file
@@ -0,0 +1,32 @@
package com.ycl.jxkg.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.ycl.jxkg.domain.entity.ExamCheat;
import com.ycl.jxkg.domain.query.ExamCheatQuery;
import com.ycl.jxkg.domain.vo.ExamCheatVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

/**
 * 考试作弊记录 Mapper 接口
 *
 * @author gonghl
 * @since 2024-06-26
 */
@Mapper
public interface ExamCheatMapper extends BaseMapper<ExamCheat> {

    /**
     * id查找考试作弊记录
     * @param id
     * @return
     */
    ExamCheatVO getById(Integer id);

    /**
    *  分页
    */
    IPage getPage(IPage page, @Param("query") ExamCheatQuery query);

}

 src/main/java/com/ycl/jxkg/service/ExamCheatService.java

New file
@@ -0,0 +1,65 @@
package com.ycl.jxkg.service;

import com.ycl.jxkg.domain.entity.ExamCheat;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ycl.jxkg.base.Result;
import com.ycl.jxkg.domain.form.ExamCheatForm;
import com.ycl.jxkg.domain.query.ExamCheatQuery;
import java.util.List;

/**
 * 考试作弊记录 服务类
 *
 * @author gonghl
 * @since 2024-06-26
 */
public interface ExamCheatService extends IService<ExamCheat> {

    /**
     * 添加
     * @param form
     * @return
     */
    Result add(ExamCheatForm form);

    /**
     * 修改
     * @param form
     * @return
     */
    Result update(ExamCheatForm form);

    /**
     * 批量删除
     * @param ids
     * @return
     */
    Result remove(List<String> ids);

    /**
     * id删除
     * @param id
     * @return
     */
    Result removeById(String id);

    /**
     * 分页查询
     * @param query
     * @return
     */
    Result page(ExamCheatQuery query);

    /**
     * 根据id查找
     * @param id
     * @return
     */
    Result detail(Integer id);

    /**
     * 列表
     * @return
     */
    Result all();
}

 src/main/java/com/ycl/jxkg/service/impl/ExamCheatServiceImpl.java

New file
@@ -0,0 +1,119 @@
package com.ycl.jxkg.service.impl;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.ycl.jxkg.domain.entity.ExamCheat;
import com.ycl.jxkg.mapper.ExamCheatMapper;
import com.ycl.jxkg.service.ExamCheatService;
import com.ycl.jxkg.base.Result;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.jxkg.domain.form.ExamCheatForm;
import com.ycl.jxkg.domain.vo.ExamCheatVO;
import com.ycl.jxkg.domain.query.ExamCheatQuery;
import org.springframework.stereotype.Service;
import lombok.RequiredArgsConstructor;
import com.ycl.jxkg.utils.PageUtil;
import org.springframework.beans.BeanUtils;
import org.springframework.util.Assert;

import java.util.List;
import java.util.stream.Collectors;

/**
 * 考试作弊记录 服务实现类
 *
 * @author gonghl
 * @since 2024-06-26
 */
@Service
@RequiredArgsConstructor
public class ExamCheatServiceImpl extends ServiceImpl<ExamCheatMapper, ExamCheat> implements ExamCheatService {

    private final ExamCheatMapper examCheatMapper;

    /**
     * 添加
     * @param form
     * @return
     */
    @Override
    public Result add(ExamCheatForm form) {
        ExamCheat entity = ExamCheatForm.getEntityByForm(form, null);
        baseMapper.insert(entity);
        return Result.ok("添加成功");
    }

    /**
     * 修改
     * @param form
     * @return
     */
    @Override
    public Result update(ExamCheatForm form) {
        ExamCheat entity = baseMapper.selectById(form.getId());

        // 为空抛IllegalArgumentException，做全局异常处理
        Assert.notNull(entity, "记录不存在");
        BeanUtils.copyProperties(form, entity);
        baseMapper.updateById(entity);
        return Result.ok("修改成功");
    }

    /**
     * 批量删除
     * @param ids
     * @return
     */
    @Override
    public Result remove(List<String> ids) {
        baseMapper.deleteBatchIds(ids);
        return Result.ok("删除成功");
    }

    /**
     * id删除
     * @param id
     * @return
     */
    @Override
    public Result removeById(String id) {
        baseMapper.deleteById(id);
        return Result.ok("删除成功");
    }

    /**
     * 分页查询
     * @param query
     * @return
     */
    @Override
    public Result page(ExamCheatQuery query) {
        IPage<ExamCheatVO> page = PageUtil.getPage(query, ExamCheatVO.class);
        baseMapper.getPage(page, query);
        return Result.ok().data(page);
    }

    /**
     * 根据id查找
     * @param id
     * @return
     */
    @Override
    public Result detail(Integer id) {
        ExamCheatVO vo = baseMapper.getById(id);
        Assert.notNull(vo, "记录不存在");
        return Result.ok().data(vo);
    }

    /**
     * 列表
     * @return
     */
    @Override
    public Result all() {
        List<ExamCheat> entities = baseMapper.selectList(null);
        List<ExamCheatVO> vos = entities.stream()
                .map(entity -> ExamCheatVO.getVoByEntity(entity, null))
                .collect(Collectors.toList());
        return Result.ok().data(vos);
    }
}

 src/main/resources/mapper/ExamCheatMapper.xml

New file
@@ -0,0 +1,46 @@
<?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="com.ycl.jxkg.mapper.ExamCheatMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.ycl.jxkg.domain.vo.ExamCheatVO">
        <result column="exam_id" property="examId" />
        <result column="create_time" property="createTime" />
        <result column="cheat_user" property="cheatUser" />
        <result column="create_user" property="createUser" />
    </resultMap>

    <select id="getById" resultMap="BaseResultMap">
        SELECT
            TEC.exam_id,
            TEC.create_time,
            TEC.cheat_user,
            TEC.create_user,
            TEC.id
        FROM
            t_exam_cheat TEC
        WHERE
            TEC.id = #{id} AND TEC.deleted = 0
    </select>

    <select id="getPage" resultMap="BaseResultMap">
        SELECT
            TEC.exam_id,
            TEC.create_time,
            TEC.cheat_user,
            TEC.create_user,
            TEC.id,
            TU.real_name as cheatUserName,
            TE.exam_name as examName
        FROM
            t_exam_cheat TEC
            INNER JOIN t_exam TE ON TE.id = TEC.exam_id AND TE.deleted = 0
            INNER JOIN t_user TU ON TU.id = TEC.cheat_user AND TU.deleted = 0
        WHERE
            TEC.deleted = 0
        <if test="query.keyword != null and query.keyword != ''">
            AND (INSTR(TE.exam_name, #{query.keyword}) OR INSTR(TU.real_name, #{query.keyword}))
        </if>
    </select>

</mapper>