fix 课程目录卷

zhongzheng-admin/src/main/java/com/zhongzheng/controller/course/CourseMenuExamController.java

@@ -0,0 +1,112 @@
+package com.zhongzheng.controller.course;
+
+import java.util.List;
+import java.util.Arrays;
+
+import com.zhongzheng.modules.course.bo.CourseMenuExamAddBo;
+import com.zhongzheng.modules.course.bo.CourseMenuExamEditBo;
+import com.zhongzheng.modules.course.bo.CourseMenuExamQueryBo;
+import com.zhongzheng.modules.course.service.ICourseMenuExamService;
+import com.zhongzheng.modules.course.vo.CourseMenuExamVo;
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.zhongzheng.common.annotation.Log;
+import com.zhongzheng.common.core.controller.BaseController;
+import com.zhongzheng.common.core.domain.AjaxResult;
+import com.zhongzheng.common.enums.BusinessType;
+import com.zhongzheng.common.utils.poi.ExcelUtil;
+import com.zhongzheng.common.core.page.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * 课程目录关联卷Controller
+ *
+ * @author hjl
+ * @date 2021-11-17
+ */
+@Api(value = "课程目录关联卷控制器", tags = {"课程目录关联卷管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/course/menu/exam")
+public class CourseMenuExamController extends BaseController {
+
+    private final ICourseMenuExamService iCourseMenuExamService;
+
+    /**
+     * 查询课程目录关联卷列表
+     */
+    @ApiOperation("查询课程目录关联卷列表")
+    @PreAuthorize("@ss.hasPermi('system:exam:list')")
+    @GetMapping("/list")
+    public TableDataInfo<CourseMenuExamVo> list(CourseMenuExamQueryBo bo) {
+        startPage();
+        List<CourseMenuExamVo> list = iCourseMenuExamService.queryList(bo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出课程目录关联卷列表
+     */
+   /* @ApiOperation("导出课程目录关联卷列表")
+    @PreAuthorize("@ss.hasPermi('system:exam:export')")
+    @Log(title = "课程目录关联卷", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult<CourseMenuExamVo> export(CourseMenuExamQueryBo bo) {
+        List<CourseMenuExamVo> list = iCourseMenuExamService.queryList(bo);
+        ExcelUtil<CourseMenuExamVo> util = new ExcelUtil<CourseMenuExamVo>(CourseMenuExamVo.class);
+        return util.exportExcel(list, "课程目录关联卷");
+    }*/
+
+    /**
+     * 获取课程目录关联卷详细信息
+     */
+    @ApiOperation("获取课程目录关联卷详细信息")
+    @PreAuthorize("@ss.hasPermi('system:exam:query')")
+    @GetMapping("/{id}")
+    public AjaxResult<CourseMenuExamVo> getInfo(@PathVariable("id" ) Long id) {
+        return AjaxResult.success(iCourseMenuExamService.queryById(id));
+    }
+
+    /**
+     * 新增课程目录关联卷
+     */
+    @ApiOperation("新增课程目录关联卷")
+    @PreAuthorize("@ss.hasPermi('system:exam:add')")
+    @Log(title = "课程目录关联卷", businessType = BusinessType.INSERT)
+    @PostMapping()
+    public AjaxResult<Void> add(@RequestBody CourseMenuExamAddBo bo) {
+        return toAjax(iCourseMenuExamService.insertByAddBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 修改课程目录关联卷
+     */
+    @ApiOperation("修改课程目录关联卷")
+    @PreAuthorize("@ss.hasPermi('system:exam:edit')")
+    @Log(title = "课程目录关联卷", businessType = BusinessType.UPDATE)
+    @PutMapping()
+    public AjaxResult<Void> edit(@RequestBody CourseMenuExamEditBo bo) {
+        return toAjax(iCourseMenuExamService.updateByEditBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 删除课程目录关联卷
+     */
+    @ApiOperation("删除课程目录关联卷")
+    @PreAuthorize("@ss.hasPermi('system:exam:remove')")
+    @Log(title = "课程目录关联卷" , businessType = BusinessType.DELETE)
+    @PostMapping("/delete/{ids}")
+    public AjaxResult<Void> remove(@PathVariable Long[] ids) {
+        return toAjax(iCourseMenuExamService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
+    }
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseMenuExamAddBo.java

@@ -0,0 +1,45 @@
+package com.zhongzheng.modules.course.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 课程目录关联卷添加对象 course_menu_exam
+ *
+ * @author hjl
+ * @date 2021-11-17
+ */
+@Data
+@ApiModel("课程目录关联卷添加对象")
+public class CourseMenuExamAddBo {
+
+    /** 课程ID */
+    @ApiModelProperty("课程ID")
+    private Long courseId;
+    /** 模块ID */
+    @ApiModelProperty("模块ID")
+    private Long moduleId;
+    /** 章ID */
+    @ApiModelProperty("章ID")
+    private Long chapterId;
+    /** 节ID */
+    @ApiModelProperty("节ID")
+    private Long sectionId;
+    /** 题卷类型 1试卷 2章卷 3模块卷 */
+    @ApiModelProperty("题卷类型 1试卷 2章卷 3模块卷")
+    private Integer type;
+    /** 卷ID */
+    @ApiModelProperty("卷ID")
+    private Long examId;
+    /** 添加时间 */
+    @ApiModelProperty("添加时间")
+    private Long createTime;
+    /** 修改时间 */
+    @ApiModelProperty("修改时间")
+    private Long updateTime;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseMenuExamEditBo.java

@@ -0,0 +1,52 @@
+package com.zhongzheng.modules.course.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+/**
+ * 课程目录关联卷编辑对象 course_menu_exam
+ *
+ * @author hjl
+ * @date 2021-11-17
+ */
+@Data
+@ApiModel("课程目录关联卷编辑对象")
+public class CourseMenuExamEditBo {
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long id;
+
+    /** 课程ID */
+    @ApiModelProperty("课程ID")
+    private Long courseId;
+
+    /** 模块ID */
+    @ApiModelProperty("模块ID")
+    private Long moduleId;
+
+    /** 章ID */
+    @ApiModelProperty("章ID")
+    private Long chapterId;
+
+    /** 节ID */
+    @ApiModelProperty("节ID")
+    private Long sectionId;
+
+    /** 题卷类型 1试卷 2章卷 3模块卷 */
+    @ApiModelProperty("题卷类型 1试卷 2章卷 3模块卷")
+    private Integer type;
+
+    /** 卷ID */
+    @ApiModelProperty("卷ID")
+    private Long examId;
+
+    /** 修改时间 */
+    @ApiModelProperty("修改时间")
+    private Long updateTime;
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseMenuExamQueryBo.java

@@ -0,0 +1,57 @@
+package com.zhongzheng.modules.course.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+import java.util.Map;
+import java.util.HashMap;
+
+import com.zhongzheng.common.core.domain.BaseEntity;
+
+/**
+ * 课程目录关联卷分页查询对象 course_menu_exam
+ *
+ * @author hjl
+ * @date 2021-11-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("课程目录关联卷分页查询对象")
+public class CourseMenuExamQueryBo extends BaseEntity {
+
+	/** 分页大小 */
+	@ApiModelProperty("分页大小")
+	private Integer pageSize;
+	/** 当前页数 */
+	@ApiModelProperty("当前页数")
+	private Integer pageNum;
+	/** 排序列 */
+	@ApiModelProperty("排序列")
+	private String orderByColumn;
+	/** 排序的方向desc或者asc */
+	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
+	private String isAsc;
+
+
+	/** 课程ID */
+	@ApiModelProperty("课程ID")
+	private Long courseId;
+	/** 模块ID */
+	@ApiModelProperty("模块ID")
+	private Long moduleId;
+	/** 章ID */
+	@ApiModelProperty("章ID")
+	private Long chapterId;
+	/** 节ID */
+	@ApiModelProperty("节ID")
+	private Long sectionId;
+	/** 题卷类型 1试卷 2章卷 3模块卷 */
+	@ApiModelProperty("题卷类型 1试卷 2章卷 3模块卷")
+	private Integer type;
+	/** 卷ID */
+	@ApiModelProperty("卷ID")
+	private Long examId;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/domain/CourseMenuExam.java

@@ -0,0 +1,47 @@
+package com.zhongzheng.modules.course.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.zhongzheng.common.annotation.Excel;
+
+/**
+ * 课程目录关联卷对象 course_menu_exam
+ *
+ * @author hjl
+ * @date 2021-11-17
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("course_menu_exam")
+public class CourseMenuExam implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    /** $column.columnComment */
+    @TableId(value = "id")
+    private Long id;
+    /** 课程ID */
+    private Long courseId;
+    /** 模块ID */
+    private Long moduleId;
+    /** 章ID */
+    private Long chapterId;
+    /** 节ID */
+    private Long sectionId;
+    /** 题卷类型 1试卷 2章卷 3模块卷 */
+    private Integer type;
+    /** 卷ID */
+    private Long examId;
+    /** 添加时间 */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createTime;
+    /** 修改时间 */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateTime;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/mapper/CourseMenuExamMapper.java

@@ -0,0 +1,14 @@
+package com.zhongzheng.modules.course.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.course.domain.CourseMenuExam;
+
+/**
+ * 课程目录关联卷Mapper接口
+ *
+ * @author hjl
+ * @date 2021-11-17
+ */
+public interface CourseMenuExamMapper extends BaseMapper<CourseMenuExam> {
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/ICourseMenuExamService.java

@@ -0,0 +1,52 @@
+package com.zhongzheng.modules.course.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhongzheng.modules.course.bo.CourseMenuExamAddBo;
+import com.zhongzheng.modules.course.bo.CourseMenuExamEditBo;
+import com.zhongzheng.modules.course.bo.CourseMenuExamQueryBo;
+import com.zhongzheng.modules.course.domain.CourseMenuExam;
+import com.zhongzheng.modules.course.vo.CourseMenuExamVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 课程目录关联卷Service接口
+ *
+ * @author hjl
+ * @date 2021-11-17
+ */
+public interface ICourseMenuExamService extends IService<CourseMenuExam> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	CourseMenuExamVo queryById(Long id);
+
+	/**
+	 * 查询列表
+	 */
+	List<CourseMenuExamVo> queryList(CourseMenuExamQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入课程目录关联卷
+	 * @param bo 课程目录关联卷新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(CourseMenuExamAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改课程目录关联卷
+	 * @param bo 课程目录关联卷编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(CourseMenuExamEditBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseMenuExamServiceImpl.java

@@ -0,0 +1,104 @@
+package com.zhongzheng.modules.course.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
+import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.modules.course.bo.CourseMenuExamAddBo;
+import com.zhongzheng.modules.course.bo.CourseMenuExamEditBo;
+import com.zhongzheng.modules.course.bo.CourseMenuExamQueryBo;
+import com.zhongzheng.modules.course.domain.CourseMenuExam;
+import com.zhongzheng.modules.course.mapper.CourseMenuExamMapper;
+import com.zhongzheng.modules.course.service.ICourseMenuExamService;
+import com.zhongzheng.modules.course.vo.CourseMenuExamVo;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.pagehelper.Page;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 课程目录关联卷Service业务层处理
+ *
+ * @author hjl
+ * @date 2021-11-17
+ */
+@Service
+public class CourseMenuExamServiceImpl extends ServiceImpl<CourseMenuExamMapper, CourseMenuExam> implements ICourseMenuExamService {
+
+    @Override
+    public CourseMenuExamVo queryById(Long id){
+        CourseMenuExam db = this.baseMapper.selectById(id);
+        return BeanUtil.toBean(db, CourseMenuExamVo.class);
+    }
+
+    @Override
+    public List<CourseMenuExamVo> queryList(CourseMenuExamQueryBo bo) {
+        LambdaQueryWrapper<CourseMenuExam> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getCourseId() != null, CourseMenuExam::getCourseId, bo.getCourseId());
+        lqw.eq(bo.getModuleId() != null, CourseMenuExam::getModuleId, bo.getModuleId());
+        lqw.eq(bo.getChapterId() != null, CourseMenuExam::getChapterId, bo.getChapterId());
+        lqw.eq(bo.getSectionId() != null, CourseMenuExam::getSectionId, bo.getSectionId());
+        lqw.eq(bo.getType() != null, CourseMenuExam::getType, bo.getType());
+        lqw.eq(bo.getExamId() != null, CourseMenuExam::getExamId, bo.getExamId());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<CourseMenuExamVo> entity2Vo(Collection<CourseMenuExam> collection) {
+        List<CourseMenuExamVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, CourseMenuExamVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<CourseMenuExam> page = (Page<CourseMenuExam>)collection;
+            Page<CourseMenuExamVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(CourseMenuExamAddBo bo) {
+        CourseMenuExam add = BeanUtil.toBean(bo, CourseMenuExam.class);
+        validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(CourseMenuExamEditBo bo) {
+        CourseMenuExam update = BeanUtil.toBean(bo, CourseMenuExam.class);
+        validEntityBeforeSave(update);
+        update.setUpdateTime(DateUtils.getNowTime());
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(CourseMenuExam entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return this.removeByIds(ids);
+    }
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/vo/CourseMenuExamVo.java

@@ -0,0 +1,51 @@
+package com.zhongzheng.modules.course.vo;
+
+import com.zhongzheng.common.annotation.Excel;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 课程目录关联卷视图对象 mall_package
+ *
+ * @author hjl
+ * @date 2021-11-17
+ */
+@Data
+@ApiModel("课程目录关联卷视图对象")
+public class CourseMenuExamVo {
+	private static final long serialVersionUID = 1L;
+
+	/** $pkColumn.columnComment */
+	@ApiModelProperty("$pkColumn.columnComment")
+	private Long id;
+
+	/** 课程ID */
+	@Excel(name = "课程ID")
+	@ApiModelProperty("课程ID")
+	private Long courseId;
+	/** 模块ID */
+	@Excel(name = "模块ID")
+	@ApiModelProperty("模块ID")
+	private Long moduleId;
+	/** 章ID */
+	@Excel(name = "章ID")
+	@ApiModelProperty("章ID")
+	private Long chapterId;
+	/** 节ID */
+	@Excel(name = "节ID")
+	@ApiModelProperty("节ID")
+	private Long sectionId;
+	/** 题卷类型 1试卷 2章卷 3模块卷 */
+	@Excel(name = "题卷类型 1试卷 2章卷 3模块卷")
+	@ApiModelProperty("题卷类型 1试卷 2章卷 3模块卷")
+	private Integer type;
+	/** 卷ID */
+	@Excel(name = "卷ID")
+	@ApiModelProperty("卷ID")
+	private Long examId;
+}

zhongzheng-system/src/main/resources/mapper/modules/course/CourseMenuExamMapper.xml

@@ -0,0 +1,20 @@
+<?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.zhongzheng.system.mapper.CourseMenuExamMapper">
+
+    <resultMap type="com.zhongzheng.system.domain.CourseMenuExam" id="CourseMenuExamResult">
+        <result property="id" column="id"/>
+        <result property="courseId" column="course_id"/>
+        <result property="moduleId" column="module_id"/>
+        <result property="chapterId" column="chapter_id"/>
+        <result property="sectionId" column="section_id"/>
+        <result property="type" column="type"/>
+        <result property="examId" column="exam_id"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+    </resultMap>
+
+
+</mapper>